Standardize IC2 recipes a bit. 1.0.0!

TPPIDev · Mar 29, 2014 · 073a1d7 · 073a1d7
1 parent 00d888e
commit 073a1d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/build.properties b/build.properties
@@ -1,3 +1,3 @@
 minecraft_version=1.6.4
 forge_version=9.11.1.964
-mod_version=0.9.0-gradle
+mod_version=1.0.0
diff --git a/src/main/java/tppitweaks/TPPITweaks.java b/src/main/java/tppitweaks/TPPITweaks.java
@@ -37,7 +37,7 @@
 @NetworkMod(serverSideRequired = true, clientSideRequired = true, channels = { Reference.CHANNEL }, packetHandler = PacketHandler.class)
 public class TPPITweaks
 {
-	public static final String VERSION = "0.9.0-gradle";
+	public static final String VERSION = "1.0.0";
 
 	@Instance("TPPITweaks")
 	public static TPPITweaks instance;

diff --git a/src/main/java/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java
@@ -1,6 +1,5 @@
 package tppitweaks.recipetweaks.modTweaks;
 
-import ic2.core.AdvCraftingRecipeManager;
 import ic2.core.Ic2Items;
 import ic2.core.util.StackUtil;
 import net.minecraft.block.Block;
@@ -58,20 +57,16 @@ public static void addRecipes() {
 	public static void doPostLoadRecipeAdditions()
 	{
 		/* copypasta code, ignore horrible formatting */
-
-		AdvCraftingRecipeManager localAdvCraftingRecipeManager = (AdvCraftingRecipeManager) (ic2.api.recipe.Recipes.advRecipes = new AdvCraftingRecipeManager());
-
-		if (Ic2Items.suBattery == null) throw new RuntimeException("null");
-
-        localAdvCraftingRecipeManager.addRecipe(Ic2Items.iridiumDrill, new Object[] { " I ", "IdI", " C ", Character.valueOf('I'), Ic2Items.iridiumPlate, Character.valueOf('d'), StackUtil.copyWithWildCard(Ic2Items.diamondDrill), Character.valueOf('C'), StackUtil.copyWithWildCard(Ic2Items.energyCrystal) });
-        GameRegistry.addRecipe(Ic2Items.mvTransformer, new Object[] { "C", "M", "C", Character.valueOf('M'), Ic2Items.machine, Character.valueOf('C'), Ic2Items.insulatedCopperCableItem });
-        GameRegistry.addRecipe(Ic2Items.weedEx, new Object[] { "R", "G", "C", Character.valueOf('R'), Item.redstone, Character.valueOf('G'), Ic2Items.grinPowder, Character.valueOf('C'), Ic2Items.cell });
+
+		GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.iridiumDrill, new Object[] { " I ", "IdI", " C ", Character.valueOf('I'), Ic2Items.iridiumPlate, Character.valueOf('d'), StackUtil.copyWithWildCard(Ic2Items.diamondDrill), Character.valueOf('C'), StackUtil.copyWithWildCard(Ic2Items.energyCrystal) }));
+        GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.mvTransformer, new Object[] { "C", "M", "C", Character.valueOf('M'), Ic2Items.machine, Character.valueOf('C'), Ic2Items.insulatedCopperCableItem }));
+        GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.weedEx, new Object[] { "R", "G", "C", Character.valueOf('R'), Item.redstone, Character.valueOf('G'), Ic2Items.grinPowder, Character.valueOf('C'), Ic2Items.cell }));
         GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 5), new Object[] { "C", "R", "D", Character.valueOf('D'), "dustCoal", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), Ic2Items.insulatedCopperCableItem }));
         GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 5), new Object[] { "C", "D", "R", Character.valueOf('D'), "dustCoal", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), Ic2Items.insulatedCopperCableItem }));
         GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 8), new Object[] { "c", "C", "R", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), "dustHydratedCoal", Character.valueOf('c'), Ic2Items.insulatedCopperCableItem }));
         GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 8), new Object[] { "c", "R", "C", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), "dustHydratedCoal", Character.valueOf('c'), Ic2Items.insulatedCopperCableItem }));
         GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.personalSafe, new Object[] { "c", "M", "C", Character.valueOf('c'), Ic2Items.recipeObjectCircuit, Character.valueOf('C'), Block.chest, Character.valueOf('M'), Ic2Items.machine }));
-        localAdvCraftingRecipeManager.addRecipe(Ic2Items.nanoHelmet, new Object[] { "CcC", "CGC", Character.valueOf('C'), Ic2Items.carbonPlate, Character.valueOf('c'), StackUtil.copyWithWildCard(Ic2Items.energyCrystal), Character.valueOf('G'), StackUtil.copyWithWildCard(Ic2Items.nightvisionGoggles) });
+        GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.nanoHelmet, new Object[] { "CcC", "CGC", Character.valueOf('C'), Ic2Items.carbonPlate, Character.valueOf('c'), StackUtil.copyWithWildCard(Ic2Items.energyCrystal), Character.valueOf('G'), StackUtil.copyWithWildCard(Ic2Items.nightvisionGoggles) }));
         GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.electricJetpack, new Object[] { "ICI", "IBI", "G G", Character.valueOf('I'), Ic2Items.casingiron, Character.valueOf('C'), Ic2Items.recipeObjectAdvCircuit, Character.valueOf('B'), Ic2Items.batBox, Character.valueOf('G'), Item.glowstone }));
 	}
 }