mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
make recipe variable in tconstruct that is static, remove static calls on methods in trecipes
This commit is contained in:
1 parent
90f09b7e2d
commit
931b2bd799
2 files changed
+22
-21
No files matched your search
@@ -70,11 +70,11 @@ public class TConstruct
|
||||
{
|
||||
System.out.println("[TConstruct] Preparing to take over the world");
|
||||
}
|
||||
|
||||
System.out.println("[UUID] Armor Speed: "+UUID.randomUUID());
|
||||
System.out.println("[UUID] Armor Attack: "+UUID.randomUUID());
|
||||
System.out.println("[UUID] Armor Health: "+UUID.randomUUID());
|
||||
System.out.println("[UUID] Armor Knockback: "+UUID.randomUUID());
|
||||
|
||||
logger.info("[UUID] Armor Speed: " + UUID.randomUUID());
|
||||
logger.info("[UUID] Armor Attack: " + UUID.randomUUID());
|
||||
logger.info("[UUID] Armor Health: " + UUID.randomUUID());
|
||||
logger.info("[UUID] Armor Knockback: " + UUID.randomUUID());
|
||||
|
||||
EnvironmentChecks.verifyEnvironmentSanity();
|
||||
MinecraftForge.EVENT_BUS.register(events = new TEventHandler());
|
||||
@@ -97,7 +97,7 @@ public class TConstruct
|
||||
content = new TContent();
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement());
|
||||
TRecipes.oreRegistry();
|
||||
recipes.oreRegistry();
|
||||
|
||||
proxy.registerRenderer();
|
||||
proxy.addNames();
|
||||
@@ -121,15 +121,15 @@ public class TConstruct
|
||||
VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler());
|
||||
try
|
||||
{
|
||||
// if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4"))
|
||||
// {
|
||||
MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure");
|
||||
MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure");
|
||||
// }
|
||||
// if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4"))
|
||||
// {
|
||||
MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure");
|
||||
MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure");
|
||||
// }
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
|
||||
logger.severe("Error registering TConstruct Structures with Vanilla Minecraft: this is expected in versions earlier than 1.6.4");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -165,10 +165,10 @@ public class TConstruct
|
||||
proxy.postInit();
|
||||
Behavior.registerBuiltInBehaviors();
|
||||
SpecialStackHandler.registerBuiltInStackHandlers();
|
||||
TRecipes.modIntegration();
|
||||
TRecipes.addOreDictionarySmelteryRecipes();
|
||||
recipes.modIntegration();
|
||||
recipes.addOreDictionarySmelteryRecipes();
|
||||
content.createEntities();
|
||||
TRecipes.modRecipes();
|
||||
recipes.modRecipes();
|
||||
|
||||
PluginController.getController().postInit();
|
||||
}
|
||||
@@ -189,6 +189,7 @@ public class TConstruct
|
||||
}
|
||||
|
||||
public static TContent content;
|
||||
public static TRecipes recipes;
|
||||
public static TEventHandler events;
|
||||
public static TPlayerHandler playerTracker;
|
||||
public static LiquidCasting tableCasting;
|
||||
|
||||
@@ -162,7 +162,7 @@ public class TRecipes
|
||||
|
||||
}
|
||||
|
||||
public static void addOreDictionarySmelteryRecipes ()
|
||||
public void addOreDictionarySmelteryRecipes ()
|
||||
{
|
||||
List<FluidType> exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime });
|
||||
for (FluidType ft : FluidType.values())
|
||||
@@ -791,7 +791,7 @@ public class TRecipes
|
||||
chiseling.addDetailing(TRepo.smeltery, 9, TRepo.smeltery, 10, TRepo.chisel);
|
||||
}
|
||||
|
||||
public static void oreRegistry ()
|
||||
public void oreRegistry ()
|
||||
{
|
||||
OreDictionary.registerOre("oreCobalt", new ItemStack(TRepo.oreSlag, 1, 1));
|
||||
OreDictionary.registerOre("oreArdite", new ItemStack(TRepo.oreSlag, 1, 2));
|
||||
@@ -916,7 +916,7 @@ public class TRecipes
|
||||
}
|
||||
}
|
||||
|
||||
public static void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray)
|
||||
public void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray)
|
||||
{
|
||||
String var3 = "";
|
||||
int var4 = 0;
|
||||
@@ -989,7 +989,7 @@ public class TRecipes
|
||||
recipeList.add(0, var17);
|
||||
}
|
||||
|
||||
public static void modRecipes ()
|
||||
public void modRecipes ()
|
||||
{
|
||||
if (!TRepo.initRecipes)
|
||||
{
|
||||
@@ -1235,7 +1235,7 @@ public class TRecipes
|
||||
Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.axeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
|
||||
}
|
||||
|
||||
public static void modIntegration ()
|
||||
public void modIntegration ()
|
||||
{
|
||||
/* Natura */
|
||||
Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted");
|
||||
@@ -1385,7 +1385,7 @@ public class TRecipes
|
||||
}
|
||||
}
|
||||
|
||||
public static Object getStaticItem (String name, String classPackage)
|
||||
public Object getStaticItem (String name, String classPackage)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user