From 1ba9c346509fba4467eba8e494d1917ac20e7eb5 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 9 Jun 2022 11:36:46 -0700 Subject: [PATCH] Add helper to RecipeType, and fix eclipse compiler error in test class. --- .../world/item/crafting/RecipeType.java.patch | 17 +++++++++++++++++ .../recipebook/RecipeBookExtensionTest.java | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 patches/minecraft/net/minecraft/world/item/crafting/RecipeType.java.patch diff --git a/patches/minecraft/net/minecraft/world/item/crafting/RecipeType.java.patch b/patches/minecraft/net/minecraft/world/item/crafting/RecipeType.java.patch new file mode 100644 index 0000000000..4f958eb612 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/item/crafting/RecipeType.java.patch @@ -0,0 +1,17 @@ +--- a/net/minecraft/world/item/crafting/RecipeType.java ++++ b/net/minecraft/world/item/crafting/RecipeType.java +@@ -19,4 +_,14 @@ + } + }); + } ++ ++ public static > RecipeType simple(final ResourceLocation name) { ++ final String toString = name.toString(); ++ return new RecipeType() { ++ @Override ++ public String toString() { ++ return toString; ++ } ++ }; ++ } + } diff --git a/src/test/java/net/minecraftforge/debug/recipe/recipebook/RecipeBookExtensionTest.java b/src/test/java/net/minecraftforge/debug/recipe/recipebook/RecipeBookExtensionTest.java index 7c43c4c357..5f65642807 100644 --- a/src/test/java/net/minecraftforge/debug/recipe/recipebook/RecipeBookExtensionTest.java +++ b/src/test/java/net/minecraftforge/debug/recipe/recipebook/RecipeBookExtensionTest.java @@ -14,7 +14,6 @@ import net.minecraft.world.SimpleMenuProvider; import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.RecipeBookType; -import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.block.Blocks; @@ -49,7 +48,7 @@ public class RecipeBookExtensionTest MENU_TYPE.register("test_recipe_menu", () -> IForgeMenuType.create(RecipeBookTestMenu::new)); public static final DeferredRegister> RECIPE_TYPE = DeferredRegister.create(ForgeRegistries.RECIPE_TYPES, MOD_ID); - public static final RegistryObject> RECIPE_BOOK_TEST_RECIPE_TYPE = registerRecipeType("test_recipe"); + public static final RegistryObject> RECIPE_BOOK_TEST_RECIPE_TYPE = RECIPE_TYPE.register("test_recipe", () -> RecipeType.simple(getId("test_recipe"))); public RecipeBookExtensionTest() { @@ -77,18 +76,6 @@ public class RecipeBookExtensionTest return new ResourceLocation(MOD_ID, name); } - private static > RegistryObject> registerRecipeType(String name) { - String id = getId(name).toString(); - return RECIPE_TYPE.register(name, () -> new RecipeType<>() - { - @Override - public String toString() - { - return id; - } - }); - } - @Mod.EventBusSubscriber(modid = MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) public static class ClientHandler {