More stuff

This commit is contained in:
Christian committed 2012-08-01 21:19:11 -02:30
1 parent 2f588cf6ef
commit 153eafdcb0
4 files changed
+32 -26

No files matched your search

+3 -2
View File
@@ -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);
}
/**
@@ -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);
@@ -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);
}
}
+3 -1
View File
@@ -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