From 153eafdcb04bac829bacf4eede9708f47109c9d5 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Aug 2012 21:10:57 -0230 Subject: [PATCH] More stuff --- client/net/minecraft/src/ModLoader.java | 5 ++-- .../mods/fml/common/registry/FMLRegistry.java | 24 +----------------- .../fml/common/registry/GameRegistry.java | 25 +++++++++++++++++++ common/fml_at.cfg | 4 ++- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/client/net/minecraft/src/ModLoader.java b/client/net/minecraft/src/ModLoader.java index 472370e39a..dbbb5575f4 100644 --- a/client/net/minecraft/src/ModLoader.java +++ b/client/net/minecraft/src/ModLoader.java @@ -31,6 +31,7 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.modloader.ModLoaderHelper; import cpw.mods.fml.common.modloader.ModLoaderModContainer; import cpw.mods.fml.common.registry.FMLRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.ObfuscationReflectionHelper; public class ModLoader @@ -178,7 +179,7 @@ public class ModLoader */ public static void addRecipe(ItemStack output, Object... params) { - FMLRegistry.addRecipe(output, params); + GameRegistry.addRecipe(output, params); } /** @@ -189,7 +190,7 @@ public class ModLoader */ public static void addShapelessRecipe(ItemStack output, Object... params) { - FMLRegistry.addShapelessRecipe(output, params); + GameRegistry.addShapelessRecipe(output, params); } /** diff --git a/common/cpw/mods/fml/common/registry/FMLRegistry.java b/common/cpw/mods/fml/common/registry/FMLRegistry.java index 5204334590..ab22a472c7 100644 --- a/common/cpw/mods/fml/common/registry/FMLRegistry.java +++ b/common/cpw/mods/fml/common/registry/FMLRegistry.java @@ -19,15 +19,13 @@ import net.minecraft.src.Block; import net.minecraft.src.Entity; import net.minecraft.src.EntityLiving; import net.minecraft.src.EnumCreatureType; -import net.minecraft.src.IRecipe; import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; public class FMLRegistry { - private static IMinecraftRegistry instance; + static IMinecraftRegistry instance; public static void registerRegistry(IMinecraftRegistry registry) { @@ -38,26 +36,6 @@ public class FMLRegistry instance = registry; } - public static void addRecipe(ItemStack output, Object... params) - { - instance.addRecipe(output, params); - } - - public static void addShapelessRecipe(ItemStack output, Object... params) - { - instance.addShapelessRecipe(output, params); - } - - public static void addRecipe(IRecipe recipe) - { - instance.addRecipe(recipe); - } - - public static void addSmelting(int input, ItemStack output, float xp) - { - instance.addSmelting(input, output, xp); - } - public static void registerBlock(Block block) { GameRegistry.registerBlock((BlockProxy)block); diff --git a/common/cpw/mods/fml/common/registry/GameRegistry.java b/common/cpw/mods/fml/common/registry/GameRegistry.java index 5320fcb05f..791fe3f3cc 100644 --- a/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -4,6 +4,11 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; +import net.minecraft.src.CraftingManager; +import net.minecraft.src.FurnaceRecipes; +import net.minecraft.src.IRecipe; +import net.minecraft.src.ItemStack; + import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -48,4 +53,24 @@ public class GameRegistry } + public static void addRecipe(ItemStack output, Object... params) + { + CraftingManager.func_77594_a().addRecipe(output, params); + } + + public static void addShapelessRecipe(ItemStack output, Object... params) + { + FMLRegistry.instance.addShapelessRecipe(output, params); + } + + public static void addRecipe(IRecipe recipe) + { + FMLRegistry.instance.addRecipe(recipe); + } + + public static void addSmelting(int input, ItemStack output, float xp) + { + FurnaceRecipes.func_77602_a().func_77600_a(input, output, xp); + } + } diff --git a/common/fml_at.cfg b/common/fml_at.cfg index 0b71d07ab7..edd31b9da0 100644 --- a/common/fml_at.cfg +++ b/common/fml_at.cfg @@ -165,4 +165,6 @@ public-f awq.j public ak.b # TileEntityRenderer - make the list of renderers public public axr.m - +# CraftingManager - make the add recipe methods public +public tc.a(Lri;[Ljava/lang/Object;)V +public tc.b(Lri;[Ljava/lang/Object;)V