diff options
-rw-r--r-- | src/main/java/common/Recipes.java | 10 | ||||
-rw-r--r-- | src/main/java/kekztech/KekzCore.java | 12 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 1d2fb6058c..dbb8807ab7 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -450,7 +450,7 @@ public class Recipes { "LPL", "CBC", "LPL", 'L', filledLapoCrystal, 'P', ItemList.Circuit_Chip_PIC.get(1L), - 'C', OrePrefixes.circuit.get(Materials.Master) + 'C', OrePrefixes.circuit.get(Materials.Master), 'B', new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0), }; GT_ModHandler.addCraftingRecipe(KekzCore.lsc.getStackForm(1), lsc_recipe); @@ -467,7 +467,7 @@ public class Recipes { } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.Energy_Cluster.get(1L))) { // UV Lapo Orb lapoCapacitorRecipeAdder(ar, Materials.Neutronium, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)); - } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.get(1L))) { + } /*else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.get(1L))) { // Ultimate Battery // TODO change material to Cosmic Neutronium lapoCapacitorRecipeAdder(ar, Materials.Neutronium, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)); @@ -475,7 +475,7 @@ public class Recipes { // Really Ultimate Battery // TODO change material to Infinity lapoCapacitorRecipeAdder(ar, Materials.Neutronium, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)); - } + }*/ } // Blocks @@ -486,10 +486,6 @@ public class Recipes { 'O', ItemList.Energy_LapotronicOrb.get(1L) }; GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), lcIV_recipe); - // Make sure the recipe doesn't exceed 16 slots - if(lcLuV_recipeBase.size() <= 14) - - GT_Values.RA.addAssemblylineRecipe(); } } diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index b37591ae82..de217985fc 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -63,16 +63,16 @@ public class KekzCore { //Item_Configurator.getInstance().registerItem();
Items.registerOreDictNames();
- Item_ThaumiumReinforcedJarFilled.getInstance().registerItem();
+ //Item_ThaumiumReinforcedJarFilled.getInstance().registerItem();
Blocks.init();
// Register TileEntities
GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");
- GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");
- GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");
- GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");
- GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");
+ //GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");
+ //GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");
+ //GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");
+ //GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");
GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
@@ -103,7 +103,7 @@ public class KekzCore { .add(Aspect.ARMOR, 3)
.add(Aspect.WATER, 3)
.add(Aspect.GREED, 3)
- .add(Aspect.VOID, 3)
+ .add(Aspect.VOID, 3);
final ResearchItem jar_thaumiumreinforced = new ResearchItem("THAUMIUMREINFORCEDJAR", "ALCHEMY", new AspectList(), 3, -4, 2, new ItemStack(Blocks.jarThaumiumReinforced, 1))
.setPages(
new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"),
|