From f168ce4499eaa0f48193d7c60c0376ce6b1aa974 Mon Sep 17 00:00:00 2001 From: Michael Bunting Date: Wed, 4 Sep 2024 12:19:15 -0700 Subject: [PATCH] Fix inverted logic in TagEmptyCondition (#10069) --- build_forge.gradle | 1 + .../framework/GameTestServer.java.patch | 11 +++ .../net/minecraft/server/Main.java.patch | 9 ++- .../conditions/TagEmptyCondition.java | 15 +--- .../tag_empty_condition_doesnt_load.json | 40 ++++++++++ .../recipes/tag_empty_condition_loads.json | 40 ++++++++++ .../tag_empty_condition_doesnt_load.json | 30 ++++++++ .../recipe/tag_empty_condition_loads.json | 30 ++++++++ .../data/forge/tags/item/eggs.json | 6 ++ .../crafting/ConditionalRecipeTest.java | 77 ++++++++++++++++++- .../conditional_recipe/META-INF/mods.toml | 6 ++ 11 files changed, 247 insertions(+), 18 deletions(-) create mode 100644 patches/minecraft/net/minecraft/gametest/framework/GameTestServer.java.patch create mode 100644 src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_doesnt_load.json create mode 100644 src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_loads.json create mode 100644 src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_doesnt_load.json create mode 100644 src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_loads.json create mode 100644 src/test/generated/conditional_recipe/data/forge/tags/item/eggs.json create mode 100644 src/test/resources/conditional_recipe/META-INF/mods.toml diff --git a/build_forge.gradle b/build_forge.gradle index 00e2eace0c..4971e711a6 100644 --- a/build_forge.gradle +++ b/build_forge.gradle @@ -194,6 +194,7 @@ patcher { forge_server_gametest { args '--launchTarget', 'forge_dev_server_gametest' + args '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs } forge_server_gametest_test { diff --git a/patches/minecraft/net/minecraft/gametest/framework/GameTestServer.java.patch b/patches/minecraft/net/minecraft/gametest/framework/GameTestServer.java.patch new file mode 100644 index 0000000000..cb4d05bd20 --- /dev/null +++ b/patches/minecraft/net/minecraft/gametest/framework/GameTestServer.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/gametest/framework/GameTestServer.java ++++ b/net/minecraft/gametest/framework/GameTestServer.java +@@ -79,7 +_,7 @@ + } else { + p_206609_.reload(); + WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration( +- new DataPackConfig(new ArrayList<>(p_206609_.getAvailableIds()), List.of()), FeatureFlags.REGISTRY.allFlags() ++ new DataPackConfig(new ArrayList<>(p_206609_.getSelectedIds()), List.of()), FeatureFlags.REGISTRY.allFlags() // Forge: Use the selected datapacks as this takes sorting into account. + ); + LevelSettings levelsettings = new LevelSettings("Test Level", GameType.CREATIVE, false, Difficulty.NORMAL, true, TEST_GAME_RULES, worlddataconfiguration); + WorldLoader.PackConfig worldloader$packconfig = new WorldLoader.PackConfig(p_206609_, worlddataconfiguration, false, true); diff --git a/patches/minecraft/net/minecraft/server/Main.java.patch b/patches/minecraft/net/minecraft/server/Main.java.patch index 9b953ae543..be15eb6543 100644 --- a/patches/minecraft/net/minecraft/server/Main.java.patch +++ b/patches/minecraft/net/minecraft/server/Main.java.patch @@ -1,15 +1,17 @@ --- a/net/minecraft/server/Main.java +++ b/net/minecraft/server/Main.java -@@ -83,6 +_,15 @@ +@@ -83,6 +_,17 @@ OptionSpec optionspec13 = optionparser.accepts("jfrProfile"); OptionSpec optionspec14 = optionparser.accepts("pidFile").withRequiredArg().withValuesConvertedBy(new PathConverter()); OptionSpec optionspec15 = optionparser.nonOptions(); + optionparser.accepts("allowUpdates").withRequiredArg().ofType(Boolean.class).defaultsTo(Boolean.TRUE); // Forge: allow mod updates to proceed + optionparser.accepts("gameDir").withRequiredArg().ofType(File.class).defaultsTo(new File(".")); //Forge: Consume this argument, we use it in the launcher, and the client side. + final OptionSpec spawnPosOpt; ++ OptionSpec uniqueWorld = null; + boolean gametestEnabled = Boolean.getBoolean("forge.gameTestServer"); + if (gametestEnabled) { + spawnPosOpt = optionparser.accepts("spawnPos").withRequiredArg().withValuesConvertedBy(new net.minecraftforge.gametest.BlockPosValueConverter()).defaultsTo(new net.minecraft.core.BlockPos(0, 60, 0)); ++ uniqueWorld = optionparser.accepts("uniqueWorld"); + } else { + spawnPosOpt = null; + } @@ -31,7 +33,7 @@ Path path = optionset.valueOf(optionspec14); if (path != null) { writePidFile(path); -@@ -105,24 +_,26 @@ +@@ -105,24 +_,29 @@ Bootstrap.validate(); Util.startTimerHackThread(); Path path1 = Paths.get("server.properties"); @@ -58,6 +60,9 @@ File file1 = new File(optionset.valueOf(optionspec9)); Services services = Services.create(new YggdrasilAuthenticationService(Proxy.NO_PROXY), file1); String s = Optional.ofNullable(optionset.valueOf(optionspec10)).orElse(dedicatedserversettings.getProperties().levelName); ++ // Forge: make each gametest use a timestamped world name ++ if (uniqueWorld != null && optionset.has(uniqueWorld)) ++ s = "gametest_world\\" + java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss.SSS").format(java.time.LocalDateTime.now()); + if (s == null || s.isEmpty() || new File(file1, s).getAbsolutePath().equals(new File(s).getAbsolutePath())) { + LOGGER.error("Invalid world directory specified, must not be null, empty or the same directory as your universe! " + s); + return; diff --git a/src/main/java/net/minecraftforge/common/crafting/conditions/TagEmptyCondition.java b/src/main/java/net/minecraftforge/common/crafting/conditions/TagEmptyCondition.java index 4068d5441c..6f03708402 100644 --- a/src/main/java/net/minecraftforge/common/crafting/conditions/TagEmptyCondition.java +++ b/src/main/java/net/minecraftforge/common/crafting/conditions/TagEmptyCondition.java @@ -5,19 +5,14 @@ package net.minecraftforge.common.crafting.conditions; -import java.util.Optional; - import com.mojang.serialization.DynamicOps; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.minecraft.core.HolderGetter; import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import net.minecraft.resources.RegistryOps; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; public record TagEmptyCondition(TagKey tag) implements ICondition { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(b -> b.group( @@ -27,14 +22,6 @@ public record TagEmptyCondition(TagKey tag) implements ICondition { @Override public boolean test(ICondition.IContext context, DynamicOps ops) { - // Check the actual deserialization context if possible - if (ops instanceof RegistryOps reg) { - Optional> items = reg.getter(Registries.ITEM); - if (items.isPresent()) { - var optional = items.get().get(this.tag); - return optional.isPresent(); - } - } return context.getTag(tag).isEmpty(); } diff --git a/src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_doesnt_load.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_doesnt_load.json new file mode 100644 index 0000000000..2bf78ddbfd --- /dev/null +++ b/src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_doesnt_load.json @@ -0,0 +1,40 @@ +{ + "advancements": [ + { + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ore": { + "conditions": { + "items": [ + { + "items": "minecraft:iron_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:diamond_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "forge:condition": { + "type": "forge:tag_empty", + "tag": "minecraft:dirt" + }, + "requirements": [ + [ + "has_the_recipe", + "has_iron_ore" + ] + ], + "rewards": { + "recipes": [ + "minecraft:diamond_block" + ] + } + } + ] +} \ No newline at end of file diff --git a/src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_loads.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_loads.json new file mode 100644 index 0000000000..ddb8a35ffa --- /dev/null +++ b/src/test/generated/conditional_recipe/data/conditional_recipe/advancement/recipes/tag_empty_condition_loads.json @@ -0,0 +1,40 @@ +{ + "advancements": [ + { + "parent": "minecraft:recipes/root", + "criteria": { + "has_gold_ore": { + "conditions": { + "items": [ + { + "items": "minecraft:gold_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:diamond_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "forge:condition": { + "type": "forge:tag_empty", + "tag": "forge:eggs" + }, + "requirements": [ + [ + "has_the_recipe", + "has_gold_ore" + ] + ], + "rewards": { + "recipes": [ + "minecraft:diamond_block" + ] + } + } + ] +} \ No newline at end of file diff --git a/src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_doesnt_load.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_doesnt_load.json new file mode 100644 index 0000000000..e929cc3be0 --- /dev/null +++ b/src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_doesnt_load.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "forge:condition": { + "type": "forge:tag_empty", + "tag": "minecraft:dirt" + }, + "recipes": [ + { + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:iron_ore" + }, + { + "item": "minecraft:iron_ore" + }, + { + "item": "minecraft:iron_ore" + } + ], + "result": { + "count": 1, + "id": "minecraft:diamond_block" + } + } + } + ] +} \ No newline at end of file diff --git a/src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_loads.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_loads.json new file mode 100644 index 0000000000..be5c40a843 --- /dev/null +++ b/src/test/generated/conditional_recipe/data/conditional_recipe/recipe/tag_empty_condition_loads.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "forge:condition": { + "type": "forge:tag_empty", + "tag": "forge:eggs" + }, + "recipes": [ + { + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:gold_ore" + }, + { + "item": "minecraft:gold_ore" + }, + { + "item": "minecraft:gold_ore" + } + ], + "result": { + "count": 1, + "id": "minecraft:diamond_block" + } + } + } + ] +} \ No newline at end of file diff --git a/src/test/generated/conditional_recipe/data/forge/tags/item/eggs.json b/src/test/generated/conditional_recipe/data/forge/tags/item/eggs.json new file mode 100644 index 0000000000..b6565a64ab --- /dev/null +++ b/src/test/generated/conditional_recipe/data/forge/tags/item/eggs.json @@ -0,0 +1,6 @@ +{ + "remove": [ + "minecraft:egg" + ], + "values": [] +} \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java b/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java index 6556163699..d7e94f0480 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java @@ -16,24 +16,29 @@ import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; import net.minecraft.data.recipes.SingleItemRecipeBuilder; +import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.gametest.framework.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.item.crafting.SingleRecipeInput; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.crafting.ConditionalRecipe; import net.minecraftforge.common.crafting.SimpleCraftingContainer; import net.minecraftforge.common.crafting.conditions.IConditionBuilder; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.gametest.GameTestHolder; import net.minecraftforge.test.BaseTestMod; @@ -42,7 +47,7 @@ import net.minecraftforge.test.BaseTestMod; @Mod(ConditionalRecipeTest.MODID) public class ConditionalRecipeTest extends BaseTestMod { static final String MODID = "conditional_recipe"; - + public ConditionalRecipeTest(FMLJavaModLoadingContext context) { super(context); } @@ -51,6 +56,9 @@ public class ConditionalRecipeTest extends BaseTestMod { public void gatherData(GatherDataEvent event) { var gen = event.getGenerator(); gen.addProvider(event.includeServer(), new Recipes(gen.getPackOutput(), event.getLookupProvider())); + var testBlockTags = new TestBlockTags(gen.getPackOutput(), event.getLookupProvider(), event.getExistingFileHelper()); + gen.addProvider(event.includeServer(), testBlockTags); + gen.addProvider(event.includeServer(), new TestItemTags(gen.getPackOutput(), event.getLookupProvider(), testBlockTags.contentsGetter(), event.getExistingFileHelper())); } private static ResourceLocation rl(String path) { @@ -149,6 +157,47 @@ public class ConditionalRecipeTest extends BaseTestMod { .build() ); } + + @GameTest(template = "forge:empty3x3x3") + public static void tag_empty_condition_with_populated_tag(GameTestHelper helper) { + assertFalse(helper, RecipeType.CRAFTING, SimpleCraftingContainer.builder() + .pattern("XXX") + .define('X', Blocks.IRON_ORE) + .build() + ); + } + + @GameTest(template = "forge:empty3x3x3") + public static void tag_empty_condition_with_empty_tag(GameTestHelper helper) { + assertTrue(helper, RecipeType.CRAFTING, SimpleCraftingContainer.builder() + .pattern("XXX") + .define('X', Blocks.GOLD_ORE) + .build() + ); + } + + public static class TestBlockTags extends BlockTagsProvider { + public TestBlockTags(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider registries) { + // No block tags needed; just need a block provider content-getter to supply to the item tags generator + } + } + + public static class TestItemTags extends ItemTagsProvider { + public TestItemTags(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTagProvider, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, blockTagProvider, MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider registries) { + // Empty out the Forge eggs tag for purposes of testing the tag-empty recipe condition + this.tag(Tags.Items.EGGS).remove(Items.EGG); + } + } public static class Recipes extends RecipeProvider implements IConditionBuilder { public Recipes(PackOutput gen, CompletableFuture lookup) { @@ -302,6 +351,30 @@ public class ConditionalRecipeTest extends BaseTestMod { ::save ) .save(out, rl("conditional_doesnt_load_empty")); + + ConditionalRecipe.builder() + .condition(tagEmpty(ItemTags.DIRT)) + .recipe( + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Blocks.DIAMOND_BLOCK) + .requires(Blocks.IRON_ORE) + .requires(Blocks.IRON_ORE) + .requires(Blocks.IRON_ORE) + .unlockedBy(getHasName(Blocks.IRON_ORE), has(Blocks.IRON_ORE)) + ::save + ) + .save(out, rl("tag_empty_condition_doesnt_load")); + + ConditionalRecipe.builder() + .condition(tagEmpty(Tags.Items.EGGS)) + .recipe( + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Blocks.DIAMOND_BLOCK) + .requires(Blocks.GOLD_ORE) + .requires(Blocks.GOLD_ORE) + .requires(Blocks.GOLD_ORE) + .unlockedBy(getHasName(Blocks.GOLD_ORE), has(Blocks.GOLD_ORE)) + ::save + ) + .save(out, rl("tag_empty_condition_loads")); } } diff --git a/src/test/resources/conditional_recipe/META-INF/mods.toml b/src/test/resources/conditional_recipe/META-INF/mods.toml new file mode 100644 index 0000000000..e275d9e8b7 --- /dev/null +++ b/src/test/resources/conditional_recipe/META-INF/mods.toml @@ -0,0 +1,6 @@ +[[dependencies.conditional_recipe]] + modId="forge" + mandatory=true + versionRange="[0,]" + ordering="AFTER" + side="BOTH"