diff options
Diffstat (limited to 'src')
10 files changed, 253 insertions, 334 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index c06b609391..e17209ef91 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -922,7 +922,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ } aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]); aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]); - Recipe_GT mNew = new GT_Recipe_LargeCentrifuge(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, 0); + Recipe_GT mNew = new GT_Recipe_LargeCentrifuge(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) { return this.addRecipe(mNew); } @@ -993,7 +993,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ if (mColumn <= 2 && mRow <= 3) outputStacks.add( (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], this.getOutputChance(i))); } return outputStacks; } @@ -1087,7 +1087,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ } aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]); aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]); - Recipe_GT mNew = new GT_Recipe_LargeElectrolyzer(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, 0); + Recipe_GT mNew = new GT_Recipe_LargeElectrolyzer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) { return this.addRecipe(mNew); } @@ -1160,7 +1160,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ if (mColumn <= 2 && mRow <= 3) outputStacks.add( (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], this.getOutputChance(i))); } return outputStacks; } @@ -1255,7 +1255,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]); aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]); - Recipe_GT mNew = new GT_Recipe_AdvFreezer(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, 0); + Recipe_GT mNew = new GT_Recipe_AdvFreezer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) { return this.addRecipe(mNew); } @@ -1310,12 +1310,12 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ for (int i = 0; i < itemLimit; ++i) { if (this.mOutputs[i] != null) outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) this.mOutputs[i].copy(), 102 + i * 18, 5, ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) this.mOutputs[i].copy(), 102 + i * 18, 5, this.getOutputChance(i))); } for (int i = 0; i < fluidLimit; ++i) { if (this.mFluidOutputs[i] != null) outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23, ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23, this.getOutputChance(i))); } return outputStacks; } diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index de0cfe4711..9d5f940529 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -16,9 +16,7 @@ import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.InternalEntityRegistry; import gtPlusPlus.core.handler.*; -import gtPlusPlus.core.handler.events.BlockEventHandler; -import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler; -import gtPlusPlus.core.handler.events.ZombieBackupSpawnEventHandler; +import gtPlusPlus.core.handler.events.*; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; @@ -126,6 +124,7 @@ public class CommonProxy { Utils.registerEvent(new PickaxeBlockBreakEventHandler()); //Block Handler for all events. Utils.registerEvent(new BlockEventHandler()); + Utils.registerEvent(new GeneralTooltipEventHandler()); //Handles Custom tooltips for EIO. Utils.registerEvent(new HandlerTooltip_EIO()); diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java new file mode 100644 index 0000000000..6c940371b3 --- /dev/null +++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java @@ -0,0 +1,80 @@ +package gtPlusPlus.core.handler.events; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import gregtech.api.enums.ItemList; +import gtPlusPlus.core.handler.events.BlockEventHandler; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.sys.KeyboardUtils; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; + +public class GeneralTooltipEventHandler { + + ItemStack[] mGregtechTurbines = new ItemStack[6]; + String mTurbine; + String mExtra; + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent event){ + + if (CORE.ConfigSwitches.chanceToDropFluoriteOre > 0) { + if (!BlockEventHandler.blockLimestone.isEmpty()) { + for (ItemStack h : BlockEventHandler.blockLimestone) { + if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { + if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { + event.toolTip.add("May contain Fluorite Ore"); + } + } + } + } + if (!BlockEventHandler.oreLimestone.isEmpty()) { + for (ItemStack h : BlockEventHandler.oreLimestone) { + if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { + if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { + event.toolTip.add("May contain Fluorite Ore"); + } + } + } + } + } + + + if (CORE.ConfigSwitches.enableAnimatedTurbines) { + boolean shift = false; + try { + + if (KeyboardUtils.isShiftKeyDown()) { + shift = true; + mTurbine = "Animated Turbines can be disabled in the GT++ config"; + } + else { + mTurbine = EnumChatFormatting.ITALIC+"<Hold Shift>"+EnumChatFormatting.RESET; + } + for (int t=0;t<6;t++) { + if (mGregtechTurbines[t] != null) { + if (ItemStack.areItemStacksEqual(event.itemStack, mGregtechTurbines[t])){ + event.toolTip.add(mTurbine); + if (shift) { + if (mExtra == null) { + mExtra = CORE.GT_Tooltip; + } + event.toolTip.add(mExtra); + } + } + } + else { + mGregtechTurbines[t] = (t == 0 ? ItemList.Generator_Steam_Turbine_LV.get(1) : (t == 1 ? ItemList.Generator_Steam_Turbine_MV.get(1) : (t == 2 ? ItemList.Generator_Steam_Turbine_HV.get(1) : (t == 3 ? ItemList.Generator_Gas_Turbine_LV.get(1) : (t == 4 ? ItemList.Generator_Gas_Turbine_MV.get(1) : (ItemList.Generator_Gas_Turbine_HV.get(1))))))); + } + } + } + catch (Throwable t) {} + } + + } + +} diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index 7e30a14f6b..5426bb1a6a 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -19,6 +19,7 @@ public class LoadedMods { public static boolean EnderIO = false; public static boolean Big_Reactors = false; public static boolean IndustrialCraft2 = false; + public static boolean IndustrialCraft2Classic = false; public static boolean Simply_Jetpacks = false; public static boolean RFTools = false; public static boolean Thaumcraft = false; @@ -58,7 +59,7 @@ public class LoadedMods { @SuppressWarnings("deprecation") public static void checkLoaded(){ Logger.INFO("Looking for optional mod prereqs."); - if (Loader.isModLoaded("gregtech") == true ){ + if (Loader.isModLoaded("gregtech") ){ Gregtech = true; Logger.INFO("Components enabled for: Gregtech"); if (Gregtech){ @@ -75,115 +76,120 @@ public class LoadedMods { totalMods++; } - if (Loader.isModLoaded("dreamcraft") == true){ + if (Loader.isModLoaded("dreamcraft")){ DreamCraft = true; GTNH = true; Logger.INFO("Components enabled for: DreamCraft"); Logger.INFO("Components enabled for: GT: New Horizons"); totalMods++; } - if (Loader.isModLoaded("beyondrealitycore") == true){ + if (Loader.isModLoaded("beyondrealitycore")){ BeyondRealityCore = true; BRC = true; Logger.INFO("Components enabled for: Beyond Reality"); totalMods++; } - if (Loader.isModLoaded("PlayerAPI") == true){ + if (Loader.isModLoaded("PlayerAPI")){ PlayerAPI = true; Logger.INFO("Components enabled for: PlayerAPI"); totalMods++; } - if (Loader.isModLoaded("TConstruct") == true){ + if (Loader.isModLoaded("TConstruct")){ TiCon = true; Logger.INFO("Components enabled for: Tinkers Construct"); totalMods++; } - if (Loader.isModLoaded("BuildCraft") == true){ + if (Loader.isModLoaded("BuildCraft")){ BuildCraft = true; Logger.INFO("Components enabled for: BuildCraft"); totalMods++; } - if ((Loader.isModLoaded("EnderIO") == true) && !ConfigSwitches.disableEnderIOIntegration){ + if ((Loader.isModLoaded("EnderIO")) && !ConfigSwitches.disableEnderIOIntegration){ EnderIO = true; Logger.INFO("Components enabled for: EnderIO"); totalMods++; } - if (Loader.isModLoaded("BigReactors") == true){ + if (Loader.isModLoaded("BigReactors")){ Big_Reactors = true; Logger.INFO("Components enabled for: Big Reactors"); totalMods++; } - if (Loader.isModLoaded("IC2") == true){ + if (Loader.isModLoaded("IC2")){ IndustrialCraft2 = true; Logger.INFO("Components enabled for: IndustrialCraft2"); totalMods++; } - if (Loader.isModLoaded("simplyjetpacks") == true){ + if (Loader.isModLoaded("IC2-Classic-Spmod")){ + IndustrialCraft2Classic = true; + Logger.INFO("Components enabled for: IndustrialCraft2-Classic"); + totalMods++; + } + if (Loader.isModLoaded("simplyjetpacks")){ Simply_Jetpacks = true; Logger.INFO("Components enabled for: Simply Jetpacks"); totalMods++; } - if (Loader.isModLoaded("rftools") == true){ + if (Loader.isModLoaded("rftools")){ RFTools = true; Logger.INFO("Components enabled for: RFTools"); totalMods++; } - if (Loader.isModLoaded("StevesCarts") == true){ + if (Loader.isModLoaded("StevesCarts")){ StevesCarts = true; Logger.INFO("Components enabled for: StevesCarts"); totalMods++; } - if (Loader.isModLoaded("Thaumcraft") == true){ + if (Loader.isModLoaded("Thaumcraft")){ Thaumcraft = true; Logger.INFO("Components enabled for: Thaumcraft"); totalMods++; } - if (Loader.isModLoaded("BiomesOPlenty") == true){ + if (Loader.isModLoaded("BiomesOPlenty")){ BiomesOPlenty = true; Logger.INFO("Components enabled for: BiomesOPlenty"); totalMods++; } - if (Loader.isModLoaded("ExtraUtilities") == true){ + if (Loader.isModLoaded("ExtraUtilities")){ Extra_Utils = true; Logger.INFO("Components enabled for: Extra_Utils"); totalMods++; } - if (Loader.isModLoaded("harvestcraft") == true){ + if (Loader.isModLoaded("harvestcraft")){ PamsHarvestcraft = true; Logger.INFO("Components enabled for: PamsHarvestcraft"); totalMods++; } - if (Loader.isModLoaded("PneumaticCraft") == true){ + if (Loader.isModLoaded("PneumaticCraft")){ PneumaticCraft = true; Logger.INFO("Components enabled for: PneumaticCraft"); totalMods++; } - if (Loader.isModLoaded("MorePlanet") == true){ + if (Loader.isModLoaded("MorePlanet")){ MorePlanets = true; Logger.INFO("Components enabled for: MorePlanets"); totalMods++; } - if (Loader.isModLoaded("ForbiddenMagic") == true){ + if (Loader.isModLoaded("ForbiddenMagic")){ ForbiddenMagic = true; Logger.INFO("Components enabled for: ForbiddenMagic"); totalMods++; } - if (Loader.isModLoaded("CompactWindmills") == true){ + if (Loader.isModLoaded("CompactWindmills")){ CompactWindmills = true; Logger.INFO("Components enabled for: CompactWindmills"); totalMods++; } - if (Loader.isModLoaded("Railcraft") == true){ + if (Loader.isModLoaded("Railcraft")){ Railcraft = true; Logger.INFO("Components enabled for: Railcraft"); totalMods++; } - if (Loader.isModLoaded("Mekanism") == true){ + if (Loader.isModLoaded("Mekanism")){ Mekanism = true; Logger.INFO("Components enabled for: Mekanism - This feature is not configurable and balances Mekanism to suit GT."); totalMods++; } - if (Loader.isModLoaded("Growthcraft") == true){ + if (Loader.isModLoaded("Growthcraft")){ Logger.INFO("Growthcraft Version: "+getModVersion("Growthcraft")); if (getModVersion("Growthcraft").equals("1.7.10-2.3.1")){ //Load Growthcraft Compat @@ -196,32 +202,32 @@ public class LoadedMods { Logger.INFO("Growthcraft found, but the version was too new. I will update GC support eventually."); } } - if (Loader.isModLoaded("CoFHCore") == true){ + if (Loader.isModLoaded("CoFHCore")){ CoFHCore = true; Logger.INFO("Components enabled for: CoFHCore"); totalMods++; } - if (Loader.isModLoaded("Forestry") == true){ + if (Loader.isModLoaded("Forestry")){ Forestry = true; Logger.INFO("Components enabled for: Forestry"); totalMods++; } - if (Loader.isModLoaded("MagicBees") == true){ + if (Loader.isModLoaded("MagicBees")){ MagicBees = true; Logger.INFO("Components enabled for: MagicBees"); totalMods++; } - if (Loader.isModLoaded("psychedelicraft") == true){ + if (Loader.isModLoaded("psychedelicraft")){ Psychedelicraft = true; Logger.INFO("Components enabled for: Psychedelicraft"); totalMods++; } - if (Loader.isModLoaded("ImmersiveEngineering") == true){ + if (Loader.isModLoaded("ImmersiveEngineering")){ ImmersiveEngineering = true; Logger.INFO("Components enabled for: ImmersiveEngineering"); totalMods++; } - if (Loader.isModLoaded("ExtraBees") == true){ + if (Loader.isModLoaded("ExtraBees")){ ExtraBees = true; Logger.INFO("Components enabled for: ExtraBees"); totalMods++; @@ -231,32 +237,32 @@ public class LoadedMods { Logger.INFO("Components enabled for: ThermalFoundation - This feature will disable itself if you add TF."); totalMods++; } - else if (Loader.isModLoaded("ThermalFoundation") == true){ + else if (Loader.isModLoaded("ThermalFoundation")){ ThermalFoundation = true; Logger.INFO("Components disabled for: ThermalFoundation - This feature will enable itself if you remove TF."); //totalMods++; } - if (Loader.isModLoaded("ihl") == true){ + if (Loader.isModLoaded("ihl")){ IHL = true; Logger.INFO("Components enabled for: IHL"); totalMods++; } - if (Loader.isModLoaded("Baubles") == true){ + if (Loader.isModLoaded("Baubles")){ Baubles = true; Logger.INFO("Components enabled for: Baubles"); totalMods++; } - if (Loader.isModLoaded("GalacticraftCore") == true){ + if (Loader.isModLoaded("GalacticraftCore")){ GalacticraftCore = true; Logger.INFO("Components enabled for: Galacticraft Core"); totalMods++; } - if (Loader.isModLoaded("OpenComputers") == true){ + if (Loader.isModLoaded("OpenComputers")){ OpenComputers = true; Logger.INFO("Components enabled for: OpenComputers"); totalMods++; } - if (Loader.isModLoaded("computronics") == true){ + if (Loader.isModLoaded("computronics")){ Computronics = true; Logger.INFO("Components disabled for: Computronics - This feature will enable itself if you remove Computronics."); totalMods++; @@ -264,12 +270,12 @@ public class LoadedMods { else { Logger.INFO("Components enabled for: Computronics - This feature will disable itself if you add Computronics."); } - if (Loader.isModLoaded("GTRedtech") == true){ + if (Loader.isModLoaded("GTRedtech")){ RedTech = true; Logger.INFO("Components enabled for: GTRedtech"); totalMods++; } - if (Loader.isModLoaded("tectech") == true){ + if (Loader.isModLoaded("tectech")){ TecTech = true; Logger.INFO("Components enabled for: TecTech"); totalMods++; diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index b182668539..3a0d033725 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -117,7 +117,7 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000, 2040); } - + } private static void fluidcannerRecipes() { @@ -134,7 +134,7 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("hydrofluoricacid", 250), null); GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 250)); - + if (Utils.getGregtechVersionAsInt() >= 50929) { // Hydrofluoric Acid GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), @@ -198,24 +198,16 @@ public class RECIPES_GREGTECH { try { // Makes Lithium Carbonate - CORE.RA.addDehydratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), // Item - // Input - FluidUtils.getFluidStack("sulfuriclithium", 440), // Fluid - // input - // (slot - // 1) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), + CORE.RA.addDehydratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), + FluidUtils.getFluidStack("sulfuriclithium", 440), + new ItemStack[] { + CI.emptyCells(1), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) }, // Output - // Array - // of - // Items - // - - // Upto - // 9 + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) + }, 30 * 20, // Time in ticks 30); // EU } @@ -224,31 +216,22 @@ public class RECIPES_GREGTECH { } try { - ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", - "Empty Fluid Cells", 0, 12); - - if (cells == null) { - cells = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12); - } + ItemStack cells = CI.emptyCells(12); final ItemStack[] input = { cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) }; CORE.RA.addDehydratorRecipe(input, // Item input (Array, up to 2) - FluidUtils.getFluidStack("sulfuricacid", 10000), // Fluid - // input - // (slot - // 1) - FluidUtils.getFluidStack("sulfuriclithium", 10000), // Fluid - // output - // (slot - // 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), + FluidUtils.getFluidStack("sulfuricacid", 10000), + FluidUtils.getFluidStack("sulfuriclithium", 10000), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate }, // Output Array of Items - Upto 9, - new int[] { 0 }, 75 * 20, // Time in ticks + new int[] { 0 }, + 75 * 20, // Time in ticks 1000); // EU } @@ -257,25 +240,16 @@ public class RECIPES_GREGTECH { } try { - CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), // Fluid - // input - // (slot - // 1) - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) + }, + FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), + null, + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), + CI.emptyCells(10) + }, new int[] { 0 }, 150 * 20, // Time in ticks 2000); // EU @@ -285,25 +259,15 @@ public class RECIPES_GREGTECH { } try { - CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) }, // Item - // input - // (Array, - // up - // to - // 2) + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) + }, // Item FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), // Fluid - // input - // (slot - // 1) null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), + CI.emptyCells(10) }, // Output new int[] { 0 }, 300 * 20, // Time in ticks 4000); // EU @@ -315,21 +279,14 @@ public class RECIPES_GREGTECH { // Raisins from Grapes try { - CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1) }, // Item - // input - // (Array, - // up - // to - // 2) + CORE.RA.addDehydratorRecipe(new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1) + }, // Item null, // Fluid input (slot 1) null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) + }, // Output new int[] { 0 }, 10 * 20, // Time in ticks 8); // EU @@ -345,21 +302,10 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) }, // Item - // input - // (Array, - // up - // to - // 2) FluidUtils.getFluidStack("water", 10000), // Fluid input // (slot 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, new int[] { 0 }, 120 * 20, // Time in ticks 120); // EU @@ -373,12 +319,9 @@ public class RECIPES_GREGTECH { // Process Waste Water try { - CORE.RA.addDehydratorRecipe(null, // Item input (Array, up to 2) - FluidUtils.getFluidStack("fluid.sludge", 1000), // Fluid input - // (slot 1) - FluidUtils.getFluidStack("nitricacid", 10), // Fluid - // output - // (slot 2) + CORE.RA.addDehydratorRecipe(null, + FluidUtils.getFluidStack("fluid.sludge", 1000), + FluidUtils.getFluidStack("nitricacid", 10), new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), @@ -387,16 +330,9 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, // Time - // in - // ticks + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, + new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, + 2 * 20, 500); // EU } @@ -410,22 +346,15 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item - // input - // (Array, - // up - // to - // 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) + }, // Item null, // Fluid input (slot 1) null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) + }, // Output new int[] { 0 }, 120 * 20, // Time in ticks 1000); // EU @@ -437,25 +366,16 @@ public class RECIPES_GREGTECH { // LiOH Liquid to Dust try { - CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(0) }, // Item - // input - // (Array, - // up - // to - // 2) + CORE.RA.addDehydratorRecipe(new ItemStack[] { + ItemUtils.getGregtechCircuit(0) + }, // Item FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid - // input - // (slot - // 1) null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0 }, 1 * 20, // Time in ticks + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) + }, // Output + new int[] { 0 }, + 1 * 20, // Time in ticks 64); // EU } @@ -467,34 +387,22 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), // Fluid - // input - // (slot - // 1) - null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), + CI.emptyCells(9) + }, // Item + FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), + null, new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), - ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, new int[] { 0 }, 120 * 20, // Time in ticks 500); // EU - + if (Utils.getGregtechVersionAsInt() >= 50929) { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, + CI.emptyCells(9) }, FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144), null, new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), @@ -503,7 +411,7 @@ public class RECIPES_GREGTECH { 120 * 20, // Time in ticks 500); // EU } - + } catch (final NullPointerException e) { @@ -514,33 +422,22 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("sulfuricacid", 56 * 144), // Fluid - // input - // (slot - // 1) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), + CI.emptyCells(16) + }, + FluidUtils.getFluidStack("sulfuricacid", 56 * 144), null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0, 0, 100, 100, 300, 200 }, 10 * 60 * 20, // Time - // in - // ticks + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) + }, + new int[] { 0, 0, 100, 100, 300, 200 }, + 10 * 60 * 20, 230); // EU } @@ -551,27 +448,18 @@ public class RECIPES_GREGTECH { // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O try { CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) }, // Item - // input - // (Array, - // up - // to - // 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) + }, null, // Fluid input (slot 1) - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), // Fluid - // output - // (slot - // 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0, 0, 0 }, 32 * 20, // Time in ticks + FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), + CI.emptyCells(2) + }, + new int[] { 0, 0, 0 }, + 32 * 20, // Time in ticks 64); // EU } @@ -582,27 +470,16 @@ public class RECIPES_GREGTECH { // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 try { CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), // Fluid - // input - // (slot - // 1) + new ItemStack[] { + CI.emptyCells(5) + }, + FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0, 0, 0 }, 5 * 60 * 20, // Time in ticks + ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, + new int[] { 0, 0, 0 }, + 5 * 60 * 20, // Time in ticks 120); // EU } @@ -612,7 +489,7 @@ public class RECIPES_GREGTECH { // Makes Styrene CORE.RA.addDehydratorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3), // Item Input + CI.emptyCells(3), // Item Input FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), // Fluid / new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) }, // Output @@ -621,33 +498,9 @@ public class RECIPES_GREGTECH { } + @Deprecated private static void lftrRecipes() { - try { - } - catch (final NullPointerException e) { - Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - try { - - - } - catch (final NullPointerException e) { - Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - try { - - } - catch (final NullPointerException e) { - Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - try { - - - } - catch (final NullPointerException e) { - Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } } private static void fissionFuelRecipes() { @@ -953,7 +806,7 @@ public class RECIPES_GREGTECH { GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16), FluidUtils.getFluidStack("water", 1000), FluidUtils.getFluidStack("lithiumhydroxide", 144 * 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), 300 * 20); + CI.emptyCells(1), 300 * 20); // LFTR Fuel Related Compounds if (CORE.GTNH) { @@ -962,7 +815,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("hydroxide", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), GT_Values.NI, 8 * 20, 30); + CI.emptyCells(2), GT_Values.NI, 8 * 20, 30); // Beryllium Hydroxide GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("hydroxide", 1000), @@ -971,13 +824,13 @@ public class RECIPES_GREGTECH { GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("ammonium", 1000), FluidUtils.getFluidStack("ammoniumbifluoride", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), 26 * 20); + CI.emptyCells(1), 26 * 20); // Ammonium AddGregtechRecipe.addChemicalRecipeForBasicMachineOnly( ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("ammonium", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), GT_Values.NI, 20 * 20, 30); + CI.emptyCells(2), GT_Values.NI, 20 * 20, 30); } if (!CORE.GTNH) { @@ -985,12 +838,12 @@ public class RECIPES_GREGTECH { GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("hydroxide", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 8 * 20); + CI.emptyCells(2), 8 * 20); // Ammonia (moved to GTNH core mod) GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0), FluidUtils.getFluidStack("nitrogen", 1000), FluidUtils.getFluidStack("ammonia", 1000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3), 14 * 20); + CI.emptyCells(3), 14 * 20); // Beryllium Hydroxide GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), GT_Values.NI, FluidUtils.getFluidStack("hydroxide", 1000), FluidUtils.getFluidStack("berylliumhydroxide", 2000), @@ -999,23 +852,23 @@ public class RECIPES_GREGTECH { GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), GT_Values.NI, FluidUtils.getFluidStack("ammonium", 1000), FluidUtils.getFluidStack("ammoniumbifluoride", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), 26 * 20); + CI.emptyCells(1), 26 * 20); // Ammonium GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("ammonium", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 20 * 20); + CI.emptyCells(2), 20 * 20); } - + //Refine GT HF into GT++ HF GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid_GT5U", 5), null, // Fluid Input FluidUtils.getFluidStack("hydrofluoricacid", 6000), // Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 7), + CI.emptyCells(7), 2 * 20); - + } private static void blastFurnaceRecipes() { @@ -1217,7 +1070,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), FluidUtils.getFluidStack("oxygen", 8000), - null, ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), ALLOY.HG1223.getDust(16), null, null, + null, CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null, 30 * 20, 500); } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 7ad7820985..3758025d4a 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -509,4 +509,8 @@ public class CI { LOADER_Machine_Components.initialise(); } + public static ItemStack emptyCells(int i) { + return ItemUtils.getEmptyCell(i); + } + } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 58333cccda..edeb056be4 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -97,7 +97,7 @@ public class ItemUtils { public static ItemStack getEmptyCell(int i){ if (ItemList.Cell_Empty.hasBeenSet()) { - return ItemList.Cell_Empty.get(1L, new Object[0]); + return ItemList.Cell_Empty.get(i); } final ItemStack temp = GT_ModHandler.getModItem("IC2", "itemCellEmpty", i, 0); return temp != null ? temp : null; diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index c266d55cac..788e4d6d9f 100644 --- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -6,13 +6,10 @@ import java.lang.reflect.Field; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import gregtech.api.enums.Materials; -import gtPlusPlus.core.handler.events.BlockEventHandler; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; @@ -130,26 +127,6 @@ public class HandlerTooltip_EIO { } } - if (!BlockEventHandler.blockLimestone.isEmpty()) { - for (ItemStack h : BlockEventHandler.blockLimestone) { - if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { - if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { - event.toolTip.add("May contain Fluorite Ore"); - } - } - } - } - if (!BlockEventHandler.oreLimestone.isEmpty()) { - for (ItemStack h : BlockEventHandler.oreLimestone) { - if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { - if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { - event.toolTip.add("May contain Fluorite Ore"); - } - } - } - } - - } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 41651ad479..b4aa2080f9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -88,7 +88,7 @@ public class GregtechFluidHandler { private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps){ Logger.INFO("Adding a Cell for "+fluidNameWithCaps); - if (LoadedMods.IndustrialCraft2){ + if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic){ return Utils.createInternalNameAndFluidCell(fluidNameWithCaps); } return null; @@ -96,7 +96,7 @@ public class GregtechFluidHandler { private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps){ Logger.INFO("Adding a Cell for "+fluidNameWithCaps); - if (LoadedMods.IndustrialCraft2){ + if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic){ return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps); } return null; diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java index 06ae8a48bb..558b134ea9 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java +++ b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java @@ -53,10 +53,10 @@ public class HANDLER_Thaumcraft { if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) { List<TC_AspectStack_Ex> list = Arrays.asList(j.getValue()); if (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) { - Logger.INFO("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); + Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); } else { - Logger.INFO("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); + Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); } } } |