From 1d71c3870da314834ffb9d11ae32db8859e190e4 Mon Sep 17 00:00:00 2001 From: JFronny Date: Sun, 26 Feb 2023 12:49:00 +0100 Subject: [PATCH] [root] update for 1.19.4-pre1 --- docs/libjf-data-manipulation-v0.md | 2 +- gradle.properties | 12 +++++----- .../config/impl/ui/PlaceholderScreen.java | 2 +- .../config/impl/ui/tiny/TinyConfigScreen.java | 2 +- .../impl/ui/tiny/presets/PresetsScreen.java | 2 +- .../data/manipulation/api/RecipeUtil.java | 16 -------------- .../{ => impl}/mixin/RecipeManagerMixin.java | 22 ++----------------- .../libjf-data-manipulation-v0.mixins.json | 2 +- .../manipulation/test/TestEntrypoint.java | 3 +-- 9 files changed, 14 insertions(+), 49 deletions(-) rename libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/{ => impl}/mixin/RecipeManagerMixin.java (55%) diff --git a/docs/libjf-data-manipulation-v0.md b/docs/libjf-data-manipulation-v0.md index 21a3999..acef150 100644 --- a/docs/libjf-data-manipulation-v0.md +++ b/docs/libjf-data-manipulation-v0.md @@ -5,7 +5,7 @@ libjf-data-manipulation-v0 provides code for modifying existing resources RecipeUtil provides to methods to end users: - `removeRecipe` blocks minecraft from loading recipes using the specified tag -- `removeRecipeFor` blocks minecraft from loading recipes producing the specified output. (Look at the log to find out which ones it blocks) +- ~~`removeRecipeFor` blocks minecraft from loading recipes producing the specified output. (Look at the log to find out which ones it blocks)~~ **removed for 1.19.4** ### UserResourceEvents UserResourceEvents provides four events (CONTAINS, FIND_RESOURCE, OPEN, OPEN_ROOT) which get called every time diff --git a/gradle.properties b/gradle.properties index f844b90..f565842 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # https://fabricmc.net/develop/ -minecraft_version=1.19.3 -yarn_mappings=build.5 -loader_version=0.14.15 +minecraft_version=1.19.4-pre1 +yarn_mappings=build.6 +loader_version=0.14.17 maven_group=io.gitlab.jfronny.libjf archive_base_name=libjf @@ -14,10 +14,10 @@ modrinth_optional_dependencies=fabric-api curseforge_id=482600 curseforge_optional_dependencies=fabric-api -fabric_version=0.75.0+1.19.3 -commons_version=1.0-SNAPSHOT +fabric_version=0.75.1+1.19.4 +commons_version=1.1-SNAPSHOT gson_compile_version=1.2-SNAPSHOT -modmenu_version=5.0.2 +modmenu_version=6.1.0-beta.3 asm_version=9.4 ant_version=1.10.12 diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java b/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java index e7e21d7..7e16b67 100644 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java +++ b/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java @@ -18,7 +18,7 @@ public class PlaceholderScreen extends Screen { @Override public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { renderBackground(matrices); - drawCenteredText(matrices, textRenderer, description, width / 2, (height - textRenderer.fontHeight) / 2, 0xFFFFFF); + drawCenteredTextWithShadow(matrices, textRenderer, description, width / 2, (height - textRenderer.fontHeight) / 2, 0xFFFFFF); super.render(matrices, mouseX, mouseY, delta); } diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java index bef9593..cd6ae4f 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java +++ b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java @@ -118,7 +118,7 @@ public class TinyConfigScreen extends Screen { this.renderBackground(matrices); this.list.render(matrices, mouseX, mouseY, delta); - drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF); + drawCenteredTextWithShadow(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF); Optional hovered = list.getHoveredEntryTitle(mouseY); if (hovered.isPresent()) { diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java index 4483fca..923e4fa 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java +++ b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java @@ -53,7 +53,7 @@ public class PresetsScreen extends Screen { this.renderBackground(matrices); this.list.render(matrices, mouseX, mouseY, delta); - drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF); + drawCenteredTextWithShadow(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF); super.render(matrices, mouseX, mouseY, delta); } diff --git a/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/api/RecipeUtil.java b/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/api/RecipeUtil.java index 40f7c4b..4892aea 100644 --- a/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/api/RecipeUtil.java +++ b/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/api/RecipeUtil.java @@ -1,7 +1,5 @@ package io.gitlab.jfronny.libjf.data.manipulation.api; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import java.util.HashSet; @@ -10,26 +8,12 @@ import java.util.Set; @SuppressWarnings("unused") public class RecipeUtil { private static final Set REMOVAL_BY_ID = new HashSet<>(); - private static final Set RECIPES_FOR_REMOVAL = new HashSet<>(); public static void removeRecipe(Identifier identifier) { REMOVAL_BY_ID.add(identifier); } - public static void removeRecipeFor(Item product) { - RECIPES_FOR_REMOVAL.add(product.getDefaultStack()); - } - public static boolean isIdBlocked(Identifier identifier) { return REMOVAL_BY_ID.contains(identifier); } - - public static boolean isOutputBlocked(ItemStack product) { - for (ItemStack stack : RECIPES_FOR_REMOVAL) { - if (product.isItemEqual(stack)) { - return true; - } - } - return false; - } } diff --git a/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/mixin/RecipeManagerMixin.java b/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/mixin/RecipeManagerMixin.java similarity index 55% rename from libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/mixin/RecipeManagerMixin.java rename to libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/mixin/RecipeManagerMixin.java index 492a8e6..8a414b8 100644 --- a/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/mixin/RecipeManagerMixin.java +++ b/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/mixin/RecipeManagerMixin.java @@ -1,20 +1,15 @@ -package io.gitlab.jfronny.libjf.data.manipulation.mixin; +package io.gitlab.jfronny.libjf.data.manipulation.impl.mixin; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonObject; import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.data.manipulation.api.RecipeUtil; -import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeManager; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; -import org.spongepowered.asm.mixin.injection.Redirect; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; +import java.util.*; @Mixin(RecipeManager.class) public class RecipeManagerMixin { @@ -34,17 +29,4 @@ public class RecipeManagerMixin { return replacement.iterator(); } - - @Redirect(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap$Builder;put(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap$Builder;", remap = false)) - private ImmutableMap.Builder> onPutRecipe(ImmutableMap.Builder> builder, Object key, Object value) { - Identifier id = (Identifier) key; - Recipe recipe = (Recipe) value; - - if (RecipeUtil.isOutputBlocked(recipe.getOutput())) { - LibJf.LOGGER.info("Blocked recipe by predicate: " + recipe.getId()); - return builder; - } - - return builder.put(id, recipe); - } } diff --git a/libjf-data-manipulation-v0/src/main/resources/libjf-data-manipulation-v0.mixins.json b/libjf-data-manipulation-v0/src/main/resources/libjf-data-manipulation-v0.mixins.json index 713d453..82ff8c1 100644 --- a/libjf-data-manipulation-v0/src/main/resources/libjf-data-manipulation-v0.mixins.json +++ b/libjf-data-manipulation-v0/src/main/resources/libjf-data-manipulation-v0.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "io.gitlab.jfronny.libjf.data.manipulation.mixin", + "package": "io.gitlab.jfronny.libjf.data.manipulation.impl.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ "RecipeManagerMixin" diff --git a/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java b/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java index 9c427de..c815358 100644 --- a/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java +++ b/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java @@ -18,6 +18,5 @@ public class TestEntrypoint implements ModInitializer { } return previous; }); - RecipeUtil.removeRecipeFor(Items.DIAMOND_SWORD); } -} \ No newline at end of file +}