From a03ffbc860bc166b02ea9e83a6c5ff3e0c21ac5d Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 22 Jun 2017 21:38:36 -0700 Subject: [PATCH] Disable substitution test, substitutions are not managed the way they used to be. We do not care about substitutions, People who replace entries should make them compatible with the existing item. --- .../net/minecraftforge/debug/DynBucketTest.java | 2 +- .../minecraftforge/debug/NBTShareTagItemTest.java | 2 +- .../net/minecraftforge/debug/RecipeTestMod.java | 15 ++++++++++++--- .../registry/SubstitutionInjectionTest.java | 4 ++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/test/java/net/minecraftforge/debug/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/DynBucketTest.java index cb0675fede..8d5c5142ff 100644 --- a/src/test/java/net/minecraftforge/debug/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/DynBucketTest.java @@ -137,7 +137,7 @@ public class DynBucketTest public void registrRecipes(RegistryEvent.Register event) { ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(TestFluid.instance, Fluid.BUCKET_VOLUME)); - GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "diamond_to_fluid"), null, filledBucket, Ingredient.func_193368_a(Items.DIAMOND)); + GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "diamond_to_fluid"), null, filledBucket, Ingredient.fromItem(Items.DIAMOND)); } @SuppressWarnings("unused") diff --git a/src/test/java/net/minecraftforge/debug/NBTShareTagItemTest.java b/src/test/java/net/minecraftforge/debug/NBTShareTagItemTest.java index fe0266707a..c0ed610ab8 100644 --- a/src/test/java/net/minecraftforge/debug/NBTShareTagItemTest.java +++ b/src/test/java/net/minecraftforge/debug/NBTShareTagItemTest.java @@ -38,7 +38,7 @@ public class NBTShareTagItemTest nbt.setBoolean("crafted", true); crafted.setTagCompound(nbt); - GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "nbt_share"), null, crafted, Ingredient.func_193367_a(Items.STICK)); + GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "nbt_share"), null, crafted, Ingredient.fromItem(Items.STICK)); } @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/RecipeTestMod.java b/src/test/java/net/minecraftforge/debug/RecipeTestMod.java index ee77914798..7e46090544 100644 --- a/src/test/java/net/minecraftforge/debug/RecipeTestMod.java +++ b/src/test/java/net/minecraftforge/debug/RecipeTestMod.java @@ -2,12 +2,15 @@ package net.minecraftforge.debug; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.ShapedOreRecipe; @Mod(modid = "recipetest", version = "1.0", acceptableRemoteVersions = "*") @@ -15,16 +18,22 @@ public class RecipeTestMod { @Mod.EventHandler public void preinit(FMLPreInitializationEvent event) + { + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void registerRecipes(RegistryEvent.Register event) { ResourceLocation location1 = new ResourceLocation("recipetest", "dirt"); ShapedOreRecipe recipe1 = new ShapedOreRecipe(location1, new ItemStack(Blocks.DIAMOND_BLOCK), "DDD", 'D', new ItemStack(Blocks.DIRT)); recipe1.setRegistryName(location1); - GameRegistry.register(recipe1); + event.getRegistry().register(recipe1); ResourceLocation location2 = new ResourceLocation("recipetest", "stone"); CraftingHelper.ShapedPrimer primer1 = CraftingHelper.parseShaped("SSS", 'S', new ItemStack(Blocks.IRON_BLOCK)); ShapedRecipes recipe2 = new ShapedRecipes(location2.getResourcePath(), primer1.width, primer1.height, primer1.input, new ItemStack(Blocks.GOLD_BLOCK)); recipe2.setRegistryName(location2); - GameRegistry.register(recipe2); + event.getRegistry().register(recipe2); } } diff --git a/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java b/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java index 793641ce5f..e1b9058052 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java @@ -58,6 +58,10 @@ public class SubstitutionInjectionTest @Test public void testSubstitutionInjection() throws Exception { + //TODO: Decide exactly how I want to deal with subs, this test doesn't really do anything right now + if (true == Boolean.valueOf("true").booleanValue()) + return; + final ForgeRegistry blockRegistry = (ForgeRegistry)RegistryManager.ACTIVE.getRegistry(Block.class); final ForgeRegistry itemRegistry = (ForgeRegistry)RegistryManager.ACTIVE.getRegistry(Item.class);