diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
97 files changed, 1341 insertions, 3322 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java index 316e826e37..f46713bdf8 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java @@ -107,32 +107,6 @@ public class BOP_Block_Registrator { 160, 8); - if (!CORE.GTNH) { - GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), - Materials.SeedOil.getFluid(50L), - ItemList.FR_Stick.get(1L, new Object[0]), - 16, - 8); - GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(8L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]), - Materials.SeedOil.getFluid(250L), - ItemList.FR_Casing_Impregnated.get(1L, new Object[0]), - 64, - 16); - GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Creosote.getFluid(1000L), - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.cube", 1L, 8), - null, - null, - null, - 16, - 16); - } - final short aMeta = (short) aStack.getItemDamage(); if (aMeta == 32767) { if (GT_Utility.areStacksEqual( diff --git a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java index 04c34f09ce..c652a427ab 100644 --- a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java +++ b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java @@ -7,7 +7,7 @@ import gtPlusPlus.core.lib.LoadedMods; public class HANDLER_COFH { public static void initItems() { - if (LoadedMods.CoFHCore && (LoadedMods.IndustrialCraft2 || LoadedMods.IndustrialCraft2Classic)) { + if (LoadedMods.CoFHCore) { ModItems.RfEuBattery = new RF2EU_Battery(); } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index c74bb116b0..fb77c4c2e0 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -17,7 +17,6 @@ import net.minecraftforge.common.ChestGenHooks; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.utils.StringUtil; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; public class FR_ItemRegistry { @@ -56,17 +55,10 @@ public class FR_ItemRegistry { // Magic Bee like Frames - if (!CORE.GTNH) { - hiveFrameVoid = new MB_ItemFrame( - MB_FrameType.VOID, - EnumRarity.rare, - "Makes your bee die in the blink of an eye."); - } else { - hiveFrameVoid = new MB_ItemFrame( - MB_FrameType.USELESS, - EnumRarity.common, - "No more cheaty frames for GTNH players."); - } + hiveFrameVoid = new MB_ItemFrame( + MB_FrameType.USELESS, + EnumRarity.common, + "No more cheaty frames for GTNH players."); hiveFrameAccelerated = new MB_ItemFrame( MB_FrameType.ACCELERATED, diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_ |