aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/ic2
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/ic2')
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java32
2 files changed, 20 insertions, 25 deletions
diff --git a/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
index 18fb286d15..a349d7f86e 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
@@ -1,6 +1,5 @@
package gtPlusPlus.xmod.ic2;
-import gtPlusPlus.core.util.data.EnumUtils;
import ic2.core.init.InternalName;
import net.minecraftforge.common.util.EnumHelper;
@@ -12,14 +11,10 @@ public class CustomInternalName {
public static InternalName aHazmatBootsEx;
public static void init() {
- EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
- EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
- EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
- EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});
- aHazmatHelmetEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatHelmetEx");
- aHazmatChestEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatChestplateEx");
- aHazmatLegsEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatLeggingsEx");
- aHazmatBootsEx = EnumUtils.getValue(InternalName.class, "itemArmorRubBootsEx");
+ aHazmatHelmetEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
+ aHazmatChestEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
+ aHazmatLegsEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
+ aHazmatBootsEx = EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});
}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index 1f5f9abe1d..e22a609814 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -95,25 +95,25 @@ public class RECIPE_IC2 {
if (!CORE.GTNH) {
//Rotor Blade Recipes
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T1, ingot_T1, plate_T1,
plate_T1, ingot_T1, plate_T1,
plate_T1, ingot_T1, plate_T1,
rotor_blade_T1);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T2, ingot_T2, plate_T2,
plate_T2, ingot_T2, plate_T2,
plate_T2, ingot_T2, plate_T2,
rotor_blade_T2);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T3, ingot_T3, plate_T3,
plate_T3, ingot_T3, plate_T3,
plate_T3, ingot_T3, plate_T3,
rotor_blade_T3);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T4, ingot_T4, plate_T4,
plate_T4, ingot_T4, plate_T4,
plate_T4, ingot_T4, plate_T4,
@@ -121,25 +121,25 @@ public class RECIPE_IC2 {
}
if (CORE.GTNH) {
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T1, plate_T1, plate_T1,
plate_T1, ring_T1, plate_T1,
plate_T1, plate_T1, plate_T1,
rotor_blade_T1);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T2, plate_T2, plate_T2,
plate_T2, ring_T2, plate_T2,
plate_T2, plate_T2, plate_T2,
rotor_blade_T2);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T3, plate_T3, plate_T3,
plate_T3, ring_T3, plate_T3,
plate_T3, plate_T3, plate_T3,
rotor_blade_T3);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
plate_T4, plate_T4, plate_T4,
plate_T4, ring_T4, plate_T4,
plate_T4, plate_T4, plate_T4,
@@ -190,25 +190,25 @@ public class RECIPE_IC2 {
if (!CORE.GTNH) {
//Rotor Recipes
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
null, rotor_blade_T1, null,
rotor_blade_T1, shaft_T1, rotor_blade_T1,
null, rotor_blade_T1, null,
rotor_T1);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
null, rotor_blade_T2, null,
rotor_blade_T2, shaft_T2, rotor_blade_T2,
null, rotor_blade_T2, null,
rotor_T2);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
null, rotor_blade_T3, null,
rotor_blade_T3, shaft_T3, rotor_blade_T3,
null, rotor_blade_T3, null,
rotor_T3);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
null, rotor_blade_T4, null,
rotor_blade_T4, shaft_T4, rotor_blade_T4,
null, rotor_blade_T4, null,
@@ -216,25 +216,25 @@ public class RECIPE_IC2 {
}
if (CORE.GTNH) {
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
shaft_T1, rotor_blade_T1, craftingToolHardHammer,
rotor_blade_T1, ring_T1, rotor_blade_T1,
craftingToolWrench, rotor_blade_T1, shaft_T1,
rotor_T1);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
shaft_T2, rotor_blade_T2, craftingToolHardHammer,
rotor_blade_T2, ring_T2, rotor_blade_T2,
craftingToolWrench, rotor_blade_T2, shaft_T2,
rotor_T2);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
shaft_T3, rotor_blade_T3, craftingToolHardHammer,
rotor_blade_T3, ring_T3, rotor_blade_T3,
craftingToolWrench, rotor_blade_T3, shaft_T3,
rotor_T3);
- RecipeUtils.recipeBuilder(
+ RecipeUtils.addShapedRecipe(
shaft_T4, rotor_blade_T4, craftingToolHardHammer,
rotor_blade_T4, ring_T4, rotor_blade_T4,
craftingToolWrench, rotor_blade_T4, shaft_T4,