diff options
424 files changed, 3538 insertions, 5341 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 6df609fbda..df823cce45 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,5 @@ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.44:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.45:dev') api("com.github.GTNewHorizons:bartworks:0.5.155:dev") api("com.github.GTNewHorizons:TecTech:5.0.88:dev") diff --git a/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java b/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java index 678bc1b6ef..c7a3bc7b46 100644 --- a/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java +++ b/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java @@ -4,6 +4,9 @@ */ package Ic2ExpReactorPlanner; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GoodGenerator; + import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; @@ -24,7 +27,6 @@ import gregtech.api.enums.ItemList; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.goodgenerator.GG_Utils; import gtPlusPlus.xmod.goodgenerator.GG_Utils.GG_Fuel_Rod; @@ -558,7 +560,7 @@ public class ComponentFactory { true)); aID = 51; - if (LoadedMods.BartWorks) { + if (BartWorks.isModLoaded()) { ITEM_LIST.put( aID++, new FuelRod( @@ -567,7 +569,7 @@ public class ComponentFactory { new GT_ItemStack(BW_NonMeta_MaterialItems.TiberiumCell_1.get(1)), 50e3, 1, - "Bartworks", + BartWorks.ID, 100, 1, 1, @@ -580,7 +582,7 @@ public class ComponentFactory { new GT_ItemStack(BW_NonMeta_MaterialItems.TiberiumCell_2.get(1)), 50e3, 1, - "Bartworks", + BartWorks.ID, 200, 2, 2, @@ -593,7 +595,7 @@ public class ComponentFactory { new GT_ItemStack(BW_NonMeta_MaterialItems.TiberiumCell_4.get(1)), 50e3, 1, - "Bartworks", + BartWorks.ID, 400, 4, 4, @@ -606,7 +608,7 @@ public class ComponentFactory { new GT_ItemStack(BW_NonMeta_MaterialItems.TheCoreCell.get(1)), 100e3, 1, - "Bartworks", + BartWorks.ID, 72534, 816, 32, @@ -652,7 +654,7 @@ public class ComponentFactory { "GTNH")); aID = 59; - if (LoadedMods.GoodGenerator) { + if (GoodGenerator.isModLoaded()) { ITEM_LIST.put( aID++, new FuelRod( @@ -661,7 +663,7 @@ public class ComponentFactory { new GT_ItemStack(GG_Utils.getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedUranium, 1)), 50e3, 1, - "GoodGenerator", + GoodGenerator.ID, 100, 1, 1, @@ -674,7 +676,7 @@ public class ComponentFactory { new GT_ItemStack(GG_Utils.getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedUranium_2, 1)), 50e3, 1, - "GoodGenerator", + GoodGenerator.ID, 100, 1, 2, @@ -687,7 +689,7 @@ public class ComponentFactory { new GT_ItemStack(GG_Utils.getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedUranium_4, 1)), 50e3, 1, - "GoodGenerator", + GoodGenerator.ID, 100, 1, 4, @@ -700,7 +702,7 @@ public class ComponentFactory { new GT_ItemStack(GG_Utils.getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedPlutonium, 1)), 50e3, 1, - "GoodGenerator", + GoodGenerator.ID, 50, 1, 1, @@ -713,7 +715,7 @@ public class ComponentFactory { new GT_ItemStack(GG_Utils.getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedPlutonium_2, 1)), 50e3, 1, - "GoodGenerator", + GoodGenerator.ID, 50, 1, 2, @@ -726,7 +728,7 @@ public class ComponentFactory { new GT_ItemStack(GG_Utils.getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedPlutonium_4, 1)), 50e3, 1, - "GoodGenerator", + GoodGenerator.ID, 50, 1, 4, diff --git a/src/main/java/Ic2ExpReactorPlanner/Reactor.java b/src/main/java/Ic2ExpReactorPlanner/Reactor.java index cbfd549552..08de840b8c 100644 --- a/src/main/java/Ic2ExpReactorPlanner/Reactor.java +++ b/src/main/java/Ic2ExpReactorPlanner/Reactor.java @@ -4,7 +4,7 @@ */ package Ic2ExpReactorPlanner; -import java.awt.HeadlessException; +import java.awt.*; import java.util.ArrayList; import Ic2ExpReactorPlanner.components.ReactorItem; diff --git a/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java b/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java index 8319f6931b..852817775d 100644 --- a/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java +++ b/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java @@ -4,6 +4,8 @@ */ package Ic2ExpReactorPlanner.components; +import static gregtech.api.enums.Mods.IndustrialCraft2; + import java.util.HashMap; import Ic2ExpReactorPlanner.Reactor; @@ -219,7 +221,7 @@ public class ReactorItem { automationThreshold = (int) (maxDamage * 1.1); } if (sourceMod == null) { - sourceMod = "IC2"; + sourceMod = IndustrialCraft2.ID; } this.sourceMod = sourceMod; sComponentMap.put(sourceMod + "." + aItem.mItem.getUnlocalizedName() + "." + aItem.mMetaData, this); diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index 0683f4f02f..c169170bb7 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -1,12 +1,19 @@ package gregtech.api.util; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.E; +import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GTPlusPlus; import static net.minecraft.util.EnumChatFormatting.GRAY; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidStack; import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.common.widget.ProgressBar; @@ -19,7 +26,6 @@ import gregtech.nei.NEIRecipeInfo; import gtPlusPlus.api.interfaces.IComparableRecipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; @@ -463,7 +469,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { "gtpp.recipe.fluidchemicaleactor", "Chemical Plant", null, - CORE.MODID + ":textures/gui/FluidReactor", + GTPlusPlus.ID + ":textures/gui/FluidReactor", 4, 4, 0, diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 4c52a6f59d..f552ee2850 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -1,5 +1,8 @@ package gtPlusPlus; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Names; +import static gregtech.api.enums.Mods.Thaumcraft; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import java.awt.event.ActionEvent; @@ -50,11 +53,9 @@ import gtPlusPlus.core.handler.events.MissingMappingsEvent; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.general.ItemGiantEgg; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.LocaleUtils; -import gtPlusPlus.core.util.minecraft.HazmatUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.nei.NEI_IMC_Sender; import gtPlusPlus.plugin.manager.Core_Manager; @@ -68,10 +69,29 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; @MCVersion(value = "1.7.10") @Mod( - modid = CORE.MODID, + modid = Names.G_T_PLUS_PLUS, name = CORE.name, version = CORE.VERSION, - dependencies = "required-after:Forge; after:TConstruct; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; required-after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO; after:tectech; after:GTRedtech; after:beyondrealitycore; after:OpenBlocks; after:IC2NuclearControl; after:TGregworks; after:StevesCarts; after:xreliquary; required-after:gtnhlib@[0.0.10,)") + dependencies = "required-after:Forge;" + " after:TConstruct;" + + " after:PlayerAPI;" + + " after:dreamcraft;" + + " after:IC2;" + + " required-after:gregtech;" + + " after:Forestry;" + + " after:MagicBees;" + + " after:CoFHCore;" + + " after:Railcraft;" + + " after:CompactWindmills;" + + " after:ForbiddenMagic;" + + " after:ExtraUtilities;" + + " after:Thaumcraft;" + + " after:EnderIO;" + + " after:tectech;" + + " after:OpenBlocks;" + + " after:IC2NuclearControl;" + + " after:TGregworks;" + + " after:StevesCarts;" + + " required-after:gtnhlib@[0.0.10,);") public class GTplusplus implements ActionListener { public static enum INIT_PHASE { @@ -108,7 +128,7 @@ public class GTplusplus implements ActionListener { public static INIT_PHASE CURRENT_LOAD_PHASE = INIT_PHASE.SUPER; // Mod Instance - @Mod.Instance(CORE.MODID) + @Mod.Instance(Names.G_T_PLUS_PLUS) public static GTplusplus instance; // GT++ Proxy Instances @@ -196,7 +216,6 @@ public class GTplusplus implements ActionListener { public void postInit(final FMLPostInitializationEvent event) { INIT_PHASE.POST_INIT.setPhaseActive(true); proxy.postInit(event); - HazmatUtils.init(); BookHandler.runLater(); Meta_GT_Proxy.postInit(); Core_Manager.postInit(); @@ -237,7 +256,7 @@ public class GTplusplus implements ActionListener { event.registerServerCommand(new CommandMath()); event.registerServerCommand(new CommandEnableDebugWhileRunning()); event.registerServerCommand(new CommandDebugChunks()); - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { event.registerServerCommand(new CommandDumpAspects()); } Core_Manager.serverStart(); @@ -381,56 +400,60 @@ public class GTplusplus implements ActionListener { private static final HashMap<String, Block> sMissingBlockMappings = new HashMap<String, Block>(); private static void processMissingMappings() { - sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(CORE.MODID, "itemCellAmmonium")); - sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(CORE.MODID, "itemCellHydroxide")); + sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(GTPlusPlus.ID, "itemCellAmmonium")); + sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(GTPlusPlus.ID, "itemCellHydroxide")); sMissingItemMappings.put( "miscutils:BerylliumHydroxide", - GameRegistry.findItem(CORE.MODID, "itemCellmiscutils:BerylliumHydroxide")); - sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(CORE.MODID, "itemCellBromine")); - sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(CORE.MODID, "itemCellKrypton")); + GameRegistry.findItem(GTPlusPlus.ID, "itemCellmiscutils:BerylliumHydroxide")); + sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(GTPlusPlus.ID, "itemCellBromine")); + sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(GTPlusPlus.ID, "itemCellKrypton")); sMissingItemMappings.put( "miscutils:itemCellZirconiumTetrafluoride", - GameRegistry.findItem(CORE.MODID, "ZirconiumTetrafluoride")); + GameRegistry.findItem(GTPlusPlus.ID, "ZirconiumTetrafluoride")); sMissingItemMappings - .put("miscutils:Li2BeF4", GameRegistry.findItem(CORE.MODID, "itemCellLithiumTetrafluoroberyllate")); + .put("miscutils:Li2BeF4", GameRegistry.findItem(GTPlusPlus.ID, "itemCellLithiumTetrafluoroberyllate")); // Cryolite - sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(CORE.MODID, "oreCryoliteF")); + sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(GTPlusPlus.ID, "oreCryoliteF")); sMissingItemMappings - .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(CORE.MODID, "itemDustTinyCryoliteF")); + .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyCryoliteF")); sMissingItemMappings - .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(CORE.MODID, "itemDustSmallCryoliteF")); - sMissingItemMappings.put("miscutils:itemDustCryolite", GameRegistry.findItem(CORE.MODID, "itemDustCryoliteF")); - sMissingItemMappings.put("miscutils:dustPureCryolite", GameRegistry.findItem(CORE.MODID, "dustPureCryoliteF")); + .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallCryoliteF")); sMissingItemMappings - .put("miscutils:dustImpureCryolite", GameRegistry.findItem(CORE.MODID, "dustImpureCryoliteF")); - sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(CORE.MODID, "crushedCryoliteF")); + .put("miscutils:itemDustCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustCryoliteF")); + sMissingItemMappings + .put("miscutils:dustPureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureCryoliteF")); + sMissingItemMappings + .put("miscutils:dustImpureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureCryoliteF")); + sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(GTPlusPlus.ID, "crushedCryoliteF")); sMissingItemMappings.put( "miscutils:crushedPurifiedCryolite", - GameRegistry.findItem(CORE.MODID, "crushedPurifiedCryoliteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedCryoliteF")); sMissingItemMappings.put( "miscutils:crushedCentrifugedCryolite", - GameRegistry.findItem(CORE.MODID, "crushedCentrifugedCryoliteF")); - sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(CORE.MODID, "oreCryoliteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedCryoliteF")); + sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(GTPlusPlus.ID, "oreCryoliteF")); // Fluorite - sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(CORE.MODID, "oreFluoriteF")); + sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(GTPlusPlus.ID, "oreFluoriteF")); + sMissingItemMappings + .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyFluoriteF")); + sMissingItemMappings + .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallFluoriteF")); sMissingItemMappings - .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(CORE.MODID, "itemDustTinyFluoriteF")); + .put("miscutils:itemDustFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustFluoriteF")); sMissingItemMappings - .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(CORE.MODID, "itemDustSmallFluoriteF")); - sMissingItemMappings.put("miscutils:itemDustFluorite", GameRegistry.findItem(CORE.MODID, "itemDustFluoriteF")); - sMissingItemMappings.put("miscutils:dustPureFluorite", GameRegistry.findItem(CORE.MODID, "dustPureFluoriteF")); + .put("miscutils:dustPureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureFluoriteF")); sMissingItemMappings - .put("miscutils:dustImpureFluorite", GameRegistry.findItem(CORE.MODID, "dustImpureFluoriteF")); - sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(CORE.MODID, "crushedFluoriteF")); + .put("miscutils:dustImpureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureFluoriteF")); + sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(GTPlusPlus.ID, "crushedFluoriteF")); sMissingItemMappings.put( "miscutils:crushedPurifiedFluorite", - GameRegistry.findItem(CORE.MODID, "crushedPurifiedFluoriteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedFluoriteF")); sMissingItemMappings.put( "miscutils:crushedCentrifugedFluorite", - GameRegistry.findItem(CORE.MODID, "crushedCentrifugedFluoriteF")); - sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(CORE.MODID, "oreFluoriteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedFluoriteF")); + sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(GTPlusPlus.ID, "oreFluoriteF")); } @Mod.EventHandler @@ -461,11 +484,11 @@ public class GTplusplus implements ActionListener { private static void remap(Item item, FMLMissingMappingsEvent.MissingMapping mapping) { mapping.remap(item); - Logger.INFO("Remapping item " + mapping.name + " to " + CORE.MODID + ":" + item.getUnlocalizedName()); + Logger.INFO("Remapping item " + mapping.name + " to " + GTPlusPlus.ID + ":" + item.getUnlocalizedName()); } private static void remap(Block block, FMLMissingMappingsEvent.MissingMapping mapping) { mapping.remap(block); - Logger.INFO("Remapping block " + mapping.name + " to " + CORE.MODID + ":" + block.getUnlocalizedName()); + Logger.INFO("Remapping block " + mapping.name + " to " + GTPlusPlus.ID + ":" + block.getUnlocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java index 64c2198662..205ff05dc1 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java @@ -6,7 +6,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import gregtech.api.interfaces.IDescribable; -import gregtech.api.interfaces.tileentity.*; +import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; +import gregtech.api.interfaces.tileentity.IGearEnergyTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; +import gregtech.api.interfaces.tileentity.ITurnable; public abstract interface IGregtechPower extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index 92ba97e722..9e26ea9174 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -1,7 +1,14 @@ package gtPlusPlus.api.objects.data; import java.io.Serializable; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Queue; +import java.util.Set; public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collection<V>, Queue<V>, List<V> { diff --git a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java index 45d8074366..da6fc7d181 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java @@ -1,6 +1,9 @@ package gtPlusPlus.api.objects.data; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; public class ReverseAutoMap<N> extends AutoMap<N> { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index a90d72864c..a90a52e829 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -1,9 +1,10 @@ package gtPlusPlus.api.objects.minecraft; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraftforge.fluids.Fluid; import gregtech.api.GregTech_API; -import gtPlusPlus.core.lib.CORE; public class FluidGT6 extends Fluid implements Runnable { @@ -27,6 +28,6 @@ public class FluidGT6 extends Fluid implements Runnable { @Override public void run() { - this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":" + "fluids/fluid." + this.mTextureName)); + this.setIcons(GregTech_API.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid." + this.mTextureName)); } } diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java index b1f4eab4be..932fe7b48d 100644 --- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -8,8 +10,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import gtPlusPlus.core.lib.CORE; - public class AdvancedBlock extends Block { protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x, @@ -17,7 +17,7 @@ public class AdvancedBlock extends Block { final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) { super(material); this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(x); this.setHardness(blockHardness); // block Hardness this.setResistance(blockResistance); diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 54614d0288..72e3b24124 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; @@ -8,7 +10,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BasicBlock extends BlockContainer { @@ -26,7 +27,7 @@ public class BasicBlock extends BlockContainer { this.setBlockName(Utils.sanitizeString(unlocalizedName)); if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase().contains("ore")) { - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); } this.setCreativeTab(AddToCreativeTab.tabBlock); diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index f332573620..d370940b41 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -183,7 +185,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // DOWN, UP, NORTH, SOUTH, WEST, EAST // Default Path Name, this will make us look inside 'miscutils\textures\blocks' - final String aPrefixTexPath = CORE.MODID + ":"; + final String aPrefixTexPath = GTPlusPlus.ID + ":"; // Default Path Name, this will make us look in the sub-directory for this Tile Entity. final String aTexPathMid = "TileEntities" + CORE.SEPERATOR + getTileEntityNameForTexturePathing() @@ -276,7 +278,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override @SideOnly(Side.CLIENT) public final void registerBlockIcons(final IIconRegister aRegisterer) { - this.blockIcon = aRegisterer.registerIcon(CORE.MODID + ":" + "net"); + this.blockIcon = aRegisterer.registerIcon(GTPlusPlus.ID + ":" + "net"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index edb1ba4dcf..a0cdd88193 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.material.Material; @@ -17,10 +19,10 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Mods; import gtPlusPlus.core.client.renderer.particle.EntityDropParticleFX; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BlockBaseFluid extends BlockFluidClassic { @@ -71,14 +73,14 @@ public class BlockBaseFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iicon) { - this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); - this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); + this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); + this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); // IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0); // IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0); } @Override - @Optional.Method(modid = "CoFHCore") + @Optional.Method(modid = Mods.Names.C_O_F_H_CORE) @SideOnly(Side.CLIENT) public void randomDisplayTick(World arg0, int arg1, int arg2, int arg3, Random arg4) { super.randomDisplayTick(arg0, arg1, arg2, arg3, arg4); diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index a034dada97..f0ecd6def9 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import java.util.HashMap; import java.util.Map; @@ -65,7 +68,7 @@ public class BlockBaseModular extends BasicBlock { final int miningLevel) { super(blockType, unlocalizedName, vanillaMaterial, miningLevel); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); - this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture()); + this.setBlockTextureName(GTPlusPlus.ID + ":" + blockType.getTexture()); this.blockColour = colour; this.thisBlock = blockType; this.thisBlockMaterial = blockMaterialString; @@ -187,7 +190,7 @@ public class BlockBaseModular extends BasicBlock { public void registerBlockIcons(final IIconRegister iIcon) { if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null || this.thisBlock == BlockTypes.ORE) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); } String metType = "9j4852jyo3rjmh3owlhw9oe"; if (this.blockMaterial != null) { @@ -199,7 +202,7 @@ public class BlockBaseModular extends BasicBlock { metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType); int tier = blockMaterial != null ? this.blockMaterial.vTier : 0; String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5"); - this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/" + metType + "/" + aType); + this.blockIcon = iIcon.registerIcon(GregTech.ID + ":" + "materialicons/" + metType + "/" + aType); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 140773f4ea..88ee9a8986 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -143,9 +143,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { /* * @Override * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon = - * iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); //this.base = - * iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + - * "blockOre_Overlay"); } + * iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); //this.base = + * iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(GTPlusPlus.ID + + * ":" + "blockOre_Overlay"); } * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return * this.blockColour; } diff --git a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java index 575c5ca33b..bb6aee18d5 100644 --- a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class MultiTextureBlock extends Block { @@ -15,7 +16,7 @@ public class MultiTextureBlock extends Block { protected MultiTextureBlock(final String unlocalizedName, final Material material, final SoundType blockSound) { super(material); this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(2.0F); this.setResistance(6.0F); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index a3209d0907..2966404a67 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; public class BlockCompressedObsidian extends BlockObsidian { @@ -48,17 +49,17 @@ public class BlockCompressedObsidian extends BlockObsidian { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iicon) { - this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian1"); - this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian2"); - this.textureArray[2] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian3"); - this.textureArray[3] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian4"); - this.textureArray[4] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian5"); - this.textureArray[5] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian_invert"); - this.textureArray[6] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone1"); - this.textureArray[7] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone2"); - this.textureArray[8] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone3"); - this.textureArray[9] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone4"); - this.textureArray[10] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone5"); + this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian1"); + this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian2"); + this.textureArray[2] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian3"); + this.textureArray[3] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian4"); + this.textureArray[4] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian5"); + this.textureArray[5] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian_invert"); + this.textureArray[6] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone1"); + this.textureArray[7] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone2"); + this.textureArray[8] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone3"); + this.textureArray[9] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone4"); + this.textureArray[10] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone5"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java index 6064190fba..c462021374 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.BlockWeb; @@ -11,7 +13,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; public class BlockNet extends BlockWeb { @@ -26,7 +27,7 @@ public class BlockNet extends BlockWeb { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "net"); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "net"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index 975ddd3d0f..fee8176262 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.BlockContainer; @@ -19,7 +21,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; public class BlockSuperLight extends BlockContainer { @@ -47,7 +48,7 @@ public class BlockSuperLight extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlBigBlue"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlBigBlue"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 6a92c92453..61e6b71b57 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.BlockContainer; @@ -17,7 +19,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; -import gtPlusPlus.core.lib.CORE; public class BlockTankXpConverter extends BlockContainer { @@ -56,10 +57,10 @@ public class BlockTankXpConverter extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index 6c93fdf2cf..25210df133 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -1,6 +1,11 @@ package gtPlusPlus.core.block.general; -import static net.minecraftforge.common.util.ForgeDirection.*; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.UP; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import java.util.List; import java.util.Random; diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index 6a01dd623b..6f4b033b4b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +21,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -57,10 +58,12 @@ public class FluidTankInfinite extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); + this.textureBottom = p_149651_1_ + .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); + this.textureFront = p_149651_1_ + .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java index 235b7db07a..4ebd9c832b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java @@ -1,6 +1,12 @@ package gtPlusPlus.core.block.general; -import static net.minecraftforge.common.util.ForgeDirection.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.UP; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import java.util.IdentityHashMap; import java.util.Map.Entry; @@ -25,7 +31,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.random.XSTR; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; public class HellFire extends BlockFire { @@ -43,7 +48,7 @@ public class HellFire extends BlockFire { this.setTickRandomly(true); this.setLightLevel(1F); this.setLightOpacity(0); - // this.setBlockTextureName(CORE.MODID + "hellfire/blockHellFire"); + // this.setBlockTextureName(GTPlusPlus.ID + "hellfire/blockHellFire"); this.setBlockName("blockHellFire"); this.setCreativeTab(AddToCreativeTab.tabBlock); GameRegistry.registerBlock(this, "blockHellFire"); @@ -406,8 +411,8 @@ public class HellFire extends BlockFire { @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister IIconRegister) { this.IIconArray = new IIcon[] { - IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"), - IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") }; + IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"), + IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") }; } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java index 4219666e2f..4bc120678f 100644 --- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -12,7 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; /* * public class LightGlass extends BlockBreakable { @@ -33,7 +34,7 @@ public class LightGlass extends BlockAir { this.setBlockName("blockMFEffect"); this.setLightLevel(12F); setHardness(0.1F); - setBlockTextureName(CORE.MODID + ":" + "blockMFEffect"); + setBlockTextureName(GTPlusPlus.ID + ":" + "blockMFEffect"); setStepSound(Block.soundTypeGlass); GameRegistry.registerBlock(this, "blockMFEffect"); @@ -78,7 +79,7 @@ public class LightGlass extends BlockAir { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockMFEffect"); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockMFEffect"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java index 8dfe5eb367..c7a0967042 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -19,7 +21,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; -import gtPlusPlus.core.lib.CORE; public class MiningExplosives extends BlockTNT { @@ -185,14 +186,8 @@ public class MiningExplosives extends BlockTNT { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iconRegister) { - // - /* - * this.blockIcon = iconRegister.registerIcon(this.getTextureName() + "_side"); this.textureTop = - * iconRegister.registerIcon(this.getTextureName() + "_top"); this.textureBottom = - * iconRegister.registerIcon(this.getTextureName() + "_bottom"); - */ - this.blockIcon = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalSheet2"); - this.textureTop = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalFunnel"); - this.textureBottom = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalPanel"); + this.blockIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalSheet2"); + this.textureTop = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalFunnel"); + this.textureBottom = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalPanel"); } } diff --git a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java index 051a158515..a5ffcf6763 100644 --- a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java +++ b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.HashMap; import java.util.Random; @@ -23,7 +25,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.itemblock.ItemBlockDoor; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityPlayerDoorBase; import gtPlusPlus.core.util.Utils; @@ -82,7 +83,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { setBlockName("playerDoor" + aBlockExtensionName); this.setHarvestLevel("axe", 1); } - this.setBlockTextureName(vanillaType ? aTextureName : CORE.MODID + ":" + aTextureName); + this.setBlockTextureName(vanillaType ? aTextureName : GTPlusPlus.ID + ":" + aTextureName); GameRegistry.registerBlock(this, ItemBlockDoor.class, Utils.sanitizeString(this.getUnlocalizedName())); } diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 7e5600715a..1956d98a39 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general.antigrief; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,7 +20,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BlockWitherProof extends Block { @@ -26,7 +27,7 @@ public class BlockWitherProof extends Block { public BlockWitherProof() { super(Material.redstoneLight); this.setBlockName(Utils.sanitizeString("blockBlackGate")); - this.setBlockTextureName(CORE.MODID + ":" + "blockFrameGt"); + this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockFrameGt"); this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(-1F); this.setResistance(5000.0F); @@ -54,7 +55,7 @@ public class BlockWitherProof extends Block { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockFrameGt"); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockFrameGt"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index c72da4cf4a..679d82677e 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.block.general.antigrief; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver; import java.util.List; @@ -24,7 +25,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityReverter; public class TowerDevice extends Block { @@ -61,7 +61,7 @@ public class TowerDevice extends Block { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister par1IconRegister) { - TEX_ANTIBUILDER = par1IconRegister.registerIcon(CORE.MODID + ":" + "blockAntiGrief"); + TEX_ANTIBUILDER = par1IconRegister.registerIcon(GTPlusPlus.ID + ":" + "blockAntiGrief"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java index 3200e497b8..00d542143c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java +++ b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general.fluids; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -12,7 +14,6 @@ import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BlockFluidSludge extends BlockFluidClassic { @@ -35,8 +36,8 @@ public class BlockFluidSludge extends BlockFluidClassic { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(final IIconRegister register) { - this.stillIcon = register.registerIcon(CORE.MODID + ":fluids/fluid.jackdaniels"); - this.flowingIcon = register.registerIcon(CORE.MODID + ":fluids/fluid.jackdaniels"); + this.stillIcon = register.registerIcon(GTPlusPlus.ID + ":fluids/fluid.jackdaniels"); + this.flowingIcon = register.registerIcon(GTPlusPlus.ID + ":fluids/fluid.jackdaniels"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java index 21286ba993..f09872790b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general.redstone; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -14,7 +16,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -81,22 +82,24 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone { int aMeta = 0; { HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>(); - aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + aTempMap.put( + ForgeDirection.UP, + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.DOWN, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.NORTH, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.SOUTH, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.EAST, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.WEST, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTextures.put(aMeta++, aTempMap); } } diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java index 0d8f66c326..d1be91d31f 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general.redstone; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -16,7 +18,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -150,22 +151,24 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone { int aMeta = 0; { HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>(); - aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + aTempMap.put( + ForgeDirection.UP, + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.DOWN, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.NORTH, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.SOUTH, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.EAST, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( ForgeDirection.WEST, - iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top")); aTextures.put(aMeta++, aTempMap); } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java index 83e3edac59..fa28ef38f9 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.IBlockAccess; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.MetaBlock; -import gtPlusPlus.core.lib.CORE; public class BlockGtFrameBox extends MetaBlock { @@ -16,7 +17,7 @@ public class BlockGtFrameBox extends MetaBlock { public BlockGtFrameBox(final String unlocalizedName, final Material material, final BlockTypes blockTypeENUM, final boolean recolour, final int... colour) { super(unlocalizedName, material, blockTypeENUM.getBlockSoundType()); - this.setBlockTextureName(CORE.MODID + ":" + "blockGtFrame"); + this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockGtFrame"); this.setHarvestLevel(blockTypeENUM.getHarvestTool(), 2); if (recolour && ((colour != null) && (colour.length > 0))) { this.colours = colour; diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 5f353f2590..bf4fa41296 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -17,7 +19,6 @@ import gtPlusPlus.api.objects.minecraft.CubicObject; import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -141,12 +142,12 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { @Override public CubicObject<String>[] getCustomTextureDirectoryObject() { - String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G", - CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" }; + String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" }; CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; return aTextureData; } diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java index 28690e7972..4296f60b09 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -22,7 +24,6 @@ import gtPlusPlus.core.client.renderer.RenderDecayChest; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.util.minecraft.InventoryUtils; @@ -120,10 +121,10 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_top"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_top"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_side"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_bottom"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_top"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_top"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_side"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_bottom"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java index 7cc444e7d0..9f301dadcd 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,7 +23,6 @@ import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityEggBox; import gtPlusPlus.core.util.minecraft.InventoryUtils; @@ -85,10 +86,10 @@ public class EggBox extends BlockContainer implements ITileTooltip { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_top"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_top"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_side"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_side"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_top"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_top"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_side"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_side"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java index f016681b77..90f0ed19e6 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -20,7 +22,6 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import gtPlusPlus.core.util.minecraft.InventoryUtils; @@ -69,10 +70,10 @@ public class FishTrap extends BlockContainer implements ITileTooltip { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 610c7307f6..9cd17b8b82 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,7 +15,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator; public class HeliumGenerator extends BlockContainer { @@ -49,10 +50,10 @@ public class HeliumGenerator extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 0d6ed29e78..f57a5e8275 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,7 +20,6 @@ import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; public class Machine_ModularityTable extends BlockContainer implements ITileTooltip { @@ -64,10 +65,10 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_side"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_top"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_output"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_side"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_side"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_top"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_output"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_side"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java index 4058196e21..030882d9d6 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,7 +23,6 @@ import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; import gtPlusPlus.core.util.minecraft.InventoryUtils; @@ -69,11 +70,11 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { this.blockIcon = p_149651_1_ - .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP"); + .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP"); this.textureBottom = p_149651_1_.registerIcon("planks_acacia"); this.textureFront = p_149651_1_ - .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); + .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java index c7198f7a64..4566523315 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.Random; @@ -19,7 +21,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector; import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector; import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; @@ -67,10 +68,10 @@ public class Machine_PooCollector extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_top"); - this.textureTop2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_top"); - this.textureSide = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_sides"); - this.textureSide2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_sides"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_top"); + this.textureTop2 = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_adv_top"); + this.textureSide = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_sides"); + this.textureSide2 = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_adv_sides"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index c334802f21..df111bfa9d 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.BuildCraftCore; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,19 +19,18 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Mods; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; -@Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO") +@Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) public class Machine_ProjectTable extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) @@ -71,10 +74,10 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "cover_crafting"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top"); } /** @@ -119,16 +122,16 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip if (item.getItem() instanceof ItemToolWrench) { return true; } - if (LoadedMods.BuildCraft) { + if (BuildCraftCore.isModLoaded()) { return checkBuildcraftWrench(item); } - if (LoadedMods.EnderIO) { + if (EnderIO.isModLoaded()) { return checkEnderIOWrench(item); } return false; } - @Optional.Method(modid = "EnderIO") + @Optional.Method(modid = Mods.Names.ENDER_I_O) private static boolean checkEnderIOWrench(final ItemStack item) { if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")) { Class<?> wrenchClass; diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java index ef55f1ece1..1ae14b4e34 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +15,6 @@ import gtPlusPlus.api.objects.minecraft.CubicObject; import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockRoundRobinator; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -107,12 +108,12 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { public CubicObject<String>[] getCustomTextureDirectoryObject() { AutoMap<String[]> aTemp = new AutoMap<String[]>(); for (int i = 0; i < 5; i++) { - String[] aTexData = new String[] { CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, }; + String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, + GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, + GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, + GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, + GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, + GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, }; aTemp.put(aTexData); } AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>(); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java index 3897c005f9..c299cff6cb 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -15,7 +17,6 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BlockBaseNBT; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip { @@ -46,10 +47,10 @@ public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "workbench_top"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlYellow"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "workbench_top"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlYellow"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlYellow"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index 5619e55739..e3f09dc25c 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -19,7 +21,6 @@ import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -146,12 +147,12 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { @Override public CubicObject<String>[] getCustomTextureDirectoryObject() { - String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A", - CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" }; + String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", + GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" }; CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; return aTextureData; } diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java index 6bd84b13f7..61465a59c1 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java +++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine.bedrock; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -28,7 +30,7 @@ public class Mining_Head_Fake extends Block { public Mining_Head_Fake() { super(Material.lava); this.setBlockName(Utils.sanitizeString("blockMiningHeadFake")); - this.setBlockTextureName(CORE.MODID + ":" + "blockFrameGt"); + this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockFrameGt"); this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(-1F); this.setResistance(50000.0F); @@ -56,7 +58,7 @@ public class Mining_Head_Fake extends Block { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockFrameGt"); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockFrameGt"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java index a0ca4978c0..29067dd2c1 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java +++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine.bedrock; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -28,7 +29,7 @@ public class Mining_Pipe_Fake extends Block { public Mining_Pipe_Fake() { super(Material.cactus); this.setBlockName(Utils.sanitizeString("blockMiningPipeFake")); - this.setBlockTextureName(CORE.MODID + ":" + "blockFrameGt"); + this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockFrameGt"); this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(-1F); this.setResistance(50000.0F); @@ -56,7 +57,7 @@ public class Mining_Pipe_Fake extends Block { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockFrameGt"); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockFrameGt"); } @Override diff --git a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java index 1689da6092..ae3917451a 100644 --- a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java +++ b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java @@ -1,6 +1,9 @@ package gtPlusPlus.core.chunkloading; -import java.util.*; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java index e3fccaf2df..1e6435038a 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -13,13 +15,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.ModelBatKing; import gtPlusPlus.core.entity.monster.EntityBatKing; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderBatKing extends RenderLiving { private static final ResourceLocation batTextures = new ResourceLocation( - CORE.MODID + ":" + "textures/entity/batKing.png"); + GTPlusPlus.ID + ":" + "textures/entity/batKing.png"); /** * not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java index 47564edd84..fc99536fee 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -19,7 +21,7 @@ import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; public class RenderDecayChest extends TileEntitySpecialRenderer { private static final ResourceLocation mChestTexture = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/blocks/TileEntities/DecayablesChest_full.png"); private ModelDecayChest mChestModel = new ModelDecayChest(); diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java index 10d155f1cd..28e4dd4bc2 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -10,13 +12,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.ModelSickBlaze; import gtPlusPlus.core.entity.monster.EntitySickBlaze; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderSickBlaze extends RenderLiving { private static final ResourceLocation blazeTextures = new ResourceLocation( - CORE.MODID + ":" + "textures/entity/sickBlaze.png"); + GTPlusPlus.ID + ":" + "textures/entity/sickBlaze.png"); private int field_77068_a; public RenderSickBlaze() { diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java index f97be33e4f..3ed25954d1 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.texture.TextureMap; @@ -16,13 +18,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.ModelStaballoyConstruct; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderStaballoyConstruct extends RenderLiving { private static final ResourceLocation staballoyGolemTextures = new ResourceLocation( - CORE.MODID + ":" + "textures/entity/golemStaballoy.png"); + GTPlusPlus.ID + ":" + "textures/entity/golemStaballoy.png"); /** Staballoy Golem's Model. */ private final ModelStaballoyConstruct staballoyGolemModel; diff --git a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java index 9a110adccd..f47d7ecd20 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer.tabula; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -8,7 +10,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.tabula.ModelTabulaBase; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderTabulaBase extends TileEntitySpecialRenderer { @@ -22,7 +23,7 @@ public class RenderTabulaBase extends TileEntitySpecialRenderer { public RenderTabulaBase(ModelTabulaBase aModel, String aTexturePath, Class aTileClass) { mModel = aModel; - mTexture = new ResourceLocation(CORE.MODID, aTexturePath); + mTexture = new ResourceLocation(GTPlusPlus.ID, aTexturePath); mTileClass = aTileClass; this.mRenderID = RenderingRegistry.getNextAvailableRenderId(); mInstance = this; diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 8961ceb80f..d97cb80ba6 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -10,7 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.GTplusplus; @@ -24,12 +28,21 @@ import gtPlusPlus.core.entity.monster.EntityGiantChickenBase; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.fluids.FluidFactory; -import gtPlusPlus.core.handler.*; -import gtPlusPlus.core.handler.events.*; +import gtPlusPlus.core.handler.BookHandler; +import gtPlusPlus.core.handler.BurnableFuelHandler; +import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.handler.COMPAT_IntermodStaging; +import gtPlusPlus.core.handler.GuiHandler; +import gtPlusPlus.core.handler.events.BlockEventHandler; +import gtPlusPlus.core.handler.events.EnderDragonDeathHandler; +import gtPlusPlus.core.handler.events.EntityDeathHandler; +import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler; +import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler; +import gtPlusPlus.core.handler.events.PlayerSleepEventHandler; +import gtPlusPlus.core.handler.events.ZombieBackupSpawnEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.tileentities.ModTileEntities; @@ -44,6 +57,7 @@ import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO; import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; +import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder; import gtPlusPlus.xmod.ic2.CustomInternalName; public class CommonProxy { @@ -55,9 +69,8 @@ public class CommonProxy { public void preInit(final FMLPreInitializationEvent e) { Logger.INFO("Doing some house cleaning."); - LoadedMods.checkLoaded(); - Logger.INFO("Making sure we're ready to party!"); - + CORE.RA = new GregtechRecipeAdder(); + Logger.INFO("Created Gregtech recipe handler."); if (!CORE_Preloader.DEBUG_MODE) { Logger.WARNING("Development mode not enabled."); } else if (CORE_Preloader.DEBUG_MODE) { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index d06ad2324e..34642abde6 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java @@ -1,6 +1,16 @@ package gtPlusPlus.core.common.compat; -import static gregtech.client.GT_TooltipHandler.Tier.*; +import static gregtech.api.enums.Mods.Baubles; +import static gregtech.api.enums.Mods.PlayerAPI; +import static gregtech.client.GT_TooltipHandler.Tier.EV; +import static gregtech.client.GT_TooltipHandler.Tier.HV; +import static gregtech.client.GT_TooltipHandler.Tier.IV; +import static gregtech.client.GT_TooltipHandler.Tier.LV; +import static gregtech.client.GT_TooltipHandler.Tier.LuV; +import static gregtech.client.GT_TooltipHandler.Tier.MV; +import static gregtech.client.GT_TooltipHandler.Tier.UHV; +import static gregtech.client.GT_TooltipHandler.Tier.UV; +import static gregtech.client.GT_TooltipHandler.Tier.ZPM; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; import net.minecraft.entity.monster.EntityBlaze; @@ -23,15 +33,12 @@ import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble; import gtPlusPlus.core.item.general.ItemCloakingDevice; import gtPlusPlus.core.item.general.ItemHealingDevice; import gtPlusPlus.core.item.general.ItemSlowBuildingRing; -import gtPlusPlus.core.lib.LoadedMods; public class COMPAT_Baubles { public static void run() { - if (LoadedMods.Baubles) { + if (Baubles.isModLoaded()) { baublesLoaded(); - } else { - baublesNotLoaded(); } } @@ -85,12 +92,8 @@ public class COMPAT_Baubles { "Hellish", 6); - if (LoadedMods.PlayerAPI) { + if (PlayerAPI.isModLoaded()) { ModItems.itemSlowBuildingRing = new ItemSlowBuildingRing(); } } - - public static void baublesNotLoaded() { - Logger.INFO("Baubles Not Found - Skipping Resources."); - } } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java deleted file mode 100644 index c2bbacd5d8..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java +++ /dev/null @@ -1,19 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.item.ModItems; - -public class COMPAT_BigReactors { - - public static void OreDict() { - run(); - } - - private static final void run() { - GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium)); - GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite)); - GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite)); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java deleted file mode 100644 index 159cfe2b78..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java +++ /dev/null @@ -1,221 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import static gtPlusPlus.core.handler.COMPAT_HANDLER.*; - -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.recipe.ShapedRecipeObject; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class COMPAT_CompactWindmills { - - // Change IC2 Upgrades - public static ItemStack kineticWind = ItemUtils.simpleMetaStack("IC2:blockKineticGenerator", 0, 1); - public static ItemStack shaftIron = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 11, 1); - public static ItemStack cableCopper = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1); - public static String plateRubber = "ore:plateRubber"; - - // Machine Casings - public static ItemStack elvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 0, 1); - public static ItemStack lvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 1, 1); - public static ItemStack mvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 2, 1); - public static ItemStack hvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 3, 1); - public static ItemStack evCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 4, 1); - public static ItemStack ivCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 5, 1); - - // GT Transformers - public static ItemStack elvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 20, 1); - public static ItemStack lvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 21, 1); - public static ItemStack mvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 22, 1); - public static ItemStack hvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 23, 1); - public static ItemStack evTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 24, 1); - - // Compact Windmills - public static ItemStack elvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1); - public static ItemStack lvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1); - public static ItemStack mvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1); - public static ItemStack hvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1); - public static ItemStack evWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1); - - // Compact Rotors - public static ItemStack rotor2 = ItemUtils.getItemStackFromFQRN("CompactWindmills:WOOL", 1); - public static ItemStack rotor1 = ItemUtils.getItemStackFromFQRN("CompactWindmills:WOOD", 1); - public static ItemStack rotor3 = ItemUtils.getItemStackFromFQRN("CompactWindmills:ALLOY", 1); - public static ItemStack rotor4 = ItemUtils.getItemStackFromFQRN("CompactWindmills:CARBON", 1); - public static ItemStack rotor5 = ItemUtils.getItemStackFromFQRN("CompactWindmills:IRIDIUM", 1); - - // IC2 Rotors - public static ItemStack rotorIC1 = ItemUtils.getItemStackFromFQRN("IC2:itemwoodrotor", 1); - public static ItemStack rotorIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemironrotor", 1); - public static ItemStack rotorIC3 = ItemUtils.getItemStackFromFQRN("IC2:itemsteelrotor", 1); - public static ItemStack rotorIC4 = ItemUtils.getItemStackFromFQRN("IC2:itemwcarbonrotor", 1); - public static ItemStack rotorBlade1 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 7, 1); - public static ItemStack rotorBlade2 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 8, 1); - public static ItemStack rotorBlade3 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 10, 1); - public static ItemStack rotorBlade4 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 9, 1); - - // Plates - public static String plateTier1 = "ore:plateMagnalium"; - public static String plateTier2 = "ore:plateStainlessSteel"; - public static String plateTier3 = "ore:plateTitanium"; - public static String plateTier4 = "ore:plateTungstenSteel"; - public static String plateTier5 = "ore:plateNichrome"; - public static String plateCarbon = "ore:plateAlloyCarbon"; - public static String plateAlloy = "ore:plateAlloyAdvanced"; - - // Circuits - public static String circuitTier1 = "ore:circuitGood"; - public static String circuitTier2 = "ore:circuitAdvanced"; - public static String circuitTier3 = "ore:circuitData"; - public static String circuitTier4 = "ore:circuitElite"; - public static String circuitTier5 = "ore:circuitMaster"; - - // Wooden Rotor - public static ShapedRecipeObject Wooden_Rotor = new ShapedRecipeObject( - rotorBlade1, - "ore:plateAnyIron", - "ore:plateAnyIron", - "ore:screwAluminium", - rotorIC1, - "ore:screwAluminium", - rotorBlade1, - "plateAnyIron", - rotorBlade1, - rotor1); - // Alloy Rotor - public static ShapedRecipeObject Alloy_Rotor = new ShapedRecipeObject( - plateAlloy, - plateAlloy, - plateAlloy, - plateAlloy, - rotorIC3, - plateAlloy, - plateAlloy, - plateAlloy, - plateAlloy, - rotor3); - // Carbon Rotor - public static ShapedRecipeObject Carbon_Rotor = new ShapedRecipeObject( - plateCarbon, - rotorBlade4, - plateCarbon, - rotorBlade4, - rotor3, - rotorBlade4, - plateCarbon, - rotorBlade4, - plateCarbon, - rotor4); - - // Kinetic Wind Turbine - public static ShapedRecipeObject KWT = new ShapedRecipeObject( - plateCarbon, - shaftIron, - plateCarbon, - cableCopper, - mvCasing, - cableCopper, - plateRubber, - plateCarbon, - plateRubber, - kineticWind); - - // ELV Windmill - public static ShapedRecipeObject WM_ELV = new ShapedRecipeObject( - circuitTier1, - elvTransformer, - circuitTier1, - plateTier1, - lvCasing, - plateTier1, - plateTier1, - rotor1, - plateTier1, - elvWindmill); - - // LV Windmill - public static ShapedRecipeObject WM_LV = new ShapedRecipeObject( - circuitTier2, - lvTransformer, - circuitTier2, - plateTier2, - mvCasing, - plateTier2, - plateTier2, - rotor2, - plateTier2, - lvWindmill); - - // MV Windmill - public static ShapedRecipeObject WM_MV = new ShapedRecipeObject( - circuitTier3, - mvTransformer, - circuitTier3, - plateTier3, - hvCasing, - plateTier3, - plateTier3, - rotor3, - plateTier3, - mvWindmill); - - // HV Windmill - public static ShapedRecipeObject WM_HV = new ShapedRecipeObject( - circuitTier4, - hvTransformer, - circuitTier4, - plateTier4, - evCasing, - plateTier4, - plateTier4, - rotor4, - plateTier4, - hvWindmill); - - // EV Windmill - public static ShapedRecipeObject WM_EV = new ShapedRecipeObject( - circuitTier5, - evTransformer, - circuitTier5, - plateTier5, - ivCasing, - plateTier5, - plateTier5, - rotor5, - plateTier5, - evWindmill); - - public static void OreDict() { - run(); - } - - private static final void run() { - // RemoveRecipeQueue.add("CompactWindmills:WOOL"); - // RemoveRecipeQueue.add("CompactWindmills:WOOD"); - // RemoveRecipeQueue.add("CompactWindmills:ALLOY"); - // RemoveRecipeQueue.add("CompactWindmills:CARBON"); - // RemoveRecipeQueue.add("CompactWindmills:IRIDIUM"); - - // Remove Recipes - RemoveRecipeQueue.add(kineticWind); - RemoveRecipeQueue.add(elvWindmill); - RemoveRecipeQueue.add(lvWindmill); - RemoveRecipeQueue.add(mvWindmill); - RemoveRecipeQueue.add(hvWindmill); - RemoveRecipeQueue.add(evWindmill); - RemoveRecipeQueue.add(rotor1); - RemoveRecipeQueue.add(rotor3); - RemoveRecipeQueue.add(rotor4); - - // Add Recipes - AddRecipeQueue.add(Wooden_Rotor); - AddRecipeQueue.add(Alloy_Rotor); - AddRecipeQueue.add(Carbon_Rotor); - AddRecipeQueue.add(KWT); - AddRecipeQueue.add(WM_ELV); - AddRecipeQueue.add(WM_LV); - AddRecipeQueue.add(WM_MV); - AddRecipeQueue.add(WM_HV); - AddRecipeQueue.add(WM_EV); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java deleted file mode 100644 index fa2beb54ad..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler; - -public class COMPAT_HarvestCraft { - - public static void OreDict() { - run(); - } - - private static final void run() { - FishTrapHandler.pamsHarvestCraftCompat(); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index 2a08956e2e..92da90184f 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -37,11 +37,6 @@ public class COMPAT_IC2 { itemSolarHelmet); public static void OreDict() { - // Get ItemStacks for results - /* - * itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); itemSolarHelmet = - * UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); - */ run(); } @@ -58,11 +53,6 @@ public class COMPAT_IC2 { RemoveRecipeQueue.add("IC2:itemCable:6"); RemoveRecipeQueue.add("IC2:itemCable:10"); RemoveRecipeQueue.add("IC2:itemCable:13"); - // RemoveRecipeQueue.add(itemCropnalyzer); - // RemoveRecipeQueue.add(itemSolarHelmet); - - // AddRecipeQueue.add(Cropnalyzer); - // AddRecipeQueue.add(SolarHelmet); } } } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java deleted file mode 100644 index 8e665b366e..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java +++ /dev/null @@ -1,43 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class COMPAT_MorePlanets { - - public static void OreDict() { - run(); - } - - private static final void run() { - // Metals - ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0); - ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotAnyIron", "Frozen Iron Ingot", 0); - ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPalladium", "Palladium Ingot", 5); - ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "ingotIridium", "Iridium Ingot", 3); - ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "ingotNorium", "Norium Ingot", 1); - ItemUtils.getItemForOreDict("MorePlanet:venus_item", "ingotLead", "Lead Ingot", 0); - ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotQuontonium", "Quontonium Ingot", 0); - ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1); - ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3); - ItemUtils.getItemForOreDict( - "MorePlanet:koentus_item", - "ingotKoentusMeteoricIron", - "Koentus Meteoric Iron Ingot", - 4); - ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2); - ItemUtils.getItemForOreDict( - "MorePlanet:polongnius_item", - "ingotPolongiusMeteoricIron", - "Polongius Meteoric Iron Ingot", - 4); - ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3); - ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2); - - // Gems - ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2); - ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0); - ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "gemRedCrystal", "Red Crystal", 0); - ItemUtils.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0); - ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java deleted file mode 100644 index 51ea1a3587..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.item.ModItems; - -public class COMPAT_PneumaticCraft { - - public static void OreDict() { - run(); - } - - private static final void run() { - GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron)); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java deleted file mode 100644 index b05e42ba45..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.item.ModItems; - -public class COMPAT_RFTools { - - public static void OreDict() { - run(); - } - - private static final void run() { - GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard)); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java deleted file mode 100644 index 69fa7674c6..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java +++ /dev/null @@ -1,10 +0,0 @@ -package gtPlusPlus.core.common.compat; - -public class COMPAT_Railcraft { - - public static void OreDict() { - run(); - } - - private static final void run() {} -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java deleted file mode 100644 index 0e745ba0b0..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.item.ModItems; - -public class COMPAT_SimplyJetpacks { - - public static void OreDict() { - run(); - } - - private static final void run() { - GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium)); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java index 73dad8602f..fd760af771 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java @@ -1,8 +1,9 @@ package gtPlusPlus.core.common.compat; +import static gregtech.api.enums.Mods.ForbiddenMagic; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; public class COMPAT_Thaumcraft { @@ -17,19 +18,16 @@ public class COMPAT_Thaumcraft { private static final void run() { for (int i = 0; i <= 6; i++) { - // Utils.LOG_INFO(""+i); ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i); GT_OreDictUnificator .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i); GT_OreDictUnificator .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); - // System.out.println("TC Shard registration count is: "+i); } - if (LoadedMods.ForbiddenMagic) { + if (ForbiddenMagic.isModLoaded()) { for (int i = 0; i <= 6; i++) { - // Utils.LOG_INFO(""+i); ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i); GT_OreDictUnificator .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); @@ -37,7 +35,6 @@ public class COMPAT_Thaumcraft { GT_OreDictUnificator.registerOre( "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); - // System.out.println("TC Shard registration count is: "+i); } ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); GT_OreDictUnificator diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java index e0470fe02a..f746042c2d 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.common.compat; -import static gtPlusPlus.core.lib.LoadedMods.Witchery; +import static gregtech.api.enums.Mods.Witchery; import net.minecraft.item.ItemStack; @@ -16,11 +16,11 @@ public class COMPAT_Witchery { private static final void run() { // Koboldite ItemStack aKobolditeDust = ItemUtils - .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Dust", 148, 1); + .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Dust", 148, 1); ItemStack aKobolditeNugget = ItemUtils - .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Nugget", 149, 1); + .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Nugget", 149, 1); ItemStack aKobolditeIngot = ItemUtils - .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Ingot", 150, 1); + .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Ingot", 150, 1); if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust); if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget); if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot); diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index d83ab2bba9..b6d5c977b7 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -1,8 +1,121 @@ package gtPlusPlus.core.config; +import static gregtech.api.enums.Mods.GregTech; import static gtPlusPlus.core.item.general.RF2EU_Battery.rfPerEU; -import static gtPlusPlus.core.lib.CORE.*; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.MACHINE_INFO; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondGeothermalGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.boilerSteamPerSecond; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIntegration; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableIC2Recipes; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableZombieReinforcement; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.dumpItemAndBlockData; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeBatteryAlloy; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeDivisionSigilRecipe; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTextures; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCircuits; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Pipes; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Dehydrators; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_FluidTanks; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_GeothermalEngines; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Pollution; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RF_Convetor; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RocketEngines; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Safes; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SimpleWasher; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SolarGenerators; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SteamConverter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Tesseracts; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_WorldAccelerators; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiSizeTools; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_Cyclotron; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialSifter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_MatterFabricator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_MultiTank; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_PowerSubstation; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_ThermalBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableSkookumChoochers; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableSulfuricAcidFix; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableThaumcraftShardUnification; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableWatchdogBGM; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.hideUniversalCells; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiABS; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvEBF; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvImplosion; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAlgaePond; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiCyclotron; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIsaMill; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiMassFabricator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiPackager; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiRefinery; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiThermalBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiTreeFarm; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.showHiddenNEIItems; +import static gtPlusPlus.core.lib.CORE.EVERGLADESBIOME_ID; +import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID; +import static gtPlusPlus.core.lib.CORE.turbineCutoffBase; import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames; import java.io.File; @@ -75,50 +188,44 @@ public class ConfigHandler { // Circuits enableCustomCircuits = config.getBoolean( "enableCustomCircuits", - "gregtech", + GregTech.ID, false, "Adds custom circuits to expand past the Master Tier. Only really recommended to enable if enableOldGTcircuits is enabled."); enableOldGTcircuits = config.getBoolean( "enableOldGTcircuits", - "gregtech", + GregTech.ID, false, "Restores circuits and their recipes from Pre-5.09.28 times."); // Tools enableSkookumChoochers = config.getBoolean( "enableSkookumChoochers", - "gregtech", + GregTech.ID, true, "Adds Custom GT Tools, called Skookum Choochers, functioning as a hard hammer and a wrench."); enableMultiSizeTools = config.getBoolean( "enableMultiSizeTools", - "gregtech", + GregTech.ID, true, "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available."); // GT-Fixes enableSulfuricAcidFix = config.getBoolean( "enableSulfuricAcidFix", - "gregtech", + GregTech.ID, false, "Adds GT6 recipes for Sulfuric Acid. Should remove all pre-existing recipes."); turbineCutoffBase = config.getInt( "turbineCutoffBase", - "gregtech", + GregTech.ID, 75000, 0, Integer.MAX_VALUE, "Rotors below this durability will be removed, prevents NEI clutter. Minimum Durability is N * x, where N is the new value set and x is the turbine size, where 1 is Tiny and 4 is Huge. Set to 0 to disable."); - enableHarderRecipesForHighTierCasings = config.getBoolean( - "enableHarderRecipesForHighTierCasings", - "gregtech", - false, - "Makes LuV+ Casings and Hulls more difficult to craft."); - // Pipes & Cables - enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true, "Adds Custom GT Fluid Pipes."); - enableCustom_Cables = config.getBoolean("enableCustom_Cables", "gregtech", true, "Adds Custom GT Cables."); + enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", GregTech.ID, true, "Adds Custom GT Fluid Pipes."); + enableCustom_Cables = config.getBoolean("enableCustom_Cables", GregTech.ID, true, "Adds Custom GT Cables."); // Block Drops chanceToDropDrainedShard = config.getInt( @@ -139,150 +246,150 @@ public class ConfigHandler { // Single machines enableMachine_SolarGenerators = config.getBoolean( "enableSolarGenerators", - "gregtech", + GregTech.ID, false, "These may be overpowered, Consult a local electrician."); enableMachine_ComponentAssemblers = config - .getBoolean("enableComponentAssemblers", "gregtech", true, "These construct machine components."); + .getBoolean("enableComponentAssemblers", GregTech.ID, true, "These construct machine components."); enableMachine_Safes = config - .getBoolean("enableMachineSafes", "gregtech", true, "These protect your goodies/rare stuff."); + .getBoolean("enableMachineSafes", GregTech.ID, true, "These protect your goodies/rare stuff."); enableMachine_Dehydrators = config - .getBoolean("enableMachineDehydrators", "gregtech", true, "These dehydrate stuff."); + .getBoolean("enableMachineDehydrators", GregTech.ID, true, "These dehydrate stuff."); enableMachine_SteamConverter = config - .getBoolean("enableMachineSteamConverter", "gregtech", true, "Converts IC2 steam -> Railcraft steam."); + .getBoolean("enableMachineSteamConverter", GregTech.ID, true, "Converts IC2 steam -> Railcraft steam."); enableMachine_FluidTanks = config - .getBoolean("enableMachineFluidTanks", "gregtech", true, "Portable fluid tanks."); + .getBoolean("enableMachineFluidTanks", GregTech.ID, true, "Portable fluid tanks."); enableMachine_RocketEngines = config.getBoolean( "enableMachineRocketEngines", - "gregtech", + GregTech.ID, true, "Diesel egines with different internals, they consume less fuel overall."); enableMachine_GeothermalEngines = config.getBoolean( "enableMachineGeothermalEngines", - "gregtech", + GregTech.ID, true, "These may be overpowered, Consult a local geologist."); enableMachine_WorldAccelerators = config.getBoolean( "enableMachineWorldAccelerators", - "gregtech", + GregTech.ID, true, "These allow boosting Block/TileEntity Tick times [OP]."); enableMachine_Tesseracts = config.getBoolean( "enableMachineTesseracts", - "gregtech", + GregTech.ID, true, "Tesseracts for wireless item/fluid movement."); enableMachine_SimpleWasher = config.getBoolean( "enableMachineSimpleWasher", - "gregtech", + GregTech.ID, true, "Very basic automated cauldron for dust washing."); enableMachine_Pollution = config - .getBoolean("enableMachinePollution", "gregtech", true, "Pollution Detector & Scrubbers."); + .getBoolean("enableMachinePollution", GregTech.ID, true, "Pollution Detector & Scrubbers."); enableMachine_RF_Convetor = config.getBoolean( "enableMachineRFConvetor", - "gregtech", + GregTech.ID, true, "Converts RF to GTEU. Requires COFH-Core to be installed."); // Multi machines enableMultiblock_AlloyBlastSmelter = config.getBoolean( "enableMultiblockAlloyBlastSmelter", - "gregtech", + GregTech.ID, true, "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal."); enableMultiblock_IndustrialCentrifuge = config - .getBoolean("enableMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin."); + .getBoolean("enableMultiblockIndustrialCentrifuge", GregTech.ID, true, "Spin, Spin, Spiiiin."); enableMultiblock_IndustrialCokeOven = config.getBoolean( "enableMultiblockIndustrialCokeOven", - "gregtech", + GregTech.ID, true, "Pyro Oven Alternative, older, more realistic, better."); enableMultiblock_IndustrialElectrolyzer = config.getBoolean( "enableMultiblockIndustrialElectrolyzer", - "gregtech", + GregTech.ID, true, "Electrolyzes things with extra bling factor."); enableMultiblock_IndustrialMacerationStack = config.getBoolean( "enableMultiblockIndustrialMacerationStack", - "gregtech", + GregTech.ID, true, "A hyper efficient maceration tower, nets more bonus outputs."); enableMultiblock_IndustrialPlatePress = config.getBoolean( "enableMultiblockIndustrialPlatePress", - "gregtech", + GregTech.ID, true, "Industrial bendering machine thingo."); enableMultiblock_IndustrialWireMill = config.getBoolean( "enableMultiblockIndustrialWireMill", - "gregtech", + GregTech.ID, true, "Produces fine wire and exotic cables."); enableMultiblock_IronBlastFurnace = config - .getBoolean("enableMultiblockIronBlastFurnace", "gregtech", true, "Skip the Bronze age, very slowly."); + .getBoolean("enableMultiblockIronBlastFurnace", GregTech.ID, true, "Skip the Bronze age, very slowly."); enableMultiblock_MatterFabricator = config - .getBoolean("enableMultiblockMatterFabricator", "gregtech", true, "?FAB?RIC?ATE MA?TT?ER."); + .getBoolean("enableMultiblockMatterFabricator", GregTech.ID, true, "?FAB?RIC?ATE MA?TT?ER."); enableMultiblock_MultiTank = config.getBoolean( "enableMultiblockMultiTank", - "gregtech", + GregTech.ID, true, "Tall tanks, each layer adds extra fluid storage."); enableMultiblock_PowerSubstation = config - .getBoolean("enableMultiblockPowerSubstation", "gregtech", true, "For managing large power grids."); + .getBoolean("enableMultiblockPowerSubstation", GregTech.ID, true, "For managing large power grids."); enableMultiblock_LiquidFluorideThoriumReactor = config.getBoolean( "enableMultiblockLiquidFluorideThoriumReactor", - "gregtech", + GregTech.ID, true, "For supplying large power grids."); enableMultiblock_NuclearFuelRefinery = config.getBoolean( "enableMultiblock_NuclearFuelRefinery", - "gregtech", + GregTech.ID, true, "Refines molten chemicals into nuclear fuels."); enableMultiblock_IndustrialSifter = config - .getBoolean("enableMultiblock_IndustrialSifter", "gregtech", true, "Large scale sifting."); + .getBoolean("enableMultiblock_IndustrialSifter", GregTech.ID, true, "Large scale sifting."); enableMultiblock_LargeAutoCrafter = config.getBoolean( "enableMultiblock_LargeAutoCrafter", - "gregtech", + GregTech.ID, true, "Can Assemble, Disassemble and Craft Project data from Data Sticks."); enableMultiblock_IndustrialThermalCentrifuge = config.getBoolean( "enableMultiblock_IndustrialThermalCentrifuge", - "gregtech", + GregTech.ID, true, "Your warm spin for the ore thing."); enableMultiblock_IndustrialWashPlant = config.getBoolean( "enableMultiblock_IndustrialWashPlant", - "gregtech", + GregTech.ID, true, "Used to wash the dirt, riiiiight offff.."); enableMultiblock_ThermalBoiler = config.getBoolean( "enableMachineThermalBoiler", - "gregtech", + GregTech.ID, true, "Thermal Boiler from GT4. Can Filter Lava for resources."); enableMultiblock_IndustrialCuttingMachine = config.getBoolean( "enableMultiblock_IndustrialCuttingMachine", - "gregtech", + GregTech.ID, true, "Very fast and efficient Cutting Machine."); enableMultiblock_IndustrialFishingPort = config.getBoolean( "enableMultiblock_IndustrialFishingPort", - "gregtech", + GregTech.ID, true, "Fish the seas, except on land."); enableMultiblock_IndustrialExtrudingMachine = config.getBoolean( "enableMultiblock_IndustrialExtrudingMachine", - "gregtech", + GregTech.ID, true, "Very fast and efficient Extruding Machine."); enableMultiblock_IndustrialMultiMachine = config.getBoolean( "enableMultiblock_IndustrialMultiMachine", - "gregtech", + GregTech.ID, true, "Can run recipes for 9 different types of machines."); enableMultiblock_Cyclotron = config - .getBoolean("enableMultiblock_Cyclotron", "gregtech", true, "COMET - Scientific Cyclotron."); + .getBoolean("enableMultiblock_Cyclotron", GregTech.ID, true, "COMET - Scientific Cyclotron."); // Options rfPerEU = config.getInt( @@ -320,7 +427,7 @@ public class ConfigHandler { "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" }; BlacklistedTileEntiyClassNames = config.getStringList( "BlacklistedTileEntiyClassNames", - "gregtech", + GregTech.ID, BlacklistedTileEntiyClassNames, "The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator"); diff --git a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java index 0401908ccf..4b71fefdb9 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java @@ -2,7 +2,11 @@ package gtPlusPlus.core.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java index f5f6cd6cbf..a960ec618a 100644 --- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -3,7 +3,6 @@ package gtPlusPlus.core.creative; import net.minecraft.creativetab.CreativeTabs; import gregtech.api.util.GT_CreativeTab; -import gtPlusPlus.core.creative.tabs.*; public class AddToCreativeTab { diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java index e0c704b67b..cc9d47dcbc 100644 --- a/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java @@ -1,7 +1,18 @@ package gtPlusPlus.core.entity.monster; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityAgeable; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIEatGrass; +import net.minecraft.entity.ai.EntityAIFollowParent; +import net.minecraft.entity.ai.EntityAILookIdle; +import net.minecraft.entity.ai.EntityAIMate; +import net.minecraft.entity.ai.EntityAIPanic; +import net.minecraft.entity.ai.EntityAISwimming; +import net.minecraft.entity.ai.EntityAITempt; +import net.minecraft.entity.ai.EntityAIWander; +import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java index 0aed4d3d5a..7634266046 100644 --- a/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java @@ -4,8 +4,18 @@ import java.lang.reflect.Field; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILookIdle; +import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction; +import net.minecraft.entity.ai.EntityAIMoveTowardsTarget; +import net.minecraft.entity.ai.EntityAINearestAttackableTarget; +import net.minecraft.entity.ai.EntityAIWander; +import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.monster.IMob; diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java index 30f11bf2c5..6c490ca693 100644 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java @@ -8,7 +8,11 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java index 9bcc6ecf07..07388c35b6 100644 --- a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java +++ b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.fluids; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -13,7 +15,6 @@ import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BlockFluidBase extends BlockFluidClassic { @@ -58,10 +59,10 @@ public class BlockFluidBase extends BlockFluidClassic { @Override public void registerBlockIcons(IIconRegister register) { if (stillIcon == null) { - stillIcon = register.registerIcon(CORE.MODID + ":" + "fluids/fluid.fluid.autogenerated.still"); + stillIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.still"); } if (flowingIcon == null) { - flowingIcon = register.registerIcon(CORE.MODID + ":" + "fluids/fluid.fluid.autogenerated.flowing"); + flowingIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.flowing"); } } diff --git a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java index 54ed1f3a9e..96936cced8 100644 --- a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java +++ b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.fluids; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; import net.minecraftforge.fluids.Fluid; import gregtech.api.GregTech_API; -import gtPlusPlus.core.lib.CORE; public class FactoryFluid extends Fluid implements Runnable { @@ -49,7 +50,7 @@ public class FactoryFluid extends Fluid implements Runnable { if (viscosity != Short.MIN_VALUE) this.setViscosity(viscosity); this.setGaseous(gas); this.setRarity(aRarity); - this.mTextureName = CORE.MODID + ":fluids/fluid.fluid.autogenerated"; + this.mTextureName = GTPlusPlus.ID + ":fluids/fluid.fluid.autogenerated"; GregTech_API.sGTBlockIconload.add(this); } diff --git a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java index dd510957fc..22f9ce0799 100644 --- a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java +++ b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java @@ -1,13 +1,14 @@ package gtPlusPlus.core.fluids; -import static gtPlusPlus.core.block.ModBlocks.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gtPlusPlus.core.block.ModBlocks.blockFluidSludge; +import static gtPlusPlus.core.block.ModBlocks.fluidSludge; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.general.fluids.BlockFluidSludge; -import gtPlusPlus.core.lib.CORE; public class FluidRegistryHandler { @@ -41,8 +42,9 @@ public class FluidRegistryHandler { fluidSludge.setUnlocalizedName("fluid.sludge"); FluidRegistry.registerFluid(fluidSludge); blockFluidSludge = new BlockFluidSludge(fluidSludge, Material.cactus).setBlockName("fluidBlockSludge"); - GameRegistry - .registerBlock(blockFluidSludge, CORE.MODID + "_" + blockFluidSludge.getUnlocalizedName().substring(5)); + GameRegistry.registerBlock( + blockFluidSludge, + GTPlusPlus.ID + "_" + blockFluidSludge.getUnlocalizedName().substring(5)); fluidSludge.setUnlocalizedName(blockFluidSludge.getUnlocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index 668076eb68..476df9036f 100644 --- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.fluids; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -298,7 +300,7 @@ public class ItemGenericFluidBucket extends ItemBucket { @Override public void registerIcons(final IIconRegister i) { mBaseBucketTexture = i.registerIcon("bucket_empty"); - mOverlayBucketTexture = i.registerIcon(CORE.MODID + ":bucket.generic.overlay"); + mOverlayBucketTexture = i.registerIcon(GTPlusPlus.ID + ":bucket.generic.overlay"); } @Override diff --git a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java index fa7ade3b97..ad5ec7deaa 100644 --- a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java +++ b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.item; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; @@ -13,7 +15,6 @@ import org.lwjgl.opengl.GL12; import gtPlusPlus.core.container.Container_BackpackBase; import gtPlusPlus.core.inventories.BaseInventoryBackpack; -import gtPlusPlus.core.lib.CORE; public class GuiBaseBackpack extends GuiContainer { @@ -35,7 +36,7 @@ public class GuiBaseBackpack extends GuiContainer { * Forge_Tutorials/textures/gui/ */ private static final ResourceLocation iconLocation = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/itemBackpack.png"); /** The inventory to render on screen */ diff --git a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java index 3bb4d1f5e6..377032e65c 100644 --- a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java +++ b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.item; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.LinkedHashSet; import java.util.Set; @@ -24,7 +26,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.container.Container_Grindle; import gtPlusPlus.core.inventories.BaseInventoryGrindle; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -41,7 +42,7 @@ public class GuiBaseGrindle extends GuiContainer { private short mCurrentPage = 0; private static final ResourceLocation iconLocation = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/itemGrindle.png"); /** The inventory to render on screen */ diff --git a/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java b/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java index de218fe880..01bf98d9bf 100644 --- a/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java +++ b/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.item; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -26,7 +28,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_Grindle; import gtPlusPlus.core.inventories.BaseInventoryGrindle; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import io.netty.buffer.ByteBuf; @@ -66,7 +67,7 @@ public class GuiScreenGrindle extends GuiContainer { // Texture private static final ResourceLocation iconLocation = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/itemGrindle.png"); /** The inventory to render on screen */ diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java index 328276fe6f..80d2d6902f 100644 --- a/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java +++ b/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java @@ -1,13 +1,14 @@ package gtPlusPlus.core.gui.item.box; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.util.ResourceLocation; import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase; -import gtPlusPlus.core.lib.CORE; public class LunchBoxGui extends GuiBaseBox { public LunchBoxGui(ContainerBoxBase containerItem) { - super(containerItem, new ResourceLocation(CORE.MODID, "textures/gui/schematic_rocket_GS1.png")); + super(containerItem, new ResourceLocation(GTPlusPlus.ID, "textures/gui/schematic_rocket_GS1.png")); } } diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java index ff3b59b4e6..6858c17afb 100644 --- a/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java +++ b/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java @@ -1,13 +1,14 @@ package gtPlusPlus.core.gui.item.box; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.util.ResourceLocation; import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase; -import gtPlusPlus.core.lib.CORE; public class MagicBagGui extends GuiBaseBox { public MagicBagGui(ContainerBoxBase containerItem) { - super(containerItem, new ResourceLocation(CORE.MODID, "textures/gui/schematic_rocket_GS1.png")); + super(containerItem, new ResourceLocation(GTPlusPlus.ID, "textures/gui/schematic_rocket_GS1.png")); } } diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java index 6d4d43ad65..4d994eee41 100644 --- a/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java +++ b/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java @@ -1,13 +1,14 @@ package gtPlusPlus.core.gui.item.box; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.util.ResourceLocation; import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase; -import gtPlusPlus.core.lib.CORE; public class ToolBoxGui extends GuiBaseBox { public ToolBoxGui(ContainerBoxBase containerItem) { - super(containerItem, new ResourceLocation(CORE.MODID, "textures/gui/schematic_rocket_GS1.png")); + super(containerItem, new ResourceLocation(GTPlusPlus.ID, "textures/gui/schematic_rocket_GS1.png")); } } diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java index be838a979b..6cd3925b46 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -9,14 +11,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_CircuitProgrammer; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; @SideOnly(Side.CLIENT) public class GUI_CircuitProgrammer extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/CircuitProgrammer.png"); public GUI_CircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java index 5c488bfb6d..19d912b30f 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -9,14 +11,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_DecayablesChest; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; @SideOnly(Side.CLIENT) public class GUI_DecayablesChest extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/FishTrap.png"); public GUI_DecayablesChest(final InventoryPlayer player_inventory, final TileEntityDecayablesChest te) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java index 013db179e1..20f87bf31e 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; @@ -10,14 +12,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_EggBox; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityEggBox; @SideOnly(Side.CLIENT) public class GUI_EggBox extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/FishTrap.png"); public GUI_EggBox(final InventoryPlayer player_inventory, final TileEntityEggBox te) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java index 285bdf866d..c67ab36856 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -9,14 +11,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_FishTrap; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; @SideOnly(Side.CLIENT) public class GUI_FishTrap extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/FishTrap.png"); public GUI_FishTrap(final InventoryPlayer player_inventory, final TileEntityFishTrap te) { @@ -24,12 +25,7 @@ public class GUI_FishTrap extends GuiContainer { } @Override - protected void drawGuiContainerForegroundLayer(final int i, final int j) { - // this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752); - // this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, - // 4210752); - - } + protected void drawGuiContainerForegroundLayer(final int i, final int j) {} @Override protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java index 0add8ad63f..4f050250df 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -9,14 +11,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_HeliumGenerator; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator; @SideOnly(Side.CLIENT) public class GUI_HeliumGenerator extends GuiContainer { private static final ResourceLocation guiTexture = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/helium_collector_gui.png"); public GUI_HeliumGenerator(final InventoryPlayer player_inventory, final TileEntityHeliumGenerator te) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java index 6f128c7005..4ddb7105f2 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -11,14 +13,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_ModularityTable; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; @SideOnly(Side.CLIENT) public class GUI_ModularityTable extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/ModularityTable.png"); private Container_ModularityTable mThisContainer; private TileEntityModularityTable mThisTile; diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java index feaa95000c..b7cff1809e 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java @@ -1,6 +1,8 @@ package gtPlusPlus.core.gui.machine; -import java.awt.Color; +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.awt.*; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -15,7 +17,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_PestKiller; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; import gtPlusPlus.core.util.math.MathUtils; @@ -24,7 +25,7 @@ import gtPlusPlus.core.util.math.MathUtils; public class GUI_PestKiller extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/PestKiller.png"); private final TileEntityPestKiller mTileKiller; diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java index 69ecee7f1f..f4a3c628de 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -10,14 +12,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_ProjectTable; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; @SideOnly(Side.CLIENT) public class GUI_ProjectTable extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/ProjectTable.png"); public GUI_ProjectTable(final InventoryPlayer player_inventory, final TileEntityProjectTable tile) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java index ef95e920cd..40e4eafe7f 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.Method; import net.minecraft.client.gui.inventory.GuiContainer; @@ -14,7 +16,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_RoundRobinator; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -24,7 +25,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class GUI_RoundRobinator extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/RoundRobinator.png"); private TileEntityRoundRobinator mTile; private Container_RoundRobinator mContainer; diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java index c166127c13..598cfd61ef 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.List; @@ -13,13 +15,12 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox; import gtPlusPlus.core.container.Container_SuperJukebox; import gtPlusPlus.core.gui.GUI_Base_Tile_Entity; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class GUI_SuperJukebox extends GUI_Base_Tile_Entity { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/SuperJukebox.png"); private final Container_SuperJukebox mThisContainer; diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java index 5d1700e05d..32ae7fa222 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; @@ -11,7 +13,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.container.Container_TradeTable; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; @SideOnly(Side.CLIENT) @@ -21,7 +22,7 @@ public class GUI_TradeTable extends GuiContainer { String mOwnerName; private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/ProjectTable.png"); public GUI_TradeTable(final InventoryPlayer player_inventory, final TileEntityTradeTable te, diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java index 091e9948ab..f2d2d00cb1 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; @@ -13,7 +15,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.container.Container_VolumetricFlaskSetter; import gtPlusPlus.core.gui.widget.GuiValueField; import gtPlusPlus.core.handler.PacketHandler; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; @@ -21,7 +22,7 @@ import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; public class GUI_VolumetricFlaskSetter extends GuiContainer { private static final ResourceLocation mGuiTextures = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/gui/VolumetricFlaskSetter.png"); private Container_VolumetricFlaskSetter mContainer; private boolean mIsOpen = false; diff --git a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java index ee1dfe984e..489d26fa96 100644 --- a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.handler; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import java.util.concurrent.ConcurrentHashMap; import net.minecraft.entity.player.EntityPlayer; @@ -338,8 +341,8 @@ public class AchievementHandler { return; } - if (aModID != null && (ItemUtils.getModId(aStack).equals(CORE.MODID) - || ItemUtils.getModId(aStack).equalsIgnoreCase("gregtech"))) { + if (aModID != null && (ItemUtils.getModId(aStack).equals(GTPlusPlus.ID) + || ItemUtils.getModId(aStack).equalsIgnoreCase(GregTech.ID))) { isValid = true; } if (!isValid) { @@ -347,7 +350,7 @@ public class AchievementHandler { } // Should unlock base achievement from *ANY* GT++ item. (Too lazy to special case GT machineBlocks though) - if (ItemUtils.getModId(aStack).equals(CORE.MODID)) { + if (ItemUtils.getModId(aStack).equals(GTPlusPlus.ID)) { this.issueAchievement(aPlayer, aBaseAchievementName); } diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 5e78c2ed2d..694cd86c69 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -1,5 +1,11 @@ package gtPlusPlus.core.handler; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.OpenBlocks; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.Witchery; + import java.util.LinkedList; import java.util.Queue; import java.util.Set; @@ -13,24 +19,15 @@ import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; -import gtPlusPlus.core.common.compat.COMPAT_BigReactors; -import gtPlusPlus.core.common.compat.COMPAT_CompactWindmills; import gtPlusPlus.core.common.compat.COMPAT_EnderIO; import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils; -import gtPlusPlus.core.common.compat.COMPAT_HarvestCraft; import gtPlusPlus.core.common.compat.COMPAT_IC2; -import gtPlusPlus.core.common.compat.COMPAT_MorePlanets; import gtPlusPlus.core.common.compat.COMPAT_OpenBlocks; -import gtPlusPlus.core.common.compat.COMPAT_PneumaticCraft; -import gtPlusPlus.core.common.compat.COMPAT_RFTools; -import gtPlusPlus.core.common.compat.COMPAT_Railcraft; -import gtPlusPlus.core.common.compat.COMPAT_SimplyJetpacks; import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft; import gtPlusPlus.core.common.compat.COMPAT_Witchery; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.recipe.RECIPES_GREGTECH; @@ -46,7 +43,73 @@ import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_ChemicalSkips; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GlueLine; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; -import gtPlusPlus.xmod.gregtech.registration.gregtech.*; +import gtPlusPlus.xmod.gregtech.registration.gregtech.Gregtech4Content; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAmazonWarehouse; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBufferDynamos; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechComponentAssembler; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCustomHatches; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFactoryGradeReplacementMultis; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFluidReactor; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeneratorsULV; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechHiAmpTransformer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialAlloySmelter; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialArcFurnace; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialBlastSmelter; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialChisel; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCuttingFactory; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElementDuplicator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialExtruder; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFishPond; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFluidHeater; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialForgeHammer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFuelRefinery; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialGeneratorArray; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMixer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiMachine; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialRockBreaker; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialSifter; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialThermalCentrifuge; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialTreeFarm; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWashPlant; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIsaMill; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMolecularTransformer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPollutionDevices; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerBreakers; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechQuantumForceTransformer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRTG; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSafeBlock; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerators; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarGenerators; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamCondenser; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTeslaTower; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredChunkloaders; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTreeFarmerTE; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWirelessChargers; public class COMPAT_HANDLER { @@ -105,7 +168,6 @@ public class COMPAT_HANDLER { GregtechAdvancedBoilers.run(); GregtechPollutionDevices.run(); GregtechTieredFluidTanks.run(); - // GregtechIndustrialMultiTank.run(); GregtechGeothermalThermalGenerator.run(); Gregtech4Content.run(); GregtechIndustrialFuelRefinery.run(); @@ -122,7 +184,6 @@ public class COMPAT_HANDLER { GregtechWirelessChargers.run(); GregtechIndustrialGeneratorArray.run(); GregtechIndustrialCuttingFactory.run(); - // GregtechMiniRaFusion.run(); GregtechComponentAssembler.run(); GregtechTeslaTower.run(); GregtechSuperChests.run(); @@ -130,7 +191,6 @@ public class COMPAT_HANDLER { GregtechTieredChunkloaders.run(); GregtechIndustrialExtruder.run(); GregtechIndustrialMultiMachine.run(); - // GregtechBedrockPlatforms.run(); GregtechBufferDynamos.run(); GregtechAmazonWarehouse.run(); GregtechFactoryGradeReplacementMultis.run(); @@ -138,7 +198,6 @@ public class COMPAT_HANDLER { GregtechThreadedBuffers.run(); GregtechIndustrialMixer.run(); GregtechCustomHatches.run(); - // GregtechNaqReactor.run(); GregtechIndustrialArcFurnace.run(); GregtechSolarTower.run(); GregtechLargeTurbinesAndHeatExchanger.run(); @@ -159,44 +218,21 @@ public class COMPAT_HANDLER { // InterMod public static void intermodOreDictionarySupport() { - if (LoadedMods.Big_Reactors) { - COMPAT_BigReactors.OreDict(); - } - if (LoadedMods.EnderIO) { + if (EnderIO.isModLoaded()) { COMPAT_EnderIO.OreDict(); } - if (LoadedMods.MorePlanets) { - COMPAT_MorePlanets.OreDict(); - } - if (LoadedMods.OpenBlocks) { + if (OpenBlocks.isModLoaded()) { COMPAT_OpenBlocks.OreDict(); } - if (LoadedMods.Railcraft) { - COMPAT_Railcraft.OreDict(); - } - if (LoadedMods.Simply_Jetpacks) { - COMPAT_SimplyJetpacks.OreDict(); - } - if (LoadedMods.RFTools) { - COMPAT_RFTools.OreDict(); - } - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { COMPAT_Thaumcraft.OreDict(); } - if (LoadedMods.Extra_Utils) { + if (ExtraUtilities.isModLoaded()) { COMPAT_ExtraUtils.OreDict(); } - if (LoadedMods.PneumaticCraft) { - COMPAT_PneumaticCraft.OreDict(); - } - if (LoadedMods.CompactWindmills) { - COMPAT_CompactWindmills.OreDict(); - } COMPAT_IC2.OreDict(); - if (LoadedMods.PamsHarvestcraft) { - COMPAT_HarvestCraft.OreDict(); - } - if (LoadedMods.Witchery) { + + if (Witchery.isModLoaded()) { COMPAT_Witchery.OreDict(); } } diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java index 58762cca9d..d51acebcac 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java @@ -4,18 +4,14 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import gtPlusPlus.xmod.advsolar.HANDLER_AdvSolar; +import gtPlusPlus.recipes.RecipeRemovals; import gtPlusPlus.xmod.bartcrops.HANDLER_CropsPlusPlus; import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; -import gtPlusPlus.xmod.computronics.HANDLER_Computronics; import gtPlusPlus.xmod.forestry.HANDLER_FR; -import gtPlusPlus.xmod.galacticraft.HANDLER_GalactiCraft; import gtPlusPlus.xmod.gregtech.HANDLER_GT; -import gtPlusPlus.xmod.growthcraft.HANDLER_GC; import gtPlusPlus.xmod.ic2.HANDLER_IC2; import gtPlusPlus.xmod.ob.HANDLER_OpenBlocks; import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft; -import gtPlusPlus.xmod.reliquary.HANDLER_Reliquary; import gtPlusPlus.xmod.sc2.HANDLER_SC2; import gtPlusPlus.xmod.sol.HANDLER_SpiceOfLife; import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft; @@ -26,66 +22,38 @@ public class COMPAT_IntermodStaging { public static void preInit(FMLPreInitializationEvent preinit) { HANDLER_GT.preInit(); - HANDLER_GC.preInit(); HANDLER_TF.preInit(); HANDLER_FR.preInit(); HANDLER_IC2.preInit(); - HANDLER_Computronics.preInit(); HANDLER_BiomesOPlenty.preInit(); - // HANDLER_Mekanism.preInit(); - HANDLER_Thaumcraft.preInit(); - HANDLER_Tinkers.preInit(); HANDLER_SC2.preInit(); - HANDLER_GalactiCraft.preInit(); HANDLER_CropsPlusPlus.preInit(preinit); HANDLER_Railcraft.preInit(); - HANDLER_Reliquary.preInit(); - HANDLER_OpenBlocks.preInit(); HANDLER_SpiceOfLife.preInit(); } public static void init(FMLInitializationEvent init) { HANDLER_GT.init(); - HANDLER_GC.init(); HANDLER_TF.init(); - HANDLER_FR.Init(); - HANDLER_IC2.init(); - HANDLER_Computronics.init(); - HANDLER_BiomesOPlenty.init(); - // HANDLER_Mekanism.init(); HANDLER_Thaumcraft.init(); - HANDLER_Tinkers.init(); - HANDLER_SC2.init(); - HANDLER_GalactiCraft.init(); - HANDLER_CropsPlusPlus.init(init); - HANDLER_Railcraft.init(); - HANDLER_Reliquary.init(); HANDLER_OpenBlocks.init(); - HANDLER_SpiceOfLife.init(); } public static void postInit(FMLPostInitializationEvent postinit) { HANDLER_GT.postInit(); - HANDLER_GC.postInit(); HANDLER_TF.postInit(); HANDLER_FR.postInit(); HANDLER_IC2.postInit(); - HANDLER_Computronics.postInit(); HANDLER_BiomesOPlenty.postInit(); - // HANDLER_Mekanism.postInit(); - HANDLER_Thaumcraft.postInit(); HANDLER_Tinkers.postInit(); - HANDLER_SC2.postInit(); - HANDLER_GalactiCraft.postInit(); HANDLER_CropsPlusPlus.postInit(postinit); HANDLER_Railcraft.postInit(); - HANDLER_Reliquary.postInit(); HANDLER_OpenBlocks.postInit(); - HANDLER_SpiceOfLife.postInit(); - HANDLER_AdvSolar.postInit(); + RecipeRemovals.postInit(); } public static void onLoadComplete(FMLLoadCompleteEvent event) { HANDLER_GT.onLoadComplete(event); + RecipeRemovals.onLoadComplete(); } } diff --git a/src/main/java/gtPlusPlus/core/handler/MobMentality.java b/src/main/java/gtPlusPlus/core/handler/MobMentality.java index 9f7ba19175..15be7cc4f4 100644 --- a/src/main/java/gtPlusPlus/core/handler/MobMentality.java +++ b/src/main/java/gtPlusPlus/core/handler/MobMentality.java @@ -1,6 +1,8 @@ package gtPlusPlus.core.handler; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java index 3ff6a0a990..8e04b5b68f 100644 --- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.handler; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -8,7 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.network.handler.AbstractClientMessageHandler; import gtPlusPlus.core.network.packet.AbstractPacket; import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui; @@ -19,7 +20,7 @@ public class PacketHandler { private static byte packetId = 0; - private static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(CORE.MODID); + private static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(GTPlusPlus.ID); public static final void init() { registerMessage(Packet_VolumetricFlaskGui.class, Packet_VolumetricFlaskGui.class); diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java index cd4ff542dc..12acc8b4d3 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java @@ -2,7 +2,11 @@ package gtPlusPlus.core.handler.Recipes; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.recipe.*; +import gtPlusPlus.core.recipe.RECIPES_General; +import gtPlusPlus.core.recipe.RECIPES_MachineComponents; +import gtPlusPlus.core.recipe.RECIPES_Machines; +import gtPlusPlus.core.recipe.RECIPES_Tools; +import gtPlusPlus.core.recipe.RECIPE_Batteries; public class RegistrationHandler { diff --git a/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java index 73789038b5..e2ea5746a1 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.handler.events; +import static gregtech.api.enums.Mods.Thaumcraft; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre; @@ -17,7 +18,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -155,7 +155,7 @@ public class BlockEventHandler { if (((event.block == Blocks.stone) || (event.block == Blocks.sandstone) || (event.block == Blocks.log) || (event.block == Blocks.log2) - || (event.block == Blocks.grass)) && !LoadedMods.Thaumcraft + || (event.block == Blocks.grass)) && !Thaumcraft.isModLoaded() && (chanceToDropDrainedShard != 0)) { // small chance for one to spawn per stone mined. 1 per 3 stacks~ if (MathUtils.randInt(1, chanceToDropDrainedShard) == 1) { diff --git a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java index 363ad472f2..6aa9fde2a8 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java @@ -9,11 +9,11 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import advsolar.common.AdvancedSolarPanel; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import gregtech.api.enums.Mods; import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -90,12 +90,12 @@ public class GeneralTooltipEventHandler { event.toolTip.add("Max Capacity: " + MathUtils.formatNumbers(32000) + "L"); } - if (LoadedMods.AdvancedSolarPanel) { + if (Mods.AdvancedSolarPanel.isModLoaded()) { molecularTransformer(event); } } - @Optional.Method(modid = "AdvancedSolarPanel") + @Optional.Method(modid = Mods.Names.ADVANCED_SOLAR_PANEL) public static void molecularTransformer(ItemTooltipEvent event) { if (event.itemStack.getItem() == Item.getItemFromBlock(AdvancedSolarPanel.blockMolecularTransformer)) { event.toolTip.add("" + EnumChatFormatting.RED + "Disabled, Use the multiblock"); diff --git a/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java index 762a2400f7..7ba06f4bbd 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java +++ b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.handler.events; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gtPlusPlus.core.item.base.dusts.BaseItemDustEx.mCachedPileLinkages; import net.minecraft.item.ItemStack; @@ -10,14 +11,13 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; public class MissingMappingsEvent { @EventHandler public void onMissingMapping(FMLMissingMappingsEvent event) { for (MissingMapping mapping : event.get()) { - boolean bool1 = mapping.name.contains(CORE.MODID); + boolean bool1 = mapping.name.contains(GTPlusPlus.ID); // Missing Blocks if (mapping.type == cpw.mods.fml.common.registry.GameRegistry.Type.BLOCK && bool1) { @@ -30,12 +30,6 @@ public class MissingMappingsEvent { // Missing Items if (mapping.type == cpw.mods.fml.common.registry.GameRegistry.Type.ITEM && bool1) { - - // Example - // if(mapping.name.equals("PneumaticCraft:etchingAcidBucket")) { - // mapping.remap(Fluids.getBucket(Fluids.etchingAcid)); - // } - if (mapping.name.contains("miscutils:itemDustTiny")) { ItemStack stack = null; String missingItemString = StringUtils.remove(mapping.name, "miscutils:itemDustTiny"); diff --git a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java index 3fd0e6b984..26d944c96d 100644 --- a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.handler.render; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Collection; import net.minecraft.client.entity.AbstractClientPlayer; @@ -20,8 +22,8 @@ import gtPlusPlus.core.lib.CORE; public class CapeHandler extends RenderPlayer { - private final ResourceLocation[] mCapes = { new ResourceLocation(CORE.MODID + ":textures/TesterCape.png"), - new ResourceLocation(CORE.MODID + ":textures/Draknyte1.png"), + private final ResourceLocation[] mCapes = { new ResourceLocation(GTPlusPlus.ID + ":textures/TesterCape.png"), + new ResourceLocation(GTPlusPlus.ID + ":textures/Draknyte1.png"), new ResourceLocation("gregtech:textures/GregoriusCape.png") }; private final Collection<String> mCapeList; diff --git a/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java index c1099585ce..0237047121 100644 --- a/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java +++ b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.handler.render; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -13,7 +15,7 @@ import org.lwjgl.opengl.GL11; public class FirepitRender extends TileEntitySpecialRenderer { - ResourceLocation texture = new ResourceLocation("miscutils" + ":" + "textures/blocks/FirePit/mossyFirepit.png"); + ResourceLocation texture = new ResourceLocation(GTPlusPlus.ID + ":" + "textures/blocks/FirePit/mossyFirepit.png"); private final FirepitModel model; diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 3b9a1b48c6..dd07d2b138 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -1,58 +1,122 @@ package gtPlusPlus.core.item; -import static gtPlusPlus.core.creative.AddToCreativeTab.*; +import static gregtech.api.enums.Mods.Baubles; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines; +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT; -import net.minecraft.item.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.common.compat.COMPAT_Baubles; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.*; +import gtPlusPlus.core.item.base.BaseEuItem; +import gtPlusPlus.core.item.base.BaseItemBackpack; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; +import gtPlusPlus.core.item.base.BaseItemDamageable; +import gtPlusPlus.core.item.base.BaseItemTCShard; +import gtPlusPlus.core.item.base.CoreItem; import gtPlusPlus.core.item.base.dusts.BaseItemDust; import gtPlusPlus.core.item.base.foil.BaseItemFoil; -import gtPlusPlus.core.item.base.foods.*; +import gtPlusPlus.core.item.base.foods.BaseItemFood; +import gtPlusPlus.core.item.base.foods.BaseItemHotFood; import gtPlusPlus.core.item.base.gears.BaseItemSmallGear; -import gtPlusPlus.core.item.base.ingots.*; +import gtPlusPlus.core.item.base.ingots.BaseItemIngot; +import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; import gtPlusPlus.core.item.base.misc.BaseItemMisc; import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; -import gtPlusPlus.core.item.base.plates.*; -import gtPlusPlus.core.item.bauble.*; -import gtPlusPlus.core.item.chemistry.*; +import gtPlusPlus.core.item.base.plates.BaseItemPlate; +import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; +import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble; +import gtPlusPlus.core.item.bauble.HealthBoostBauble; +import gtPlusPlus.core.item.bauble.ModularBauble; +import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble; +import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.core.item.chemistry.CoalTar; +import gtPlusPlus.core.item.chemistry.GenericChem; +import gtPlusPlus.core.item.chemistry.IonParticles; +import gtPlusPlus.core.item.chemistry.MilledOreProcessing; +import gtPlusPlus.core.item.chemistry.NuclearChem; +import gtPlusPlus.core.item.chemistry.RocketFuels; +import gtPlusPlus.core.item.chemistry.StandardBaseParticles; import gtPlusPlus.core.item.crafting.ItemDummyResearch; -import gtPlusPlus.core.item.effects.RarityUncommon; import gtPlusPlus.core.item.food.BaseItemMetaFood; -import gtPlusPlus.core.item.general.*; +import gtPlusPlus.core.item.general.BaseItemGrindle; +import gtPlusPlus.core.item.general.BufferCore; +import gtPlusPlus.core.item.general.ItemAirFilter; +import gtPlusPlus.core.item.general.ItemAreaClear; +import gtPlusPlus.core.item.general.ItemBasicFirestarter; +import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; +import gtPlusPlus.core.item.general.ItemBlueprint; +import gtPlusPlus.core.item.general.ItemControlCore; +import gtPlusPlus.core.item.general.ItemEmpty; +import gtPlusPlus.core.item.general.ItemGemShards; +import gtPlusPlus.core.item.general.ItemGenericToken; +import gtPlusPlus.core.item.general.ItemGiantEgg; +import gtPlusPlus.core.item.general.ItemHalfCompleteCasings; +import gtPlusPlus.core.item.general.ItemLavaFilter; +import gtPlusPlus.core.item.general.ItemMagicFeather; +import gtPlusPlus.core.item.general.ItemSunnariumBit; import gtPlusPlus.core.item.general.books.ItemBaseBook; import gtPlusPlus.core.item.general.capture.ItemEntityCatcher; -import gtPlusPlus.core.item.general.chassis.*; +import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis; +import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil; +import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; -import gtPlusPlus.core.item.general.throwables.*; +import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion; +import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion; +import gtPlusPlus.core.item.general.throwables.ItemThrowableBomb; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; -import gtPlusPlus.core.item.tool.misc.*; -import gtPlusPlus.core.item.tool.misc.box.*; -import gtPlusPlus.core.item.tool.staballoy.*; +import gtPlusPlus.core.item.tool.misc.DebugScanner; +import gtPlusPlus.core.item.tool.misc.GregtechPump; +import gtPlusPlus.core.item.tool.misc.SandstoneHammer; +import gtPlusPlus.core.item.tool.misc.box.AutoLunchBox; +import gtPlusPlus.core.item.tool.misc.box.MagicToolBag; +import gtPlusPlus.core.item.tool.misc.box.UniversalToolBox; +import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase; +import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase; +import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe; +import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe; import gtPlusPlus.core.item.wearable.WearableLoader; -import gtPlusPlus.core.lib.*; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.material.*; -import gtPlusPlus.core.material.nuclear.*; +import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.NONMATERIAL; +import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.debug.DEBUG_INIT; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.everglades.GTplusplus_Everglades; import gtPlusPlus.preloader.CORE_Preloader; @@ -89,16 +153,7 @@ public final class ModItems { public static Item itemDustEnergeticAlloy; public static Item itemDustVibrantAlloy; public static Item itemDustConductiveIron; - // Big Reactors - public static Item itemPlateBlutonium; - public static Item itemPlateCyanite; - public static Item itemPlateLudicrite; - // Pneumaticraft - public static Item itemPlateCompressedIron; - // SimplyJetpacks - public static Item itemPlateEnrichedSoularium; - // rfTools - public static Item itemPlateDimensionShard; + // Staballoy public static Item itemStaballoyPickaxe; public static Item itemStaballoyAxe; @@ -386,17 +441,17 @@ public final class ModItems { // Some Simple forms of materials itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines) - .setTextureName(CORE.MODID + ":itemStickyRubber"); + .setTextureName(GTPlusPlus.ID + ":itemStickyRubber"); GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber"); GT_OreDictUnificator - .registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemStickyRubber", 1)); + .registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemStickyRubber", 1)); // Register Hydrogen Blobs first, so we can replace old helium blobs. itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc) - .setTextureName(CORE.MODID + ":itemHeliumBlob"); + .setTextureName(GTPlusPlus.ID + ":itemHeliumBlob"); // Register Old Helium Blob, this will be replaced when held by a player. itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc, ItemUtils.getSimpleStack(itemHydrogenBlob)) - .setTextureName(CORE.MODID + ":itemHydrogenBlob"); + .setTextureName(GTPlusPlus.ID + ":itemHydrogenBlob"); // Register this neato device, for making some fires. itemBasicFireMaker = new ItemBasicFirestarter(); @@ -447,7 +502,7 @@ public final class ModItems { EnumRarity.rare, EnumChatFormatting.GRAY, false, - Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob"); + Utils.rgbtoHexValue(182, 114, 18)).setTextureName(GTPlusPlus.ID + ":itemHeliumBlob"); itemHalfCompleteCasings = new ItemHalfCompleteCasings( "itemHalfCompleteCasings", AddToCreativeTab.tabMisc, @@ -457,15 +512,15 @@ public final class ModItems { EnumRarity.common, EnumChatFormatting.GRAY, false, - Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761"); + Utils.rgbtoHexValue(255, 255, 255)).setTextureName(GregTech.ID + ":" + "gt.metaitem.01/" + "761"); itemSulfuricPotion = new ItemSulfuricAcidPotion( "itemSulfuricPotion", "Throwable Vial of Sulfuric Acid", - "Burn your foes alive!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion"); + "Burn your foes alive!").setTextureName(GTPlusPlus.ID + ":itemSulfuricAcidPotion"); itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion( "itemHydrofluoricPotion", "Throwable Vial of Hydrofluoric Acid", - "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemPotion"); + "They won't see this coming, nor anything after!").setTextureName(GTPlusPlus.ID + ":itemPotion"); // Start meta Item Generation ItemsFoods.load(); @@ -710,20 +765,24 @@ public final class ModItems { "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt." }); // Generates four elemental shards when TC is not installed. - if (!LoadedMods.Thaumcraft) { + if (!Thaumcraft.isModLoaded()) { shardAer = new BaseItemTCShard("Aer", Utils.rgbtoHexValue(225, 225, 5)); shardIgnis = new BaseItemTCShard("Ignis", Utils.rgbtoHexValue(255, 5, 5)); shardTerra = new BaseItemTCShard("Terra", Utils.rgbtoHexValue(5, 255, 5)); shardAqua = new BaseItemTCShard("Aqua", Utils.rgbtoHexValue(5, 5, 255)); } else { - shardAer = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Air Shard", 0, 1) + shardAer = ItemUtils + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Air Shard", 0, 1) .getItem(); shardIgnis = ItemUtils - .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Fire Shard", 1, 1).getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Fire Shard", 1, 1) + .getItem(); shardAqua = ItemUtils - .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Warer Shard", 2, 1).getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Warer Shard", 2, 1) + .getItem(); shardTerra = ItemUtils - .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Earth Shard", 3, 1).getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Earth Shard", 3, 1) + .getItem(); } // Generates a set of four special dusts to be used in my recipes. dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0]; @@ -751,8 +810,7 @@ public final class ModItems { "LiOH", Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_hydroxide - if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1)) - && !LoadedMods.IHL) { + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { dustQuicklime = ItemUtils .generateSpecialUseDusts("Quicklime", "Quicklime", "CaO", Utils.rgbtoHexValue(255, 255, 175))[0]; // https://en.wikipedia.org/wiki/Calcium_oxide } @@ -847,7 +905,7 @@ public final class ModItems { itemZirconiumChlorideCinterPellet = new CoreItem( "itemZirconiumPellet", "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]", - tabMisc).setTextureName(CORE.MODID + ":itemShard"); + tabMisc).setTextureName(GTPlusPlus.ID + ":itemShard"); GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); // Zirconium Chloride dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf @@ -887,7 +945,7 @@ public final class ModItems { ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); ItemStack temp2 = null; - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); } if (temp1 != null) { @@ -1088,9 +1146,9 @@ public final class ModItems { // Bombs itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc); - itemBombCasing.setTextureName(CORE.MODID + ":bomb_casing"); + itemBombCasing.setTextureName(GTPlusPlus.ID + ":bomb_casing"); itemBombUnf = new CoreItem("itemBombUnf", "Bomb (unf)", tabMisc); - itemBombUnf.setTextureName(CORE.MODID + ":bomb_casing"); + itemBombUnf.setTextureName(GTPlusPlus.ID + ":bomb_casing"); itemDetCable = new CoreItem("itemDetCable", "Det. Cable", tabMisc); itemDetCable.setTextureName("string"); itemBomb = new ItemThrowableBomb(); @@ -1119,13 +1177,13 @@ public final class ModItems { new String[] { "You Found this on the ground.", "Definitely not sure if it's worth eating." }); // Baubles - if (LoadedMods.Baubles) { + if (Baubles.isModLoaded()) { tI = new HealthBoostBauble(); itemModularBauble = new ModularBauble(); } // EnderIO Resources - if ((LoadedMods.EnderIO || LOAD_ALL_CONTENT)) { + if ((EnderIO.isModLoaded() || LOAD_ALL_CONTENT)) { Logger.INFO("EnderIO Found - Loading Resources."); // Enderio Dusts itemDustSoularium = ItemUtils.generateSpecialUseDusts( @@ -1229,51 +1287,6 @@ public final class ModItems { */ } - // Big Reactors - if (LoadedMods.Big_Reactors || LOAD_ALL_CONTENT) { - Logger.INFO("BigReactors Found - Loading Resources."); - // Item Init - itemPlateBlutonium = ItemUtils - .generateSpecialUsePlate("Blutonium", "Blutonium", new short[] { 0, 0, 255 }, 0); - itemPlateCyanite = ItemUtils.generateSpecialUsePlate("Cyanite", "Cyanite", new short[] { 0, 191, 255 }, 0); - itemPlateLudicrite = ItemUtils - .generateSpecialUsePlate("Ludicrite", "Ludicrite", new short[] { 167, 5, 179 }, 0); - } else { - Logger.WARNING("BigReactors not Found - Skipping Resources."); - } - - // Pneumaticraft - if (LoadedMods.PneumaticCraft || LOAD_ALL_CONTENT) { - Logger.INFO("PneumaticCraft Found - Loading Resources."); - // Item Init - itemPlateCompressedIron = ItemUtils - .generateSpecialUsePlate("CompressedIron", "Compressed Iron", new short[] { 128, 128, 128 }, 0); - } else { - Logger.WARNING("PneumaticCraft not Found - Skipping Resources."); - } - - // Simply Jetpacks - if (LoadedMods.Simply_Jetpacks || LOAD_ALL_CONTENT) { - Logger.INFO("SimplyJetpacks Found - Loading Resources."); - // Item Init - itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium") - .setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium"); - // Registry - GameRegistry.registerItem(itemPlateEnrichedSoularium, "itemPlateEnrichedSoularium"); - } else { - Logger.WARNING("SimplyJetpacks not Found - Skipping Resources."); - } - - // rfTools - if (LoadedMods.RFTools || LOAD_ALL_CONTENT) { - Logger.INFO("rfTools Found - Loading Resources."); - // Item Init - itemPlateDimensionShard = ItemUtils - .generateSpecialUsePlate("DimensionShard", "Dimensional Shard", new short[] { 170, 230, 230 }, 0); - } else { - Logger.WARNING("rfTools not Found - Skipping Resources."); - } - // IC2 Exp Logger.INFO("IndustrialCraft2 Found - Loading Resources."); @@ -1327,7 +1340,7 @@ public final class ModItems { } itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit") - .setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); + .setTextureName(GTPlusPlus.ID + ":itemPLACEHOLDER_Circuit"); GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); // ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java index 2b057ae416..a4040e14b2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -1,8 +1,13 @@ package gtPlusPlus.core.item.base; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.GTPlusPlus; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.HashMap; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -27,11 +32,16 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.IItemContainer; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import ic2.api.item.*; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricItemManager { @@ -459,10 +469,10 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI if (this.mEnabledItems.get(i)) { for (byte k = 1; k < this.mIconList[i].length; k++) { this.mIconList[i][k] = aIconRegister - .registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i + "/" + k)); + .registerIcon(GTPlusPlus.ID + ":" + (this.getUnlocalizedName() + "/" + i + "/" + k)); } this.mIconList[i][0] = aIconRegister - .registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i)); + .registerIcon(GTPlusPlus.ID + ":" + (this.getUnlocalizedName() + "/" + i)); } } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java index ef27a4fa02..b724687c1a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -13,7 +15,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -25,7 +26,7 @@ public class BaseItemBackpack extends Item { public BaseItemBackpack(final String unlocalizedName, final int colour) { this.unlocalName = unlocalizedName; this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + "itemBackpack"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemBackpack"); this.colourValue = colour; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre("storageBackpack", ItemUtils.getSimpleStack(this)); @@ -69,6 +70,6 @@ public class BaseItemBackpack extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemBackpack"); + this.itemIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "itemBackpack"); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index 5b935d8234..8c3fdeb0f9 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -13,7 +15,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; -import gtPlusPlus.core.lib.CORE; public class BaseItemColourable extends Item { @@ -35,7 +36,7 @@ public class BaseItemColourable extends Item { final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); @@ -57,7 +58,7 @@ public class BaseItemColourable extends Item { final EnumChatFormatting colour, final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index d78395057f..dd4cd24366 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -1,7 +1,13 @@ package gtPlusPlus.core.item.base; -import java.awt.Color; -import java.util.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.Thaumcraft; + +import java.awt.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -24,7 +30,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -73,7 +78,7 @@ public class BaseItemComponent extends Item { if (componentType == ComponentTypes.GEAR) { GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), // TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1); if (componentMaterial.isRadioactive) { @@ -109,7 +114,7 @@ public class BaseItemComponent extends Item { this.componentColour = MathUtils.getRgbAsHex(RGBA); this.extraData = RGBA; - this.setTextureName(CORE.MODID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME); + this.setTextureName(GTPlusPlus.ID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME); GameRegistry.registerItem(this, aFormattedNameForFluids); GT_OreDictUnificator.registerOre( ComponentTypes.CELL.getOreDictName() + Utils.sanitizeStringKeepBrackets(localName), @@ -170,7 +175,7 @@ public class BaseItemComponent extends Item { public String getCorrectTextures() { if (!CORE.ConfigSwitches.useGregtechTextures) { - return CORE.MODID + ":" + "item" + this.componentType.COMPONENT_NAME; + return GTPlusPlus.ID + ":" + "item" + this.componentType.COMPONENT_NAME; } String metType = "9j4852jyo3rjmh3owlhw9oe"; if (this.componentMaterial != null) { @@ -180,9 +185,9 @@ public class BaseItemComponent extends Item { } } metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType); - return "gregtech" + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); + return GregTech.ID + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); - // return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase(); + // return GregTech.ID + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase(); } /* diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java index 3ea7c93102..9f026e0192 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -14,7 +16,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; public class BaseItemDamageable extends Item { @@ -27,7 +28,7 @@ public class BaseItemDamageable extends Item { final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(1); this.setMaxDamage(251); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java index e7afbab4fb..eb75c1fe5d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -7,13 +9,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE; - public class BaseItemGeneric extends Item { public BaseItemGeneric(final String unlocalizedName, final CreativeTabs c, final int stackSize, final int maxDmg) { - this.setUnlocalizedName(CORE.MODID + "_" + unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setUnlocalizedName(GTPlusPlus.ID + "_" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(c); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java index 56d7aa2d6f..5f4795689d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -10,7 +12,6 @@ import net.minecraft.world.World; import gregtech.api.enums.Materials; import gtPlusPlus.api.enums.Quality; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -29,7 +30,7 @@ public class BaseItemLoot extends Item { this.unlocalName = "item" + lootType.LOOT_TYPE + this.materialName; this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "item" + lootType.LOOT_TYPE); + this.setTextureName(GTPlusPlus.ID + ":" + "item" + lootType.LOOT_TYPE); } public ItemStack generateLootStack() { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java index 1714278cd1..40163e29ec 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -12,7 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -39,7 +40,7 @@ public class BaseItemTCShard extends Item { } } this.setMaxStackSize(64); - this.setTextureName(CORE.MODID + ":" + "itemShard"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemShard"); GameRegistry.registerItem(this, this.unlocalName); GT_OreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this)); GT_OreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this)); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java index 6e1b86eec0..77af625213 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +18,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BaseItemTickable extends CoreItem { @@ -114,10 +115,10 @@ public class BaseItemTickable extends CoreItem { public void registerIcons(final IIconRegister i) { if (this.twoRenderPasses) { - this.mIcon[0] = i.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName()); - this.mIcon[1] = i.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "_OVERLAY"); + this.mIcon[0] = i.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName()); + this.mIcon[1] = i.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName() + "_OVERLAY"); } else { - this.mIcon[0] = i.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName()); + this.mIcon[0] = i.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName()); // this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY"); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java index f42b13924d..a056b57852 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -11,7 +13,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BaseItemWithCharge extends Item { @@ -21,7 +22,7 @@ public class BaseItemWithCharge extends Item { public BaseItemWithCharge(final String unlocalizedName, final int constructor_Charge, final int constructor_Max_Charge) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); this.int_Charge = constructor_Charge; diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java index a5b71e5958..0e1b0ab0f2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java @@ -1,18 +1,18 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE; - public class BaseItemWithDamageValue extends Item { public BaseItemWithDamageValue(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(100); } diff --git a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index e6acd5dd63..80284495b9 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java @@ -6,12 +6,19 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemMonsterPlacer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.Facing; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index 516fdea294..1e2ddb4aea 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -16,7 +18,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class CoreItem extends Item { @@ -177,7 +178,7 @@ public class CoreItem extends Item { final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); @@ -198,7 +199,7 @@ public class CoreItem extends Item { final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); this.itemName = displayName; - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index a260323da6..cd1331be55 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.cell; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -47,11 +50,11 @@ public class BaseItemCell extends BaseItemComponent { public void registerIcons(final IIconRegister i) { if (CORE.ConfigSwitches.useGregtechTextures) { - this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell"); - this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); + this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell"); + this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); } else { - this.base = i.registerIcon(CORE.MODID + ":" + "item" + this.Cell.getComponent()); - this.overlay = i.registerIcon(CORE.MODID + ":" + "item" + this.Cell.getComponent() + "_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.Cell.getComponent()); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.Cell.getComponent() + "_Overlay"); } // this.overlay = cellMaterial.getFluid(1000).getFluid().get } diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java index 8e9c00143a..cca8113e91 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.cell; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; @@ -10,7 +12,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; @@ -36,8 +37,8 @@ public class BaseItemPlasmaCell extends BaseItemComponent { @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "item" + this.PlasmaCell.getComponent()); - this.overlay = i.registerIcon(CORE.MODID + ":" + "item" + this.PlasmaCell.getComponent() + "_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.PlasmaCell.getComponent()); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.PlasmaCell.getComponent() + "_Overlay"); // this.overlay = cellMaterial.getFluid(1000).getFluid().get } diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java index af5fc9abfd..c89bbb1d7d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -7,7 +9,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; public abstract class BaseItemDustAbstract extends Item { @@ -20,9 +21,9 @@ public abstract class BaseItemDustAbstract extends Item { this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); if (pileSize.equalsIgnoreCase("dust")) { - this.setTextureName(CORE.MODID + ":" + "dust"); + this.setTextureName(GTPlusPlus.ID + ":" + "dust"); } else { - this.setTextureName(CORE.MODID + ":" + "dust" + pileSize); + this.setTextureName(GTPlusPlus.ID + ":" + "dust" + pileSize); } this.setMaxStackSize(64); this.colour = colour; diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java index b3be8fb9c3..13dacd065d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java @@ -1,6 +1,11 @@ package gtPlusPlus.core.item.base.dusts; -import java.util.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -107,7 +112,7 @@ public class BaseItemDustEx extends BaseItemComponent { @Override public String getCorrectTextures() { if (!CORE.ConfigSwitches.useGregtechTextures) { - return CORE.MODID + ":" + "item" + this.componentType.getComponent(); + return GTPlusPlus.ID + ":" + "item" + this.componentType.getComponent(); } String metType = "9j4852jyo3rjmh3owlhw9oe"; if (this.componentMaterial != null) { @@ -117,6 +122,6 @@ public class BaseItemDustEx extends BaseItemComponent { } } metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType); - return "gregtech" + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); + return GregTech.ID + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index e4de7b038c..ba2b48b363 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import java.util.HashMap; @@ -116,17 +118,17 @@ public class BaseItemDustUnique extends Item { private String getCorrectTexture(final String pileSize) { if (!CORE.ConfigSwitches.useGregtechTextures) { if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))) { - this.setTextureName(CORE.MODID + ":" + "dust"); + this.setTextureName(GTPlusPlus.ID + ":" + "dust"); } else { - this.setTextureName(CORE.MODID + ":" + "dust" + pileSize); + this.setTextureName(GTPlusPlus.ID + ":" + "dust" + pileSize); } } if (pileSize.toLowerCase().contains("small")) { - return "gregtech" + ":" + "materialicons/SHINY/dustSmall"; + return GregTech.ID + ":" + "materialicons/SHINY/dustSmall"; } else if (pileSize.toLowerCase().contains("tiny")) { - return "gregtech" + ":" + "materialicons/SHINY/dustTiny"; + return GregTech.ID + ":" + "materialicons/SHINY/dustTiny"; } - return "gregtech" + ":" + "materialicons/SHINY/dust"; + return GregTech.ID + ":" + "materialicons/SHINY/dust"; } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java index 1a2e58f7f6..78af2155b1 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts.decimal; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -9,7 +11,6 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; public class BaseItemCentidust extends Item { @@ -25,7 +26,7 @@ public class BaseItemCentidust extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(10); - this.setTextureName(CORE.MODID + ":" + "itemCentidust"); // TODO + this.setTextureName(GTPlusPlus.ID + ":" + "itemCentidust"); // TODO GameRegistry.registerItem(this, this.unlocalName); // GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); //TODO } diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java index 826d6d13c9..de1b63794e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts.decimal; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -9,7 +11,6 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; public class BaseItemDecidust extends Item { @@ -25,7 +26,7 @@ public class BaseItemDecidust extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(10); - this.setTextureName(CORE.MODID + ":" + "itemDecidust"); // TODO + this.setTextureName(GTPlusPlus.ID + ":" + "itemDecidust"); // TODO GameRegistry.registerItem(this, this.unlocalName); // GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); //TODO } diff --git a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java index 95f2a1d41d..f101bb969b 100644 --- a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java +++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.foods; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -8,7 +10,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BaseItemFood extends ItemFood { @@ -19,7 +20,7 @@ public class BaseItemFood extends ItemFood { final float saturationModifier, final boolean wolvesFavorite, final PotionEffect... effects) { super(healAmount, saturationModifier, wolvesFavorite); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName.replace("Hot", "")); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName.replace("Hot", "")); this.setCreativeTab(AddToCreativeTab.tabMisc); this.effects = effects; this.localName = localizedName; diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 84d00ec66d..b180a80f2b 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.ingots; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +32,7 @@ public class BaseItemIngotHot extends BaseItemIngot { public BaseItemIngotHot(final Material material) { super(material, ComponentTypes.HOTINGOT); - this.setTextureName(CORE.MODID + ":" + "itemIngotHot"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemIngotHot"); this.outputIngot = material.getIngot(1); this.mTier = material.vTier; this.generateRecipe(); @@ -82,12 +85,12 @@ public class BaseItemIngotHot extends BaseItemIngot { public void registerIcons(final IIconRegister i) { if (CORE.ConfigSwitches.useGregtechTextures) { - this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot"); - this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); + this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot"); + this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); } else { - this.base = i - .registerIcon(CORE.MODID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()); - // this.overlay = i.registerIcon(CORE.MODID + ":" + + this.base = i.registerIcon( + GTPlusPlus.ID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()); + // this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + // "item"+BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()+"_Overlay"); } // this.overlay = cellMaterial.getFluid(1000).getFluid().get diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java index c9cc305a3d..222f6e9c1a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.ingots; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -10,7 +12,6 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -27,7 +28,7 @@ public class BaseItemIngot_OLD extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.unlocalName = unlocalizedName; this.setMaxStackSize(64); - this.setTextureName(CORE.MODID + ":" + "itemIngot"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemIngot"); this.colour = colour; this.materialName = materialName; this.sRadiation = sRadioactivity; diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index a2b8f15b2c..64c5f76109 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.misc; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,8 +19,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -57,7 +58,7 @@ public class BaseItemMisc extends Item { } private String getCorrectTextures() { - return CORE.MODID + ":" + "item" + this.miscType.TYPE; + return GTPlusPlus.ID + ":" + "item" + this.miscType.TYPE; } @Override @@ -77,7 +78,7 @@ public class BaseItemMisc extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - if (this.miscType == MiscTypes.DROP && LoadedMods.Forestry) { + if (this.miscType == MiscTypes.DROP && Forestry.isModLoaded()) { this.itemIcon = par1IconRegister.registerIcon("forestry:honeyDrop.0"); this.secondIcon = par1IconRegister.registerIcon("forestry:honeyDrop.1"); } else { diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java index fdcb8a8b7f..56ecf59274 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.misc; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -12,7 +14,6 @@ import net.minecraft.util.EnumChatFormatting; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public abstract class BaseItemParticle extends CoreItem { @@ -31,7 +32,7 @@ public abstract class BaseItemParticle extends CoreItem { EnumChatFormatting.DARK_AQUA, false, null); - this.setTextureName(CORE.MODID + ":" + "science/Atom"); + this.setTextureName(GTPlusPlus.ID + ":" + "science/Atom"); aMaxCount = aCount; this.setHasSubtypes(true); } diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 48725e951c..6b4d3ab4a3 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.ore; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,7 +23,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -55,14 +57,6 @@ public class BaseOreComponent extends Item { GT_OreDictUnificator.registerOre( componentType.getComponent() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); - if (LoadedMods.Thaumcraft) { - // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), - // TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1); - if (componentMaterial.isRadioactive) { - // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), - // TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel); - } - } } public boolean registerComponent() { @@ -186,28 +180,29 @@ public class BaseOreComponent extends Item { @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister par1IconRegister) { if (this.componentType == ComponentTypes.MILLED) { - this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/milled"); + this.base = par1IconRegister.registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled"); if (this.componentType.hasOverlay()) { - this.overlay = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/milled_OVERLAY"); + this.overlay = par1IconRegister + .registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled_OVERLAY"); } } else if (CORE.ConfigSwitches.useGregtechTextures) { // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" - // is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the + // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the // layer 0 texture path."); this.base = par1IconRegister - .registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME); + .registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME); if (this.componentType.hasOverlay()) { // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" - // is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + + // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + // this.componentType.COMPONENT_NAME+"_OVERLAY"+"' as the layer 1 texture path."); this.overlay = par1IconRegister.registerIcon( - "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME + "_OVERLAY"); + GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME + "_OVERLAY"); } } else { - this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "item" + this.componentType.getComponent()); + this.base = par1IconRegister.registerIcon(GTPlusPlus.ID + ":" + "item" + this.componentType.getComponent()); if (this.componentType.hasOverlay()) { this.overlay = par1IconRegister - .registerIcon(CORE.MODID + ":" + "item" + this.componentType.getComponent() + "_Overlay"); + .registerIcon(GTPlusPlus.ID + ":" + "item" + this.componentType.getComponent() + "_Overlay"); } } } diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java index dcb133782a..a3a8eb6153 100644 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.item.base.plates; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; public class BaseItemPlateHeavy extends BaseItemComponent { @@ -19,7 +20,7 @@ public class BaseItemPlateHeavy extends BaseItemComponent { @Override public String getCorrectTextures() { - return CORE.MODID + ":" + "itemHeavyPlate"; + return GTPlusPlus.ID + ":" + "itemHeavyPlate"; } @Override @@ -30,8 +31,8 @@ public class BaseItemPlateHeavy extends BaseItemComponent { @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "itemHeavyPlate"); - this.overlay = i.registerIcon(CORE.MODID + ":" + "itemHeavyPlate_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "itemHeavyPlate"); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "itemHeavyPlate_Overlay"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java index a66510fc73..6f46752c2f 100644 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.plates; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -36,7 +38,7 @@ public class BaseItemPlate_OLD extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.unlocalName = "itemPlate" + unlocalizedName; this.setMaxStackSize(64); - this.setTextureName(CORE.MODID + ":" + "itemPlate"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemPlate"); this.setMaxStackSize(64); this.colour = colour; this.materialName = materialName; diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 14133ff837..0060d370b0 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -24,6 +24,7 @@ import com.google.common.collect.Multimap; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Mods; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; @@ -31,8 +32,8 @@ import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; import gtPlusPlus.core.util.minecraft.NBTUtils; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public class BaseBauble extends Item implements IBauble { /** diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java index bc2757a24a..463dd1608a 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -19,7 +21,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; import ic2.api.item.ElectricItem; @@ -31,7 +32,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble { super(BaubleType.BELT, tier, GT_Values.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name"); String aUnlocalName = "GTPP.BattPack.0" + tier + ".name"; this.setCreativeTab(AddToCreativeTab.tabMachines); - if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { GameRegistry.registerItem(this, aUnlocalName); } } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index 14b38d3f7e..4dcca46145 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -19,16 +21,16 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Mods; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public abstract class ElectricBaseBauble extends BaseBauble implements IElectricItem, IElectricItemManager, IBauble { public final int mTier; @@ -41,12 +43,12 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric mTier = aTier; maxValueEU = aMaxEU; this.setUnlocalizedName(aUnlocalName); - this.setTextureName(CORE.MODID + ":" + getTextureNameForBauble()); + this.setTextureName(GTPlusPlus.ID + ":" + getTextureNameForBauble()); this.setMaxDamage(27); this.setMaxStackSize(1); this.setNoRepair(); this.setCreativeTab(AddToCreativeTab.tabMachines); - if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { GameRegistry.registerItem(this, aUnlocalName); } } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index 5886717522..b5d7b8fdbb 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; @@ -18,7 +20,6 @@ import net.minecraft.world.World; import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.DevHelper; @@ -49,12 +50,12 @@ public class FireProtectionBauble extends BaseBauble { super(BaubleType.RING, "GTPP.bauble.fireprotection.0" + ".name", 0); String aUnlocalName = "GTPP.bauble.fireprotection.0" + ".name"; this.setUnlocalizedName(aUnlocalName); - this.setTextureName(CORE.MODID + ":" + getTextureNameForBauble()); + this.setTextureName(GTPlusPlus.ID + ":" + getTextureNameForBauble()); this.setMaxDamage(100); this.setMaxStackSize(1); this.setNoRepair(); this.setCreativeTab(AddToCreativeTab.tabMachines); - if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { GameRegistry.registerItem(this, aUnlocalName); } } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java index bd58824687..db422692e7 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.SharedMonsterAttributes; @@ -13,14 +15,13 @@ import net.minecraft.util.StatCollector; import baubles.api.BaubleType; import com.google.common.collect.Multimap; -import gtPlusPlus.core.lib.CORE; public class HealthBoostBauble extends BaseBauble { public HealthBoostBauble() { super(BaubleType.AMULET, "The Key to the City"); addDamageNegation(DamageSource.wither); - this.setTextureName(CORE.MODID + ":" + "itemKeyGold"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemKeyGold"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java index ec4d9de11c..51dcb4ea29 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Thaumcraft; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,7 +25,6 @@ import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ModularArmourUtils; import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers; @@ -448,17 +450,17 @@ public class ModularBauble extends BaseBauble { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - this.mfallback = register.registerIcon("miscutils" + ":" + "itemAmulet"); + this.mfallback = register.registerIcon(GTPlusPlus.ID + ":" + "itemAmulet"); // you cannot initialize iconArray when declared nor in the constructor, // as it is client-side only, so do it here: - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { iconArray[0] = register.registerIcon("thaumcraft" + ":" + "bauble_amulet"); iconArray[1] = register.registerIcon("thaumcraft" + ":" + "bauble_ring"); iconArray[2] = register.registerIcon("thaumcraft" + ":" + "bauble_belt"); } else { - iconArray[0] = register.registerIcon("miscutils" + ":" + "itemAmulet"); - iconArray[1] = register.registerIcon("miscutils" + ":" + "itemRingWearable"); - iconArray[2] = register.registerIcon("miscutils" + ":" + "itemBelt"); + iconArray[0] = register.registerIcon(GTPlusPlus.ID + ":" + "itemAmulet"); + iconArray[1] = register.registerIcon(GTPlusPlus.ID + ":" + "itemRingWearable"); + iconArray[2] = register.registerIcon(GTPlusPlus.ID + ":" + "itemBelt"); } mTextureAmulet = iconArray[0]; diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index ca0adc9676..effb10268a 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -19,7 +23,6 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; @@ -281,8 +284,8 @@ public class AgriculturalChem extends ItemPackage { public AgriculturalChem() { super(); - aBOP = LoadedMods.BiomesOPlenty; - aTiCon = LoadedMods.TiCon; + aBOP = BiomesOPlenty.isModLoaded(); + aTiCon = TinkerConstruct.isModLoaded(); Logger.INFO("Adding Agrochemical content"); @@ -527,7 +530,7 @@ public class AgriculturalChem extends ItemPackage { /** * Forestry Support */ - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { Field aItemField = ReflectionUtils .getField(ReflectionUtils.getClass("forestry.plugins.PluginCore"), "items"); try { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index ff49e11645..01c4f068d2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -3,16 +3,27 @@ package gtPlusPlus.core.item.chemistry; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.*; - -import gregtech.api.enums.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TextureSet; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index 78fe9aa9e2..db495f3955 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.HashMap; import java.util.List; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import gregtech.api.enums.Materials; import gtPlusPlus.core.item.base.misc.BaseItemParticle; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.Utils; @@ -139,9 +140,9 @@ public class IonParticles extends BaseItemParticle { @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < IonParticles.overlays.length; i++) { - IonParticles.overlays[i] = reg.registerIcon(CORE.MODID + ":" + "ion/" + i); + IonParticles.overlays[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/" + i); } - IonParticles.baseTexture = reg.registerIcon(CORE.MODID + ":" + "ion/IonBase"); + IonParticles.baseTexture = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/IonBase"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 55bd54a3a1..b3b40f339c 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Forestry; + import java.util.HashMap; import net.minecraft.item.Item; @@ -17,12 +20,14 @@ import gtPlusPlus.api.objects.data.Quad; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.base.ore.BaseItemMilledOre; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; @@ -558,13 +563,13 @@ public class MilledOreProcessing extends ItemPackage { aSaplings.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine)); aPinecones.add(ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, 1)); - if (LoadedMods.BiomesOPlenty) { + if (BiomesOPlenty.isModLoaded()) { aLogs.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.logs4, 0, 1)); aLeaves.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedLeaves2, 1, 1)); aSaplings.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedSaplings, 5, 1)); aPinecones.add(ItemUtils.simpleMetaStack(HANDLER_BiomesOPlenty.mPineCone, 13, 1)); } - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { ItemStack aForestryLog = ItemUtils.getItemStackFromFQRN("Forestry:logs", 1); if (aForestryLog != null) { aForestryLog.setItemDamage(20); // Set to Pine diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index f67b37d9b9..9212c995e2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.HashMap; import java.util.List; @@ -12,7 +14,6 @@ import net.minecraft.util.IIcon; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.misc.BaseItemParticle; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.material.Particle.ElementaryGroup; import gtPlusPlus.core.util.Utils; @@ -137,7 +138,7 @@ public class StandardBaseParticles extends BaseItemParticle { @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < this.icons.length; i++) { - this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/new/" + i); + this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "particle/new/" + i); } } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 76d66f9e41..0430b5fd3e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +19,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemGenericChemBase extends Item { @@ -131,7 +132,7 @@ public class ItemGenericChemBase extends Item { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < this.aMetaSize; i++) { - String aPath = CORE.MODID + ":" + "science/general/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "science/general/MetaItem1/" + i; this.base[i] = u.registerIcon(aPath); } } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java index 07ca7e02a7..e176dc603a 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemNuclearChemBase extends Item { @@ -112,7 +113,7 @@ public class ItemNuclearChemBase extends Item { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < this.aMetaSize; i++) { - String aPath = CORE.MODID + ":" + "science/nuclear/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "science/nuclear/MetaItem1/" + i; this.base[i] = u.registerIcon(aPath); } } diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java index 3c70981ff5..9db4d7b97c 100644 --- a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java +++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.circuit; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -35,7 +37,6 @@ import gregtech.api.objects.XSTR; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem { @@ -110,7 +111,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab @Override public void registerIcons(final IIconRegister u) { - this.base = u.registerIcon(CORE.MODID + ":" + iconLocation); + this.base = u.registerIcon(GTPlusPlus.ID + ":" + iconLocation); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java index 13da48410a..cce12371b0 100644 --- a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java +++ b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.crafting; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.LinkedHashMap; import java.util.Map; @@ -12,7 +14,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.general.ItemGenericToken; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -85,7 +86,7 @@ public class ItemDummyResearch extends ItemGenericToken { @SideOnly(Side.CLIENT) public final void registerIcons(final IIconRegister aIconRegister) { for (int i = 0, j = mLocalNames.size(); i < j; i++) { - mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + "research" + "/" + "note")); + mIcons.put(i, aIconRegister.registerIcon(GTPlusPlus.ID + ":" + "research" + "/" + "note")); } } } diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index fa27b760ac..e67ff32d85 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.food; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,7 +23,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -367,7 +368,7 @@ public class BaseItemMetaFood extends ItemFood { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < mTotalMetaItems; i++) { - String aPath = CORE.MODID + ":" + "food/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "food/MetaItem1/" + i; mIconMap.put(i, u.registerIcon(aPath)); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java index 8c5530f242..1ed6e1d32c 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java +++ b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +18,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.lib.CORE; public class BaseItemGrindle extends Item { @@ -25,7 +26,7 @@ public class BaseItemGrindle extends Item { public BaseItemGrindle() { this.unlocalName = "itemGrindleTablet"; this.setUnlocalizedName("itemGrindleTablet"); - this.setTextureName(CORE.MODID + ":" + "itemTablet"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemTablet"); GameRegistry.registerItem(this, "itemGrindleTablet"); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabOther); @@ -49,7 +50,7 @@ public class BaseItemGrindle extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemTablet"); + this.itemIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "itemTablet"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java index d23c825131..099347eb76 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java +++ b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -11,7 +13,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BedLocator_Base extends Item { @@ -21,7 +22,7 @@ public class BedLocator_Base extends Item { public BedLocator_Base(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); } diff --git a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java index 9648801b25..653b7bdcb6 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +12,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -20,7 +21,7 @@ public class BufferCore extends BaseItemWithDamageValue { public BufferCore(final String unlocalizedName, final int i) { super(unlocalizedName + i); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(32); this.coreTier = i; } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java index ddd88f7169..7989187a7e 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class ItemAirFilter extends Item { @@ -32,7 +33,7 @@ public class ItemAirFilter extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemAirFilter"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemAirFilter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java index 573325ddd7..3db9672630 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,7 +24,6 @@ import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -45,7 +46,7 @@ public class ItemAreaClear extends CoreItem { @Override public void registerIcons(IIconRegister reg) { - this.mIcon[0] = reg.registerIcon(CORE.MODID + ":" + "itemLavaFilter"); + this.mIcon[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemLavaFilter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java index 435195c105..d473723bf8 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -9,7 +11,6 @@ import net.minecraft.world.World; import gtPlusPlus.core.block.general.FirePit; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -17,7 +18,7 @@ public class ItemBasicFirestarter extends CoreItem { public ItemBasicFirestarter() { super("itemSimpleFiremaker", AddToCreativeTab.tabTools, 1, 5, "Can probably make you a fire"); - this.setTextureName(CORE.MODID + ":" + "itemFireStarter"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemFireStarter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java index 6ffd22e6b8..ee1afdb6bf 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class ItemBasicScrubberTurbine extends Item { @@ -32,7 +33,7 @@ public class ItemBasicScrubberTurbine extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemBasicTurbine"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemBasicTurbine"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java index e918e4d917..9407f5c5ad 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -17,7 +19,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.interfaces.IItemBlueprint; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -26,7 +27,7 @@ public class ItemBlueprint extends Item implements IItemBlueprint { public ItemBlueprint(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); // this.bpID = MathUtils.randInt(0, 1000); diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java index 6843cedd46..e0949f830a 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Names; + import java.util.List; import net.minecraft.entity.Entity; @@ -17,7 +20,6 @@ import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import ic2.api.item.ElectricItem; @@ -25,8 +27,8 @@ import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Names.BAUBLES) }) public class ItemCloakingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble { private final String unlocalizedName = "personalCloakingDevice"; @@ -39,7 +41,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice"); + this.setTextureName(GTPlusPlus.ID + ":" + "personalCloakingDevice"); this.thisStack = ItemUtils.getSimpleStack(this); this.charge(this.thisStack, charge, 3, true, false); if (charge == (10000 * 20 * 500)) { diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java index 3ce0490468..0618d451fe 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,7 +16,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; -import gtPlusPlus.core.lib.CORE; public class ItemControlCore extends Item { @@ -32,16 +33,16 @@ public class ItemControlCore extends Item { @Override public void registerIcons(IIconRegister reg) { - icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0"); - icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1"); - icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2"); - icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3"); - icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4"); - icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5"); - icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6"); - icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7"); - icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8"); - icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9"); + icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_0"); + icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_1"); + icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_2"); + icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_3"); + icons[4] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_4"); + icons[5] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_5"); + icons[6] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_6"); + icons[7] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_7"); + icons[8] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_8"); + icons[9] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_9"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java index 19adddfd42..6decd29b06 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,7 +12,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; -import gtPlusPlus.core.lib.CORE; public class ItemCreativeTab extends Item { @@ -27,16 +28,16 @@ public class ItemCreativeTab extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0"); - this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1"); - this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2"); - this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3"); - this.icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4"); - this.icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5"); - this.icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6"); - this.icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7"); - this.icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8"); - this.icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_3"); + this.icons[4] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_4"); + this.icons[5] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_5"); + this.icons[6] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_6"); + this.icons[7] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_7"); + this.icons[8] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_8"); + this.icons[9] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_9"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index 3fc1cccb23..c48a54bc67 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.HashMap; import java.util.List; @@ -17,7 +19,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemGenericToken extends CoreItem { @@ -186,7 +187,7 @@ public class ItemGenericToken extends CoreItem { @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister aIconRegister) { for (int i = 0, j = mLocalNames.size(); i < j; i++) { - mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + mTextureDir + "/" + i)); + mIcons.put(i, aIconRegister.registerIcon(GTPlusPlus.ID + ":" + mTextureDir + "/" + i)); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java index 6876edf840..e7c38d043d 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gtPlusPlus.core.lib.CORE.RANDOM; import java.util.List; @@ -49,7 +50,7 @@ public class ItemGiantEgg extends BaseItemTickable { private ItemGiantEgg(int colour, int maxTicks, String[] desc1) { super(true, false, "itemBigEgg", colour, maxTicks, desc1); - setTextureName(CORE.MODID + ":itemBigEgg"); + setTextureName(GTPlusPlus.ID + ":itemBigEgg"); this.setMaxStackSize(1); registerFuel(5000); registerOrdictionary("fuelLargeChickenEgg"); @@ -95,7 +96,7 @@ public class ItemGiantEgg extends BaseItemTickable { @Override public void registerIcons(final IIconRegister i) { - this.mIcon[0] = i.registerIcon(CORE.MODID + ":" + "itemBigEgg"); + this.mIcon[0] = i.registerIcon(GTPlusPlus.ID + ":" + "itemBigEgg"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java index c4f90247c2..9467730cce 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -8,7 +10,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.FoodStats; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import baubles.api.BaubleType; @@ -16,19 +20,21 @@ import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; -import ic2.api.item.*; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public class ItemHealingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble { private final String unlocalizedName = "personalHealingDevice"; @@ -39,7 +45,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice"); + this.setTextureName(GTPlusPlus.ID + ":" + "personalCloakingDevice"); GameRegistry.registerItem(this, this.unlocalizedName); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java index 931e464dd2..e760039d68 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,7 +16,6 @@ import net.minecraft.util.StatCollector; import gregtech.api.enums.ItemList; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemLavaFilter extends CoreItem { @@ -41,7 +42,7 @@ public class ItemLavaFilter extends CoreItem { @Override public void registerIcons(IIconRegister reg) { - this.mIcon[0] = reg.registerIcon(CORE.MODID + ":" + "itemLavaFilter"); + this.mIcon[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemLavaFilter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java index e9a971b16e..9889bdbd06 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java @@ -1,11 +1,19 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.ref.WeakReference; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.WeakHashMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.world.World; @@ -22,7 +30,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemMagicFeather extends CoreItem { @@ -42,7 +49,7 @@ public class ItemMagicFeather extends CoreItem { false, null); setMaxStackSize(1); - setUnlocalizedName(CORE.MODID + ":" + NAME); + setUnlocalizedName(GTPlusPlus.ID + ":" + NAME); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java index c26cbdac71..a182c4bdb9 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -14,15 +16,15 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Mods; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.events.CustomMovementHandler; import gtPlusPlus.core.handler.events.SneakManager; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public class ItemSlowBuildingRing extends Item implements IBauble { private final String unlocalizedName = "SlowBuildingRing"; @@ -32,7 +34,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble { this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "itemSlowBuildersRing"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemSlowBuildersRing"); ItemUtils.getSimpleStack(this); GameRegistry.registerItem(this, this.unlocalizedName); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java index b6b5d24d3c..3dd1abe58f 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.item.EnumRarity; import net.minecraft.util.EnumChatFormatting; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemSunnariumBit extends CoreItem { @@ -21,6 +22,6 @@ public class ItemSunnariumBit extends CoreItem { EnumChatFormatting.GOLD, false, null); - this.setTextureName(CORE.MODID + ":" + "itemSunnariumBit"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemSunnariumBit"); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java index ec1f98a8f3..671a1ec344 100644 --- a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java +++ b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.Minecraft; @@ -38,12 +40,10 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, public RF2EU_Battery() { super(maxValueRF); GameRegistry.registerFuelHandler(this); - // this.setMaxDamage(Integer.MAX_VALUE); - // this.setDamage(UtilsItems.getSimpleStack(this), 0); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "itemIngot"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemIngot"); this.thisStack = ItemUtils.getSimpleStack(this); GameRegistry.registerItem(this, this.unlocalizedName); } diff --git a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java index 7ed538faa0..9e642c41a7 100644 --- a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java +++ b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.general.books; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gtPlusPlus.core.handler.BookHandler.mBookMap; import static gtPlusPlus.core.util.Utils.addBookTitleLocalization; @@ -22,7 +23,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.BookHandler; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -32,7 +32,7 @@ public class ItemBaseBook extends ItemWritableBook { public ItemBaseBook() { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "itemBook"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemBook"); this.setUnlocalizedName("itembookgt"); GameRegistry.registerItem(this, "bookGT"); } diff --git a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java index 014e6ed5c0..38e34a9a01 100644 --- a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java +++ b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java @@ -1,9 +1,14 @@ package gtPlusPlus.core.item.general.capture; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.UUID; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,7 +22,6 @@ import gtPlusPlus.api.interfaces.IEntityCatcher; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -31,7 +35,7 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher { // Probably won't ever need this event handler. // Utils.registerEvent(this); this.setUnlocalizedName("itemDragonJar"); - this.setTextureName(CORE.MODID + ":" + getUnlocalizedName()); + this.setTextureName(GTPlusPlus.ID + ":" + getUnlocalizedName()); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setMaxStackSize(16); this.setMaxDamage(0); diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java index 565d6dd632..8efcfe6912 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.chassis; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,7 +13,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class ItemBoilerChassis extends Item { @@ -29,7 +30,7 @@ public class ItemBoilerChassis extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemBoilerChassis"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemBoilerChassis"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java index 0bd1e1d2e0..86f92f4572 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.chassis; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +14,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class ItemDehydratorCoil extends Item { @@ -29,10 +30,10 @@ public class ItemDehydratorCoil extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_0"); - this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_1"); - this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_2"); - this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_3"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_3"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java index 59d7b7e8e8..3f7de078ca 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.chassis; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +14,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class ItemDehydratorCoilWire extends Item { @@ -29,10 +30,10 @@ public class ItemDehydratorCoilWire extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_0"); - this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_1"); - this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_2"); - this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_3"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_3"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java index 687e697028..ff0b923ca4 100644 --- a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java +++ b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.fuelrods; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -11,7 +13,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class FuelRod_Base extends Item { @@ -23,7 +24,7 @@ public class FuelRod_Base extends Item { public FuelRod_Base(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(maxFuel); this.maximumFuel = maxFuel; diff --git a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java index 8daf1fc8c7..1b287cbfb0 100644 --- a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.spawn; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -8,17 +10,27 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.util.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemMonsterPlacer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Facing; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemCustomSpawnEgg extends ItemMonsterPlacer { @@ -248,8 +260,8 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { @Override public void registerIcons(final IIconRegister u) { - mIconMap.put(0, u.registerIcon(CORE.MODID + ":" + "spawn_egg")); - mIconMap.put(1, u.registerIcon(CORE.MODID + ":" + "spawn_egg_overlay")); + mIconMap.put(0, u.registerIcon(GTPlusPlus.ID + ":" + "spawn_egg")); + mIconMap.put(1, u.registerIcon(GTPlusPlus.ID + ":" + "spawn_egg_overlay")); } @Override @@ -279,6 +291,6 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { public static void setEntityToSpawnName(int aMetaID, String parEntityToSpawnName) { mEntityNameMap.put(aMetaID, parEntityToSpawnName); - mEntityFullNameMap.put(aMetaID, CORE.MODID + "." + parEntityToSpawnName); + mEntityFullNameMap.put(aMetaID, GTPlusPlus.ID + "." + parEntityToSpawnName); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java index 62e0a6aa17..475707e950 100644 --- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java +++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.throwables; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,7 +22,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.projectile.EntityThrowableBomb; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; @@ -93,8 +94,8 @@ public class ItemThrowableBomb extends CoreItem { @Override public void registerIcons(IIconRegister reg) { - icons[0] = reg.registerIcon(CORE.MODID + ":" + "bomb"); - icons[1] = reg.registerIcon(CORE.MODID + ":" + "bomb_lit"); + icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "bomb"); + icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "bomb_lit"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java index 1eefb4c4ab..aa44b467ce 100644 --- a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java +++ b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.init; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityOcelot; @@ -14,7 +16,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.foods.BaseItemFood; import gtPlusPlus.core.item.base.foods.BaseItemHotFood; import gtPlusPlus.core.item.food.BaseItemMetaFood; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -37,7 +38,7 @@ public class ItemsFoods { new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible(); GT_OreDictUnificator.registerOre( "foodRaisinBread", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemIngotRaisinBread", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemIngotRaisinBread", 1)); // Hot Raisin Bread ModItems.itemHotIngotRaisinBread = new BaseItemHotFood( "itemHotIngotRaisinBread", @@ -48,13 +49,14 @@ public class ItemsFoods { ModItems.itemIngotRaisinBread); GT_OreDictUnificator.registerOre( "foodHotRaisinBread", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotIngotRaisinBread", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemHotIngotRaisinBread", 1)); // Raisin Bread ModItems.itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false) .setAlwaysEdible(); - GT_OreDictUnificator - .registerOre("foodRaisinToast", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodRaisinToast", 1)); + GT_OreDictUnificator.registerOre( + "foodRaisinToast", + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemFoodRaisinToast", 1)); // Hot Raisin Bread ModItems.itemHotFoodRaisinToast = new BaseItemHotFood( "itemHotFoodRaisinToast", @@ -65,7 +67,7 @@ public class ItemsFoods { ModItems.itemFoodRaisinToast); GT_OreDictUnificator.registerOre( "foodHotRaisinToast", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotFoodRaisinToast", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemHotFoodRaisinToast", 1)); // Raisin Bread ModItems.itemFoodCurriedSausages = new BaseItemFood( @@ -76,7 +78,7 @@ public class ItemsFoods { false); GT_OreDictUnificator.registerOre( "foodCurriedSausages", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodCurriedSausages", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemFoodCurriedSausages", 1)); // Hot Raisin Bread ModItems.itemHotFoodCurriedSausages = new BaseItemHotFood( "itemHotFoodCurriedSausages", @@ -87,7 +89,7 @@ public class ItemsFoods { ModItems.itemFoodCurriedSausages); GT_OreDictUnificator.registerOre( "foodHotCurriedSausages", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotFoodCurriedSausages", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemHotFoodCurriedSausages", 1)); ModItems.itemMetaFood = new BaseItemMetaFood(); BaseItemMetaFood.registerFoodsToOreDict(); diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java index 4644fdc8d2..638a43ecb5 100644 --- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.materials; +import static gregtech.api.enums.Mods.GregTech; import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack; import java.util.List; @@ -33,9 +34,9 @@ public class DustDecayable extends BaseItemTickable { @Override public void registerIcons(IIconRegister reg) { - String gt = "gregtech" + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust"; + String gt = GregTech.ID + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust"; this.mIcon[0] = reg.registerIcon(gt); - String gt2 = "gregtech" + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust" + "_OVERLAY"; + String gt2 = GregTech.ID + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust" + "_OVERLAY"; this.mIcon[1] = reg.registerIcon(gt2); } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java index c0ccd66fae..f563d532a0 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -11,7 +13,6 @@ import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.PlayerUtils; public class DebugScanner extends CoreItem { @@ -24,7 +25,7 @@ public class DebugScanner extends CoreItem { 0, new String[] { "Used to obtain information from GT/GT++ content", "Right Click to use", }, EnumRarity.epic); - setTextureName(CORE.MODID + ":itemStickyRubber"); + setTextureName(GTPlusPlus.ID + ":itemStickyRubber"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java index be0b4d43e1..3c7a131a1e 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc; +import static gregtech.api.enums.Mods.GregTech; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,23 +32,23 @@ public class FakeGregtechTool extends CoreItem { @Override public void registerIcons(final IIconRegister i) { // ScrewDriver - this.base[0] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadScrewdriver"); - this.overlay[0] = i.registerIcon("gregtech" + ":" + "iconsets/" + "HANDLE_SCREWDRIVER"); + this.base[0] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadScrewdriver"); + this.overlay[0] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SCREWDRIVER"); // Soldering iron - this.base[1] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadSoldering"); - this.overlay[1] = i.registerIcon("gregtech" + ":" + "iconsets/" + "HANDLE_SOLDERING"); + this.base[1] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadSoldering"); + this.overlay[1] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SOLDERING"); // Mallet - this.base[2] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "handleMallet"); - this.overlay[2] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadMallet"); + this.base[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "handleMallet"); + this.overlay[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadMallet"); // Hammer - this.base[3] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "stick"); - this.overlay[3] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadHammer"); + this.base[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "stick"); + this.overlay[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadHammer"); // Wrench - this.base[4] = i.registerIcon("gregtech" + ":" + "iconsets/" + "WRENCH"); - this.overlay[4] = i.registerIcon("gregtech" + ":" + "iconsets/" + "WRENCH_OVERLAY"); + this.base[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH"); + this.overlay[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH_OVERLAY"); // Crowbar - this.base[5] = i.registerIcon("gregtech" + ":" + "iconsets/" + "CROWBAR"); - this.overlay[5] = i.registerIcon("gregtech" + ":" + "iconsets/" + "CROWBAR_OVERLAY"); + this.base[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR"); + this.overlay[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR_OVERLAY"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index 9fb570d86c..a8a279299b 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.item.tool.misc; import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; import java.util.BitSet; @@ -52,7 +53,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -134,7 +134,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri this.setUnlocalizedName(unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(1); - if (GameRegistry.findItem(CORE.MODID, unlocalizedName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, unlocalizedName) == null) { GameRegistry.registerItem(this, unlocalizedName); } } @@ -531,7 +531,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (this.mEnabledItems.get(i)) { mIconMap.put( (int) i, - aIconRegister.registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i))); + aIconRegister.registerIcon(GTPlusPlus.ID + ":" + (this.getUnlocalizedName() + "/" + i))); } } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java index bb9cdb595c..044519028d 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +12,6 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; -import gtPlusPlus.core.lib.CORE; public class SandstoneHammer extends BaseItemWithDamageValue { @@ -27,7 +28,7 @@ public class SandstoneHammer extends BaseItemWithDamageValue { public SandstoneHammer(final String unlocalizedName) { super(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(2500); } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java index e8988c62ac..2679441d76 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc.box; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -12,7 +14,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BaseBoxItem extends CoreItem { @@ -69,6 +70,6 @@ public class BaseBoxItem extends CoreItem { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName().substring(5)); + this.itemIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName().substring(5)); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 30ab292c5f..8df0ca1e55 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Minecraft; + import java.util.List; import net.minecraft.block.Block; @@ -17,7 +20,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -48,8 +50,8 @@ public class MultiPickaxeBase extends StaballoyPickaxe { final int colour, final Object enchant) { super(Utils.sanitizeString(unlocalizedName), material); this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName)); - // this.setTextureName(CORE.MODID + ":" + "itemPickaxe"); - this.setTextureName("minecraft" + ":" + "iron_pickaxe"); + // this.setTextureName(GTPlusPlus.ID + ":" + "itemPickaxe"); + this.setTextureName(Minecraft.ID + ":" + "iron_pickaxe"); this.setMaxStackSize(1); if ((materialDurability * 3) <= Integer.MAX_VALUE) { this.setMaxDamage((int) (materialDurability * 3)); @@ -77,7 +79,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe { this.isValid = this.addRecipe(); } catch (final Throwable e) {} if ((colour != 0) && this.isValid && (materialDurability > 10000)) { - if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, Utils.sanitizeString(unlocalizedName)) == null) { GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index c0d7f08bea..6dd6973749 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -7,7 +10,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -36,8 +38,8 @@ public class MultiSpadeBase extends StaballoySpade { final int colour) { super(Utils.sanitizeString(unlocalizedName), material); this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName)); - // this.setTextureName(CORE.MODID + ":" + "itemShovel"); - this.setTextureName("minecraft" + ":" + "iron_shovel"); + // this.setTextureName(GTPlusPlus.ID + ":" + "itemShovel"); + this.setTextureName(Minecraft.ID + ":" + "iron_shovel"); this.setMaxStackSize(1); this.setMaxDamage(materialDurability * 3); this.colour = colour; @@ -48,7 +50,7 @@ public class MultiSpadeBase extends StaballoySpade { this.isValid = this.addRecipe(); } catch (final Throwable e) {} if ((colour != 0) && this.isValid) { - if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, Utils.sanitizeString(unlocalizedName)) == null) { GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java index c146dba547..7ec3be72ca 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java @@ -1,8 +1,25 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockAir; +import net.minecraft.block.BlockCocoa; +import net.minecraft.block.BlockDirt; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockGrass; +import net.minecraft.block.BlockHugeMushroom; +import net.minecraft.block.BlockLeavesBase; +import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockMushroom; +import net.minecraft.block.BlockSand; +import net.minecraft.block.BlockSnow; +import net.minecraft.block.BlockSnowBlock; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.BlockVine; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -15,7 +32,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.CORE; public class StaballoyAxe extends ItemAxe { @@ -24,7 +40,7 @@ public class StaballoyAxe extends ItemAxe { public StaballoyAxe(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); } // EXPLODE TREE diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index d9c4aaa18b..4fa76cc288 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.Block; @@ -18,7 +20,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.MiningUtils; public class StaballoyPickaxe extends ItemPickaxe { @@ -449,7 +450,7 @@ public class StaballoyPickaxe extends ItemPickaxe { public StaballoyPickaxe(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(3200); this.miningLevel = 5; diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java index 0fb3291f8f..3be95912fe 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.Block; @@ -18,7 +20,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.MiningUtils; public class StaballoySpade extends ItemSpade { @@ -396,7 +397,7 @@ public class StaballoySpade extends ItemSpade { public StaballoySpade(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(3200); } diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java index d26cdedf4b..8caf65c88d 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.item.wearable.armour; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.item.Item; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat; -import gtPlusPlus.core.lib.CORE; public class ArmourLoader { @@ -28,13 +29,10 @@ public class ArmourLoader { tinfoilArmour(); } - private static void glassArmour() { - // RenderingRegistry.addNewArmourRendererPrefix("ClearGlassArmor"); This needs to be client side only TODO - // ClearGlassHelmet = new ClearGlassArmor(2055, ClearGlassArmor, 5, 0).setUnlocalizedName("amethyst_helmet"); - } + private static void glassArmour() {} private static void tinfoilArmour() { TinFoilHat = new ArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil"); - GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", CORE.MODID); + GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", GTPlusPlus.ID); } } diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java index 47c71a34a3..6a9cb7c3dc 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.wearable.armour.hazmat; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +19,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.wearable.armour.ArmourLoader; import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; -import gtPlusPlus.core.lib.CORE; public class ArmourHazmat extends BaseArmourHelm { @@ -29,7 +30,7 @@ public class ArmourHazmat extends BaseArmourHelm { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { - this.iconHelm = ir.registerIcon(CORE.MODID + ":itemHatTinFoil"); + this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil"); } @Override @@ -43,7 +44,7 @@ public class ArmourHazmat extends BaseArmourHelm { } public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return CORE.MODID + ":textures/models/TinFoil.png"; + return GTPlusPlus.ID + ":textures/models/TinFoil.png"; } public EnumRarity getRarity(ItemStack itemstack) { diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java index ad3272bccf..e703efebc2 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.wearable.armour.tinfoil; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,7 +31,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.item.wearable.armour.ArmourLoader; import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; -import gtPlusPlus.core.lib.CORE; public class ArmourTinFoilHat extends BaseArmourHelm { @@ -41,7 +42,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { - this.iconHelm = ir.registerIcon(CORE.MODID + ":itemHatTinFoil"); + this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil"); } @Override @@ -55,7 +56,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm { } public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return CORE.MODID + ":textures/models/TinFoil.png"; + return GTPlusPlus.ID + ":textures/models/TinFoil.png"; } public EnumRarity getRarity(ItemStack itemstack) { diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index e06a962545..918c767a8c 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -1,6 +1,14 @@ package gtPlusPlus.core.lib; -import java.util.*; +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.UUID; +import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; @@ -15,6 +23,7 @@ import net.minecraftforge.common.util.FakePlayerFactory; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.FMLCommonHandler; +import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.random.XSTR; @@ -40,7 +49,6 @@ public class CORE { // Mod Variables public static final String name = "GT++"; - public static final String MODID = "miscutils"; public static final String VERSION = "GRADLETOKEN_VERSION"; // Tweakables @@ -62,9 +70,6 @@ public class CORE { .translateToLocal("GTPP.core.GT_Tooltip_Radioactive"); public static final String noItem = ""; - // Because I want to be lazy. Beyond Reality Classic Var. - public static boolean BRC = false; - public static final String SEPERATOR = "/"; /** @@ -94,10 +99,11 @@ public class CORE { public static final String TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/", TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/", TEX_DIR_ASPECTS = TEX_DIR + "aspects/", TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/", - RES_PATH = MODID + ":" + TEX_DIR, RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI, - RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM, RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK, - RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY, RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS, - RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS; + RES_PATH = GTPlusPlus.ID + ":" + TEX_DIR, RES_PATH_GUI = GTPlusPlus.ID + ":" + TEX_DIR_GUI, + RES_PATH_ITEM = GTPlusPlus.ID + ":" + TEX_DIR_ITEM, RES_PATH_BLOCK = GTPlusPlus.ID + ":" + TEX_DIR_BLOCK, + RES_PATH_ENTITY = GTPlusPlus.ID + ":" + TEX_DIR_ENTITY, + RES_PATH_ASPECTS = GTPlusPlus.ID + ":" + TEX_DIR_ASPECTS, + RES_PATH_FLUIDS = GTPlusPlus.ID + ":" + TEX_DIR_FLUIDS; /** * Used to create a {@link EntityPlayer} instance from {@link FakePlayerFactory}. If this instance already exists in @@ -154,7 +160,6 @@ public class CORE { // GT Fixes public static boolean enableSulfuricAcidFix = false; - public static boolean enableHarderRecipesForHighTierCasings = true; // Single Block Machines public static boolean enableMachine_SolarGenerators = false; @@ -265,7 +270,8 @@ public class CORE { public static class Everglades { - public static final String MODID = "ToxicEverglades"; + @Deprecated + public static final String MODID = Mods.Names.G_T_PLUS_PLUS_EVERGLADES; public static final String NAME = "GT++ Toxic Everglades"; public static final String VERSION = "GRADLETOKEN_VERSION"; } diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java deleted file mode 100644 index 498b69860e..0000000000 --- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java +++ /dev/null @@ -1,365 +0,0 @@ -package gtPlusPlus.core.lib; - -import static gtPlusPlus.core.lib.CORE.*; - -import java.util.HashMap; - -import cpw.mods.fml.common.Loader; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures; -import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder; - -public class LoadedMods { - - // Initialize Variables - public static boolean PlayerAPI = false; - public static boolean BuildCraft = false; - public static boolean EnderIO = false; - public static boolean Big_Reactors = false; - public static boolean IndustrialCraft2Classic = false; - public static boolean Simply_Jetpacks = false; - public static boolean RFTools = false; - public static boolean Thaumcraft = false; - public static boolean ThaumicBases = false; - public static boolean Baubles = false; - public static boolean Extra_Utils = false; - public static boolean PneumaticCraft = false; - public static boolean MorePlanets = false; - public static boolean ForbiddenMagic = false; - public static boolean CompactWindmills = false; - public static boolean Railcraft = false; - public static boolean ImmersiveEngineering = false; - public static boolean Growthcraft = false; - public static boolean CoFHCore = false; - public static boolean Forestry = false; - public static boolean MagicBees = false; - public static boolean ExtraBees = false; - public static boolean Psychedelicraft = false; - public static boolean ThermalFoundation = false; - public static boolean IHL = false; - public static boolean AdvancedSolarPanel = false; - public static boolean OpenComputers = false; // OpenComputers - public static boolean OpenBlocks = false; - public static boolean Computronics = false; // computronics - public static boolean DreamCraft = false; // GT: New Horizons - public static boolean BeyondRealityCore = false; // Beyond Reality - Probably Classic - public static boolean BiomesOPlenty = false; - public static boolean PamsHarvestcraft = false; - public static boolean GalacticraftCore = false; - public static boolean Mekanism = false; - public static boolean RedTech = false; // RedMage's Mod - public static boolean TecTech = false; // Technus' Mod - public static boolean KekzTech = false; // KekzDealers' Mod - public static boolean TiCon = false; - public static boolean StevesCarts = false; - public static boolean Witchery = false; - public static boolean Waila = false; - public static boolean CropsPlusPlus = false; // Barts Crop Mod - public static boolean Reliquary = false; - public static boolean SpiceOfLife = false; - public static boolean RemoteIO = false; - public static boolean BartWorks = false; - public static boolean GoodGenerator = false; - public static boolean ExtraTrees = false; - - private static int totalMods; - - @SuppressWarnings("deprecation") - public static void checkLoaded() { - Logger.INFO("Looking for optional mod prereqs."); - Logger.INFO("Components enabled for: Gregtech"); - try { - CORE.RA = new GregtechRecipeAdder(); - Logger.INFO("Created Gregtech recipe handler."); - GregtechTextures.BlockIcons.VOID.name(); - GregtechTextures.ItemIcons.VOID.name(); - Logger.INFO("Created Gregtech texture handler."); - } catch (final NullPointerException e) { - Logger.INFO("Could NOT create a Gregtech recipe handler."); - } - - totalMods++; - if (isModLoaded("dreamcraft")) { - DreamCraft = true; - Logger.INFO("Components enabled for: DreamCraft"); - totalMods++; - } - if (isModLoaded("beyondrealitycore")) { - BeyondRealityCore = true; - BRC = true; - Logger.INFO("Components enabled for: Beyond Reality"); - totalMods++; - } - if (isModLoaded("PlayerAPI")) { - PlayerAPI = true; - Logger.INFO("Components enabled for: PlayerAPI"); - totalMods++; - } - if (isModLoaded("berriespp")) { - CropsPlusPlus = true; - Logger.INFO("Components enabled for: Crops++"); - totalMods++; - } - if (isModLoaded("xreliquary")) { - Reliquary = true; - Logger.INFO("Components enabled for: Reliquary"); - totalMods++; - } - if (isModLoaded("TConstruct")) { - TiCon = true; - Logger.INFO("Components enabled for: Tinkers Construct"); - totalMods++; - } - if (isModLoaded("AdvancedSolarPanel")) { - AdvancedSolarPanel = true; - Logger.INFO("Components enabled for: Advanced Solar Panels"); - totalMods++; - } - if (isModLoaded("GoodGenerator")) { - GoodGenerator = true; - Logger.INFO("Components enabled for: GoodGenerator"); - totalMods++; - } - if (isModLoaded("bartworks")) { - BartWorks = true; - Logger.INFO("Components enabled for: BartWorks"); - totalMods++; - } - if (isModLoaded("BuildCraft")) { - BuildCraft = true; - Logger.INFO("Components enabled for: BuildCraft"); - totalMods++; - } - if ((isModLoaded("EnderIO")) && !ConfigSwitches.disableEnderIOIntegration) { - EnderIO = true; - Logger.INFO("Components enabled for: EnderIO"); - totalMods++; - } - if (isModLoaded("BigReactors")) { - Big_Reactors = true; - Logger.INFO("Components enabled for: Big Reactors"); - totalMods++; - } - if (isModLoaded("IC2-Classic-Spmod")) { - IndustrialCraft2Classic = true; - Logger.INFO("Components enabled for: IndustrialCraft2-Classic"); - totalMods++; - } - if (isModLoaded("simplyjetpacks")) { - Simply_Jetpacks = true; - Logger.INFO("Components enabled for: Simply Jetpacks"); - totalMods++; - } - if (isModLoaded("rftools")) { - RFTools = true; - Logger.INFO("Components enabled for: RFTools"); - totalMods++; - } - if (isModLoaded("StevesCarts")) { - StevesCarts = true; - Logger.INFO("Components enabled for: StevesCarts"); - totalMods++; - } - if (isModLoaded("OpenBlocks")) { - OpenBlocks = true; - Logger.INFO("Components enabled for: OpenBlocks"); - totalMods++; - } - if (isModLoaded("Thaumcraft")) { - Thaumcraft = true; - Logger.INFO("Components enabled for: Thaumcraft"); - totalMods++; - } - if (isModLoaded("thaumicbases")) { - ThaumicBases = true; - Logger.INFO("Components enabled for: Thaumic Bases"); - totalMods++; - } - if (isModLoaded("BiomesOPlenty")) { - BiomesOPlenty = true; - Logger.INFO("Components enabled for: BiomesOPlenty"); - totalMods++; - } - if (isModLoaded("ExtraUtilities")) { - Extra_Utils = true; - Logger.INFO("Components enabled for: Extra_Utils"); - totalMods++; - } - if (isModLoaded("harvestcraft")) { - PamsHarvestcraft = true; - Logger.INFO("Components enabled for: PamsHarvestcraft"); - totalMods++; - } - if (isModLoaded("PneumaticCraft")) { - PneumaticCraft = true; - Logger.INFO("Components enabled for: PneumaticCraft"); - totalMods++; - } - if (isModLoaded("MorePlanet")) { - MorePlanets = true; - Logger.INFO("Components enabled for: MorePlanets"); - totalMods++; - } - if (isModLoaded("ForbiddenMagic")) { - ForbiddenMagic = true; - Logger.INFO("Components enabled for: ForbiddenMagic"); - totalMods++; - } - if (isModLoaded("CompactWindmills")) { - CompactWindmills = true; - Logger.INFO("Components enabled for: CompactWindmills"); - totalMods++; - } - if (isModLoaded("Railcraft")) { - Railcraft = true; - Logger.INFO("Components enabled for: Railcraft"); - totalMods++; - } - if (isModLoaded("Waila")) { - Waila = true; - Logger.INFO("Components enabled for: WAILA"); - totalMods++; - } - if (isModLoaded("SpiceOfLife")) { - SpiceOfLife = true; - Logger.INFO("Components enabled for: Spice Of Life"); - totalMods++; - } - if (isModLoaded("Mekanism")) { - Mekanism = true; - Logger.INFO( - "Components enabled for: Mekanism - This feature is not configurable and balances Mekanism to suit GT."); - totalMods++; - } - if (isModLoaded("Growthcraft")) { - Logger.INFO("Growthcraft Version: " + getModVersion("Growthcraft")); - if (getModVersion("Growthcraft").equals("1.7.10-2.3.1")) { - // Load Growthcraft Compat - Growthcraft = true; - Logger.INFO("Components enabled for: Growthcraft"); - totalMods++; - } else { - Growthcraft = false; - Logger.INFO("Growthcraft found, but the version was too new. I will update GC support eventually."); - } - } - if (isModLoaded("CoFHCore")) { - CoFHCore = true; - Logger.INFO("Components enabled for: CoFHCore"); - totalMods++; - } - if (isModLoaded("Forestry")) { - Forestry = true; - Logger.INFO("Components enabled for: Forestry"); - totalMods++; - } - if (isModLoaded("MagicBees")) { - MagicBees = true; - Logger.INFO("Components enabled for: MagicBees"); - totalMods++; - } - if (isModLoaded("psychedelicraft")) { - Psychedelicraft = true; - Logger.INFO("Components enabled for: Psychedelicraft"); - totalMods++; - } - if (isModLoaded("ImmersiveEngineering")) { - ImmersiveEngineering = true; - Logger.INFO("Components enabled for: ImmersiveEngineering"); - totalMods++; - } - if (isModLoaded("ExtraBees")) { - ExtraBees = true; - Logger.INFO("Components enabled for: ExtraBees"); - totalMods++; - } - if (isModLoaded("ThermalFoundation") == false) { - ThermalFoundation = false; - Logger.INFO("Components enabled for: ThermalFoundation - This feature will disable itself if you add TF."); - totalMods++; - } else if (isModLoaded("ThermalFoundation")) { - ThermalFoundation = true; - Logger.INFO( - "Components disabled for: ThermalFoundation - This feature will enable itself if you remove TF."); - // totalMods++; - } - if (isModLoaded("ihl")) { - IHL = true; - Logger.INFO("Components enabled for: IHL"); - totalMods++; - } - if (isModLoaded("Baubles")) { - Baubles = true; - Logger.INFO("Components enabled for: Baubles"); - totalMods++; - } - if (isModLoaded("GalacticraftCore")) { - GalacticraftCore = true; - Logger.INFO("Components enabled for: Galacticraft Core"); - totalMods++; - } - if (isModLoaded("OpenComputers")) { - OpenComputers = true; - Logger.INFO("Components enabled for: OpenComputers"); - totalMods++; - } - if (isModLoaded("computronics")) { - Computronics = true; - Logger.INFO( - "Components disabled for: Computronics - This feature will enable itself if you remove Computronics."); - totalMods++; - } else { - Logger.INFO( - "Components enabled for: Computronics - This feature will disable itself if you add Computronics."); - } - if (isModLoaded("GTRedtech")) { - RedTech = true; - Logger.INFO("Components enabled for: GTRedtech"); - totalMods++; - } - if (isModLoaded("tectech")) { - TecTech = true; - Logger.INFO("Components enabled for: TecTech"); - totalMods++; - } - if (isModLoaded("kekztech")) { - KekzTech = true; - Logger.INFO("Components enabled for: KekzTech"); - totalMods++; - } - if (isModLoaded("witchery")) { - Witchery = true; - Logger.INFO("Components enabled for: Witchery"); - totalMods++; - } - if (isModLoaded("RIO")) { - RemoteIO = true; - Logger.INFO("Components enabled for: RemoteIO"); - totalMods++; - } - if (isModLoaded("ExtraTrees")) { - ExtraTrees = true; - Logger.INFO("Components enabled for: ExtraTrees"); - totalMods++; - } - Logger.INFO("Content found for " + totalMods + " mods"); - } - - public static String getModVersion(final String modName) { - final String ver = cpw.mods.fml.common.FMLCommonHandler.instance().findContainerFor(modName).getVersion(); - return ver; - } - - private static final HashMap<String, Boolean> mLoadedModCache = new HashMap<String, Boolean>(); - - public static boolean isModLoaded(String aModName) { - Boolean aResult = mLoadedModCache.get(aModName); - if (aResult == null) { - boolean aTemp = Loader.isModLoaded(aModName); - mLoadedModCache.put(aModName, aTemp); - aResult = aTemp; - } - return aResult; - } -} diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 0dd0dc99cf..1d926742cb 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.material; import static gregtech.api.enums.GT_Values.M; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt; import java.util.ArrayList; @@ -24,7 +25,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; import gtPlusPlus.core.item.base.cell.BaseItemCell; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -686,7 +686,7 @@ public class Material { this.textureSet = setTextureSet(set, vTier); - if (LoadedMods.TiCon && this.materialState == MaterialState.SOLID) { + if (TinkerConstruct.isModLoaded() && this.materialState == MaterialState.SOLID) { if (this.getProtons() >= 98 || this.getComposites().size() > 1 || this.getMeltingPointC() >= 3600) { this.vTiConHandler = new BaseTinkersMaterial(this); } diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index 95675b7ab3..65c25f9f1f 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.proxy; +import static gregtech.api.enums.Mods.PlayerAPI; + import java.util.ArrayList; import net.minecraft.client.Minecraft; @@ -13,37 +15,61 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Mods; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.client.model.ModelGiantChicken; -import gtPlusPlus.core.client.renderer.*; +import gtPlusPlus.core.client.renderer.CustomItemBlockRenderer; +import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer; +import gtPlusPlus.core.client.renderer.RenderBatKing; +import gtPlusPlus.core.client.renderer.RenderDecayChest; +import gtPlusPlus.core.client.renderer.RenderGiantChicken; +import gtPlusPlus.core.client.renderer.RenderMiningExplosivesPrimed; +import gtPlusPlus.core.client.renderer.RenderPlasmaBolt; +import gtPlusPlus.core.client.renderer.RenderSickBlaze; +import gtPlusPlus.core.client.renderer.RenderStaballoyConstruct; +import gtPlusPlus.core.client.renderer.RenderToxinball; import gtPlusPlus.core.common.CommonProxy; import gtPlusPlus.core.common.compat.COMPAT_PlayerAPI; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; import gtPlusPlus.core.entity.EntityTeslaTowerLightning; -import gtPlusPlus.core.entity.monster.*; -import gtPlusPlus.core.entity.projectile.*; +import gtPlusPlus.core.entity.monster.EntityBatKing; +import gtPlusPlus.core.entity.monster.EntityGiantChickenBase; +import gtPlusPlus.core.entity.monster.EntitySickBlaze; +import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; +import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion; +import gtPlusPlus.core.entity.projectile.EntityLightningAttack; +import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion; +import gtPlusPlus.core.entity.projectile.EntityThrowableBomb; +import gtPlusPlus.core.entity.projectile.EntityToxinballSmall; import gtPlusPlus.core.handler.render.FirepitRender; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import gtPlusPlus.core.util.minecraft.particles.EntityParticleFXMysterious; -import gtPlusPlus.xmod.gregtech.common.render.*; +import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer; +import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer; +import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock; import ic2.core.item.ItemFluidCell; public class ClientProxy extends CommonProxy implements Runnable { @@ -78,14 +104,14 @@ public class ClientProxy extends CommonProxy implements Runnable { // Do this weird things for textures. GTplusplus.loadTextures(); // We boot up the sneak manager. - if (LoadedMods.PlayerAPI) { + if (PlayerAPI.isModLoaded()) { this.init_PlayerAPI_PRE(); } } @Override public void init(final FMLInitializationEvent e) { - if (LoadedMods.PlayerAPI) { + if (PlayerAPI.isModLoaded()) { this.init_PlayerAPI_INIT(); } @@ -176,13 +202,13 @@ public class ClientProxy extends CommonProxy implements Runnable { @Override public void serverStarting(final FMLServerStartingEvent e) {} - @Optional.Method(modid = "PlayerAPI") + @Optional.Method(modid = Mods.Names.PLAYER_API) private void init_PlayerAPI_PRE() { // Register player instance COMPAT_PlayerAPI.clientProxy.initPre(); } - @Optional.Method(modid = "PlayerAPI") + @Optional.Method(modid = Mods.Names.PLAYER_API) private void init_PlayerAPI_INIT() { // Register player instance COMPAT_PlayerAPI.clientProxy.Init(); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index f483d1571c..06a1fb2841 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1,16 +1,23 @@ package gtPlusPlus.core.recipe; -import java.util.ArrayList; +import static gregtech.api.enums.Mods.Backpack; +import static gregtech.api.enums.Mods.Baubles; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.Loader; -import gregtech.api.enums.*; -import gregtech.api.util.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.HotFuel; +import gregtech.api.util.ThermalFuel; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; @@ -21,15 +28,17 @@ import gtPlusPlus.core.item.chemistry.RocketFuels; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.ORES; +import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.EnchantingUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.util.reflect.AddGregtechRecipe; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -41,7 +50,6 @@ public class RECIPES_GREGTECH { } private static void execute() { - cokeOvenRecipes(); electrolyzerRecipes(); assemblerRecipes(); fluidcannerRecipes(); @@ -52,10 +60,8 @@ public class RECIPES_GREGTECH { chemicalReactorRecipes(); dehydratorRecipes(); blastFurnaceRecipes(); - largeChemReactorRecipes(); fusionRecipes(); - fissionFuelRecipes(); autoclaveRecipes(); compressorRecipes(); @@ -65,7 +71,6 @@ public class RECIPES_GREGTECH { benderRecipes(); cyclotronRecipes(); blastSmelterRecipes(); - // advancedMixerRecipes(); sifterRecipes(); electroMagneticSeperatorRecipes(); extruderRecipes(); @@ -79,7 +84,6 @@ public class RECIPES_GREGTECH { chemplantRecipes(); packagerRecipes(); alloySmelterRecipes(); - implosionRecipes(); /** * Special Recipe handlers @@ -430,7 +434,7 @@ public class RECIPES_GREGTECH { (int) MaterialUtils.getVoltageForTier(j)); } - if (LoadedMods.Baubles) { + if (Baubles.isModLoaded()) { // Nano Healer CORE.RA.addAssemblylineRecipe( ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), @@ -898,69 +902,6 @@ public class RECIPES_GREGTECH { 240); } - private static void cokeOvenRecipes() { - Logger.INFO("Loading Recipes for Industrial Coking Oven."); - // Wood to Charcoal - // Try use all woods found - ArrayList<ItemStack> aLogData = OreDictionary.getOres("logWood"); - for (ItemStack stack : aLogData) { - AddGregtechRecipe.addCokeAndPyrolyseRecipes( - ItemUtils.getSimpleStack(stack, 20), - 20, - GT_ModHandler.getSteam(1000), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L), - FluidUtils.getFluidStack("fluid.coalgas", 1440), - 60, - 30); - } - - // Coal to Coke - AddGregtechRecipe.addCokeAndPyrolyseRecipes( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), - 22, - GT_ModHandler.getSteam(1000), - ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10), - FluidUtils.getFluidStack("fluid.coalgas", 2880), - 30, - 120); - - // Coke & Coal - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), - ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6), - GT_ModHandler.getSteam(2000), - FluidUtils.getFluidStack("fluid.coalgas", 5040), - ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14), - 60 * 20, - 240); - } - - private static void matterFabRecipes() { - Logger.INFO("Loading Recipes for Matter Fabricator."); - - try { - - CORE.RA.addMatterFabricatorRecipe( - Materials.UUAmplifier.getFluid(1L), // Fluid - // Input - Materials.UUMatter.getFluid(1L), // Fluid Output - 800, // Time in ticks - 32); // EU - } catch (final NullPointerException e) { - Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - try { - - CORE.RA.addMatterFabricatorRecipe( - null, // Fluid Input - Materials.UUMatter.getFluid(1L), // Fluid Output - 3200, // Time in ticks - 32); // EU - } catch (final NullPointerException e) { - Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - } - private static void dehydratorRecipes() { Logger.INFO("Loading Recipes for Chemical Dehydrator."); @@ -1008,7 +949,7 @@ public class RECIPES_GREGTECH { /* * Try Add custom Recipe for drying leather */ - if (LoadedMods.PamsHarvestcraft && Loader.isModLoaded("Backpack")) { + if (PamsHarvestCraft.isModLoaded() && Backpack.isModLoaded()) { ItemStack aLeather1, aLeather2; aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1); aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1); @@ -1320,7 +1261,7 @@ public class RECIPES_GREGTECH { (int) GT_Values.V[i]); } - if (LoadedMods.Baubles) { + if (Baubles.isModLoaded()) { // Turbine Housing Research Page CORE.RA.addSixSlotAssemblingRecipe( diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index 96c1d940a8..4620895a20 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.recipe; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Thaumcraft; import static gtPlusPlus.core.recipe.common.CI.bitsd; import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack; import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes; @@ -16,11 +18,13 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -99,71 +103,6 @@ public class RECIPES_General { RECIPE_StainlessPlate, OUTPUT_Workbench_Advanced); - // Generates recipes for the Dull shard when TC is not installed. - if (!LoadedMods.Thaumcraft) { - // Dull Shard to Aer - RecipeUtils.addShapedRecipe( - RECIPE_HydrogenDust, - RECIPE_HydrogenDust, - RECIPE_HydrogenDust, - RECIPE_HydrogenDust, - ItemUtils.getSimpleStack(ModItems.shardDull), - RECIPE_HydrogenDust, - RECIPE_HydrogenDust, - RECIPE_HydrogenDust, - RECIPE_HydrogenDust, - ItemUtils.getSimpleStack(ModItems.shardAer)); - // Dull Shard to Ignis - RecipeUtils.addShapedRecipe( - RECIPE_Obsidian, - RECIPE_Obsidian, - RECIPE_Obsidian, - RECIPE_Obsidian, - ItemUtils.getSimpleStack(ModItems.shardDull), - RECIPE_Obsidian, - RECIPE_Obsidian, - RECIPE_Obsidian, - RECIPE_Obsidian, - ItemUtils.getSimpleStack(ModItems.shardIgnis)); - // Dull Shard to Terra - RecipeUtils.addShapedRecipe( - RECIPE_Dirt, - RECIPE_Dirt, - RECIPE_Dirt, - RECIPE_Dirt, - ItemUtils.getSimpleStack(ModItems.shardDull), - RECIPE_Dirt, - RECIPE_Dirt, - RECIPE_Dirt, - RECIPE_Dirt, - ItemUtils.getSimpleStack(ModItems.shardTerra)); - // Dull Shard to Aqua - RecipeUtils.addShapedRecipe( - RECIPE_LapisDust, - RECIPE_LapisDust, - RECIPE_LapisDust, - RECIPE_LapisDust, - ItemUtils.getSimpleStack(ModItems.shardDull), - RECIPE_LapisDust, - RECIPE_LapisDust, - RECIPE_LapisDust, - RECIPE_LapisDust, - ItemUtils.getSimpleStack(ModItems.shardAqua)); - - GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardAer), - ItemUtils.getSimpleStack(ModItems.dustAer, 2)); - GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardIgnis), - ItemUtils.getSimpleStack(ModItems.dustIgnis, 2)); - GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardTerra), - ItemUtils.getSimpleStack(ModItems.dustTerra, 2)); - GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardAqua), - ItemUtils.getSimpleStack(ModItems.dustAqua, 2)); - } - // Rainforest oak Sapling if (RecipeUtils.addShapedRecipe( "stickWood", @@ -504,7 +443,7 @@ public class RECIPES_General { GT_Materials.HastelloyX, GT_Materials.TriniumNaquadahCarbonite, }; for (GT_Materials e : g) { if (e == GT_Materials.Void) { - if (!LoadedMods.Thaumcraft) { + if (!Thaumcraft.isModLoaded()) { continue; } } @@ -517,7 +456,7 @@ public class RECIPES_General { for (Materials e : h) { if (e == Materials.DarkSteel) { - if (!LoadedMods.EnderIO) { + if (!EnderIO.isModLoaded()) { continue; } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index 65c7a1ca56..70620f9749 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -2,7 +2,10 @@ package gtPlusPlus.core.recipe; import net.minecraft.item.ItemStack; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 2b35ba70ab..29a09fc2b4 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.recipe; -import gregtech.api.enums.*; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.RecipeUtils; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 1964777df8..92efee13b4 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,5 +1,14 @@ package gtPlusPlus.core.recipe; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.COFHCore; +import static gregtech.api.enums.Mods.EternalSingularity; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.RemoteIO; +import static gregtech.api.enums.Mods.ZTones; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -12,9 +21,11 @@ import net.minecraftforge.oredict.OreDictionary; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; -import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -25,13 +36,15 @@ import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; @@ -215,7 +228,6 @@ public class RECIPES_Machines { // Misc public static ItemStack INPUT_RCCokeOvenBlock; - public static ItemStack INPUT_IECokeOvenBlock; public static final void loadRecipes() { run(); @@ -668,22 +680,22 @@ public class RECIPES_Machines { GregtechItemList.Large_Plasma_Turbine.get(1), 20 * 60, MaterialUtils.getVoltageForTier(7)); - if (LoadedMods.GoodGenerator) { + if (GoodGenerator.isModLoaded()) { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem("GoodGenerator", "supercriticalFluidTurbineCasing", 1), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 4, 10101), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 8, 10101) }, + GT_ModHandler.getModItem(GoodGenerator.ID, "supercriticalFluidTurbineCasing", 1), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 4, 10101), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 8, 10101) }, FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2), GregtechItemList.Casing_Turbine_SC.get(1), 20 * 5, MaterialUtils.getVoltageForTier(6)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 32016), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 8, 10104), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 16, 10104), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedgearGt", 4, 10104), + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 32016), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 8, 10104), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 16, 10104), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedgearGt", 4, 10104), CI.getCircuit(7, 8) }, FluidRegistry.getFluidStack("molten.hikarium", 144 * 8), GregtechItemList.Large_SCSteam_Turbine.get(1), @@ -986,19 +998,10 @@ public class RECIPES_Machines { IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1); EV_MACHINE_ChemicalBath = ItemList.Machine_EV_ChemicalBath.get(1); if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { - if (LoadedMods.Railcraft) { + if (Railcraft.isModLoaded()) { // Misc INPUT_RCCokeOvenBlock = ItemUtils - .getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); - } - if (LoadedMods.ImmersiveEngineering) { - // Misc - INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta( - LoadedMods.ImmersiveEngineering, - "ImmersiveEngineering:stoneDecoration", - "Coke_Oven_IE", - 1, - 1); + .getItemStackWithMeta(Railcraft.isModLoaded(), "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); } } runModRecipes(); @@ -1199,7 +1202,7 @@ public class RECIPES_Machines { GregtechItemList.Hatch_Output_Bus_Steam.get(1)); // RF Convertor - if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) { + if (COFHCore.isModLoaded() && CORE.ConfigSwitches.enableMachine_RF_Convetor) { RecipeUtils.addShapedGregtechRecipe( CI.getPlate(4, 1), CI.getTieredCircuitOreDictName(5), @@ -1327,7 +1330,7 @@ public class RECIPES_Machines { RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); - if (LoadedMods.Railcraft) { + if (Railcraft.isModLoaded()) { // Industrial Coke Oven RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[7], @@ -1341,20 +1344,6 @@ public class RECIPES_Machines { CI.component_Plate[7], RECIPE_IndustrialCokeOvenController); } - if (LoadedMods.ImmersiveEngineering) { - // Industrial Coke Oven - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - CI.circuitTier4, - CI.component_Plate[8], - CI.machineCasing_EV, - INPUT_IECokeOvenBlock, - CI.machineCasing_EV, - CI.component_Plate[8], - CI.circuitTier4, - CI.component_Plate[8], - RECIPE_IndustrialCokeOvenController); - } // Coke Oven Frame Casing RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[7], @@ -1820,7 +1809,7 @@ public class RECIPES_Machines { (int) GT_Values.VP[11], 16, new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1), - GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1), + GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 }, ItemList.Electric_Pump_UEV.get(4), ItemList.Field_Generator_UEV.get(4), GregtechItemList.Laser_Lens_Special.get(1) }, new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), @@ -2993,8 +2982,8 @@ public class RECIPES_Machines { // Reservoir Hatch GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Hatch_Input_EV.get(1), GT_ModHandler.getModItem("RIO", "tile.machine", 1), - ItemList.Electric_Pump_EV.get(1) }, + new ItemStack[] { ItemList.Hatch_Input_EV.get(1), + GT_ModHandler.getModItem(RemoteIO.ID, "tile.machine", 1), ItemList.Electric_Pump_EV.get(1) }, GT_Values.NF, GregtechItemList.Hatch_Reservoir.get(1), 100, @@ -3446,8 +3435,7 @@ public class RECIPES_Machines { } private static void ztonesCoverRecipes() { - - if (!Loader.isModLoaded("Ztones")) { + if (!ZTones.isModLoaded()) { return; } Class ModBlocksClass = ReflectionUtils.getClass("com.riciJak.Ztones.init.ModBlocks"); diff --git a/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java index edcb3baf3b..8899cff513 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java @@ -5,7 +5,11 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.stats.AchievementList; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; diff --git a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java index 119cd250bf..b3d249aed9 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java @@ -4,7 +4,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.stats.AchievementList; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java index 63a337cbb8..0c90a50b89 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.slots; -import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.*; +import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeList; +import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeListFormChange; import java.util.Iterator; import java.util.Map.Entry; diff --git a/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java index f4741c4800..29ad60fa18 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java @@ -17,13 +17,6 @@ public class SlotToolBox extends SlotGtTool { // Look for Supported custom tool types Class temp; - // IHL Pumps - temp = ReflectionUtils.getClass("ihl.handpump.IHLHandPump"); - if (temp != null) { - mSupportedCustomTools.put(temp); - temp = null; - } - // IC2 Electrics temp = ReflectionUtils.getClass("ic2.api.item.IElectricItem"); if (temp != null) { diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java index 6b89908162..528ae6ef68 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java @@ -1,10 +1,11 @@ package gtPlusPlus.core.tileentities; +import static gregtech.api.enums.Mods.Thaumcraft; + import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight; import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.tileentities.general.TileEntityEggBox; @@ -50,7 +51,7 @@ public class ModTileEntities { GameRegistry.registerTileEntity(TileEntityVolumetricFlaskSetter.class, "TileEntityVolumetricFlaskSetter"); // Mod TEs - if (LoadedMods.Thaumcraft) {} + if (Thaumcraft.isModLoaded()) {} blacklistTilesFromAcceleration(); } diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java index 2f672491f4..48eb2945df 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.tileentities.general; +import static gregtech.api.enums.Mods.PamsHarvestCraft; + import java.util.Random; import net.minecraft.block.Block; @@ -16,7 +18,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.inventories.InventoryFishTrap; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -159,7 +160,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory { } // Junk Loot else if (lootWeight <= 23) { - if (LoadedMods.PamsHarvestcraft) { + if (PamsHarvestCraft.isModLoaded()) { loot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1); } else { loot = ItemUtils.getSimpleStack(Blocks.dirt); diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java index 6cf5507188..6add141015 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java @@ -6,7 +6,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler { diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java index 990fef0652..7b838d0b46 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java @@ -6,7 +6,9 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java index a1fc69a357..54014103cd 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.tileentities.machines; +import static gregtech.api.enums.Mods.Forestry; + import java.util.ArrayList; import java.util.List; @@ -29,7 +31,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BTF_FluidTank; import gtPlusPlus.core.inventories.InventoryPestKiller; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; @@ -55,7 +56,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, static { mEntityMap.put(EntityBat.class); - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { mEntityMap.put(ReflectionUtils.getClass("forestry.lepidopterology.entities.EntityButterfly")); } } diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java index d157fac536..5908941dfc 100644 --- a/src/main/java/gtPlusPlus/core/util/Utils.java +++ b/src/main/java/gtPlusPlus/core/util/Utils.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.util; -import java.awt.Color; -import java.awt.Graphics; +import java.awt.*; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java index 2ad38d1de5..00170d2f16 100644 --- a/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java @@ -1,6 +1,12 @@ package gtPlusPlus.core.util.data; -import java.io.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GTPlusPlusEverglades; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -16,7 +22,7 @@ public class LocaleUtils { public static boolean generateFakeLocaleFile() { for (ModContainer modcontainer : Loader.instance().getModList()) { - if (modcontainer.getModId().toLowerCase().equals("miscutils")) { + if (modcontainer.getModId().toLowerCase().equals(GTPlusPlus.ID)) { String S = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; writeToFile(S); dumpItemsAndBlocksForModContainer(modcontainer); @@ -36,7 +42,7 @@ public class LocaleUtils { Item R = (Item) C; ItemStack IS = ItemUtils.getSimpleStack(R); String modid = ItemUtils.getModId(IS); - if (modid.equals("miscutils") || modid.equals("ToxicEverglades")) { + if (modid.equals(GTPlusPlus.ID) || modid.equals(GTPlusPlusEverglades.ID)) { String S = "[" + modid + "] " + IS.getUnlocalizedName() + ".name="; writeToFile(S); } @@ -55,7 +61,7 @@ public class LocaleUtils { Block R = (Block) B; ItemStack IS = ItemUtils.getSimpleStack(R); String modid = ItemUtils.getModId(IS); - if (modid.equals("miscutils") || modid.equals("ToxicEverglades")) { + if (modid.equals(GTPlusPlus.ID) || modid.equals(GTPlusPlusEverglades.ID)) { String S = "[" + modid + "] " + IS.getUnlocalizedName() + ".name="; writeToFile(S); } diff --git a/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java b/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java index 16c04f2c34..5332c82bf7 100644 --- a/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java @@ -1,6 +1,9 @@ package gtPlusPlus.core.util.data; -import java.io.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import java.util.Date; public class LoggingUtils { diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java index 53159a9412..6e332a2be0 100644 --- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java +++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java @@ -19,7 +19,15 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java index e154a059e2..187839e48a 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java @@ -7,7 +7,11 @@ import java.util.List; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -116,48 +120,6 @@ public class EntityUtils { return false; } - public static boolean isWearingFullFrostHazmat(EntityLivingBase aEntity) { - for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Frost(aEntity.getEquipmentInSlot(i))) { - return false; - } - return true; - } - - public static boolean isWearingFullHeatHazmat(EntityLivingBase aEntity) { - for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Fire(aEntity.getEquipmentInSlot(i))) { - return false; - } - return true; - } - - public static boolean isWearingFullBioHazmat(EntityLivingBase aEntity) { - for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Biohazard(aEntity.getEquipmentInSlot(i))) { - return false; - } - return true; - } - - public static boolean isWearingFullRadioHazmat(EntityLivingBase aEntity) { - for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Radiation(aEntity.getEquipmentInSlot(i))) { - return false; - } - return true; - } - - public static boolean isWearingFullElectroHazmat(EntityLivingBase aEntity) { - for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Electricity(aEntity.getEquipmentInSlot(i))) { - return false; - } - return true; - } - - public static boolean isWearingFullGasHazmat(EntityLivingBase aEntity) { - for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Gas(aEntity.getEquipmentInSlot(i))) { - return false; - } - return true; - } - public static boolean applyRadioactivity(EntityLivingBase aEntity, int aLevel, int aAmountOfItems) { if (aLevel > 0 && aEntity != null && aEntity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java deleted file mode 100644 index 9a1292dea0..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java +++ /dev/null @@ -1,557 +0,0 @@ -package gtPlusPlus.core.util.minecraft; - -import static gregtech.api.GregTech_API.*; - -import java.lang.reflect.Field; -import java.util.HashMap; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.objects.GT_HashSet; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.GTplusplus.INIT_PHASE; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import ic2.core.Ic2Items; -import ic2.core.item.armor.ItemArmorHazmat; -import ic2.core.item.armor.ItemArmorNanoSuit; -import ic2.core.item.armor.ItemArmorQuantumSuit; - -public class HazmatUtils { - - public static final GT_HashSet<GT_ItemStack> sHazmatList = new GT_HashSet<GT_ItemStack>(); - - private static final HashMap<String, AutoMap<String>> mToolTips = new HashMap<String, AutoMap<String>>(); - - private static boolean mInit = false; - private static HazmatUtils mInstance; - - @SuppressWarnings("rawtypes") - public static void init() { - if (mInit) { - return; - } - // doInit(); Disabled, hazmat moved to gt5u - } - - public static void doInit() { - - mInstance = new HazmatUtils(); - - sHazmatList.add(ItemUtils.getSimpleStack(Ic2Items.hazmatHelmet, 1)); - sHazmatList.add(ItemUtils.getSimpleStack(Ic2Items.hazmatChestplate, 1)); - sHazmatList.add(ItemUtils.getSimpleStack(Ic2Items.hazmatLeggings, 1)); - sHazmatList.add(ItemUtils.getSimpleStack(Ic2Items.hazmatBoots, 1)); - - // Make Nano a hazmat suit - // Make Quantum a hazmat suit - - AutoMap<ItemStack> aVanillaIC2Armour = new AutoMap<ItemStack>(); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoHelmet, 1)); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBodyarmor, 1)); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoLeggings, 1)); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBoots, 1)); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumHelmet, 1)); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBodyarmor, 1)); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumLeggings, 1)); - aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBoots, 1)); - for (ItemStack aItem : aVanillaIC2Armour) { - addProtection(aItem); - } - Logger.INFO("[Hazmat] Registered IC2 Items as hazmat gear."); - - if (LoadedMods.isModLoaded("EMT")) { - AutoMap<Field> aItemFields = new AutoMap<Field>(); - Class aItemsEMT = ReflectionUtils.getClass("emt.init.EMTItems"); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "nanoThaumicHelmet")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "nanoWing")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "nanoBootsTraveller")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "quantumThaumicHelmet")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "quantumWing")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "quantumArmor")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "quantumBootsTraveller")); - AutoMap<ItemStack> aEMT = new AutoMap<ItemStack>(); - for (Field aItemField : aItemFields) { - Item aItemObject = null; - if (aItemField != null) { - try { - aItemObject = (Item) aItemField.get(null); - } catch (Exception t) { - t.printStackTrace(); - } - } - if (aItemObject != null) { - aEMT.add(ItemUtils.getSimpleStack(aItemObject)); - } else { - Logger.INFO("[Hazmat] Could not get " + aItemField.getName() + " from " + aItemsEMT.getName()); - } - } - Logger.INFO("[Hazmat] Registering " + aEMT.size() + " EMT Items as hazmat gear."); - for (ItemStack aItem : aEMT) { - addProtection(aItem); - } - Logger.INFO("[Hazmat] Registered EMT Items as hazmat gear."); - } - - if (LoadedMods.isModLoaded("DraconicEvolution")) { - AutoMap<Field> aItemFields = new AutoMap<Field>(); - Class aItemsDE = ReflectionUtils.getClass("com.brandon3055.draconicevolution.ModItems"); - - aItemFields.add(ReflectionUtils.getField(aItemsDE, "draconicHelm")); - aItemFields.add(ReflectionUtils.getField(aItemsDE, "draconicChest")); - aItemFields.add(ReflectionUtils.getField(aItemsDE, "draconicLeggs")); - aItemFields.add(ReflectionUtils.getField(aItemsDE, "draconicBoots")); - aItemFields.add(ReflectionUtils.getField(aItemsDE, "wyvernHelm")); - aItemFields.add(ReflectionUtils.getField(aItemsDE, "wyvernChest")); - aItemFields.add(ReflectionUtils.getField(aItemsDE, "wyvernLeggs")); - aItemFields.add(ReflectionUtils.getField(aItemsDE, "wyvernBoots")); - AutoMap<ItemStack> aItemMap = new AutoMap<ItemStack>(); - for (Field aItemField : aItemFields) { - Item aItemObject = null; - if (aItemField != null) { - try { - aItemObject = (Item) aItemField.get(null); - } catch (Exception t) { - t.printStackTrace(); - } - } - if (aItemObject != null) { - aItemMap.add(ItemUtils.getSimpleStack(aItemObject)); - } else { - Logger.INFO("[Hazmat] Could not get " + aItemField.getName() + " from " + aItemsDE.getName()); - } - } - Logger.INFO("[Hazmat] Registering " + aItemMap.size() + " Draconic Evolution Items as hazmat gear."); - for (ItemStack aItem : aItemMap) { - addProtection(aItem); - } - Logger.INFO("[Hazmat] Registered Draconic Evolution Items as hazmat gear."); - } - - if (LoadedMods.isModLoaded("TaintedMagic")) { - AutoMap<Field> aItemFields = new AutoMap<Field>(); - Class aItemsTaintedMagic = ReflectionUtils.getClass("taintedmagic.common.registry.ItemRegistry"); - - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemShadowFortressHelmet")); - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemShadowFortressChestplate")); - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemShadowFortressLeggings")); - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemVoidwalkerBoots")); - AutoMap<ItemStack> aItemMap = new AutoMap<ItemStack>(); - for (Field aItemField : aItemFields) { - Item aItemObject = null; - if (aItemField != null) { - try { - aItemObject = (Item) aItemField.get(null); - } catch (Exception t) { - t.printStackTrace(); - } - } - if (aItemObject != null) { - aItemMap.add(ItemUtils.getSimpleStack(aItemObject)); - } else { - Logger.INFO( - "[Hazmat] Could not get " + aItemField.getName() + " from " + aItemsTaintedMagic.getName()); - } - } - Logger.INFO("[Hazmat] Registering " + aItemMap.size() + " Tainted Magic Items as hazmat gear."); - for (ItemStack aItem : aItemMap) { - addProtection(aItem); - } - Logger.INFO("[Hazmat] Registered Tainted Magic Items as hazmat gear."); - } - - if (LoadedMods.isModLoaded("WitchingGadgets")) { - AutoMap<Field> aItemFields = new AutoMap<Field>(); - Class aItemsTaintedMagic = ReflectionUtils.getClass("witchinggadgets.common.WGContent"); - - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemPrimordialHelm")); - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemPrimordialChest")); - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemPrimordialLegs")); - aItemFields.add(ReflectionUtils.getField(aItemsTaintedMagic, "ItemPrimordialBoots")); - AutoMap<ItemStack> aItemMap = new AutoMap<ItemStack>(); - for (Field aItemField : aItemFields) { - Item aItemObject = null; - if (aItemField != null) { - try { - aItemObject = (Item) aItemField.get(null); - } catch (Exception t) { - t.printStackTrace(); - } - } - if (aItemObject != null) { - aItemMap.add(ItemUtils.getSimpleStack(aItemObject)); - } else { - Logger.INFO( - "[Hazmat] Could not get " + aItemField.getName() + " from " + aItemsTaintedMagic.getName()); - } - } - Logger.INFO("[Hazmat] Registering " + aItemMap.size() + " Witching Gadgets Items as hazmat gear."); - for (ItemStack aItem : aItemMap) { - addProtection(aItem); - } - Logger.INFO("[Hazmat] Registered Witching Gadgets Items as hazmat gear."); - } - - if (LoadedMods.isModLoaded("ThaumicTinkerer")) { - Logger.INFO("[Hazmat] Did not register Thaumic Tinkerer Items as hazmat gear."); - } - - if (LoadedMods.isModLoaded("GraviSuite")) { - AutoMap<Field> aItemFields = new AutoMap<Field>(); - Class aItemsGravisuite = ReflectionUtils.getClass("gravisuite.GraviSuite"); - aItemFields.add(ReflectionUtils.getField(aItemsGravisuite, "advNanoChestPlate")); - aItemFields.add(ReflectionUtils.getField(aItemsGravisuite, "graviChestPlate")); - AutoMap<ItemStack> aGravisuite = new AutoMap<ItemStack>(); - for (Field aItemField : aItemFields) { - Item aItemObject = ReflectionUtils.getFieldValue(aItemField); - if (aItemObject != null) { - aGravisuite.add(ItemUtils.getSimpleStack(aItemObject)); - } - } - Logger.INFO("[Hazmat] Registering " + aGravisuite.size() + " Gravisuit Items as hazmat gear."); - for (ItemStack aItem : aGravisuite) { - addProtection(aItem); - } - Logger.INFO("[Hazmat] Registered Gravisuit Items as hazmat gear."); - } - - if (LoadedMods.isModLoaded("AdvancedSolarPanel")) { - AutoMap<Field> aItemFields = new AutoMap<Field>(); - Class aItemsEMT = ReflectionUtils.getClass("advsolar.common.AdvancedSolarPanel"); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "advancedSolarHelmet")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "hybridSolarHelmet")); - aItemFields.add(ReflectionUtils.getField(aItemsEMT, "ultimateSolarHelmet")); - AutoMap<ItemStack> aASP = new AutoMap<ItemStack>(); - for (Field aItemField : aItemFields) { - Item aItemObject = ReflectionUtils.getFieldValue(aItemField); - if (aItemObject != null) { - aASP.add(ItemUtils.getSimpleStack(aItemObject)); - } - } - Logger.INFO("[Hazmat] Registering " + aASP.size() + " Adv. Solar Items as hazmat gear."); - for (ItemStack aItem : aASP) { - addProtection(aItem); - } - Logger.INFO("[Hazmat] Registered Adv. Solar Items as hazmat gear."); - } - - Utils.registerEvent(mInstance); - Logger.INFO("[Hazmat] Registered Tooltip handler for hazmat gear."); - mInit = true; - } - - private static final String mToolTipText = "Provides protection from:"; - - @SubscribeEvent - public void onItemTooltip(ItemTooltipEvent event) { - // Logger.INFO("Ticking Hazmat handler"); - if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) { - - if (event.itemStack == null || isVanillaHazmatPiece(event.itemStack)) { - // Logger.INFO("[Hazmat] Invalid Itemstack or vanilla hazmat"); - return; - } else { - ItemStack aStackTemp = event.itemStack; - GT_ItemStack aStack = new GT_ItemStack(aStackTemp); - if (isNanoArmourPiece(aStackTemp) || isQuantumArmourPiece(aStackTemp)) { - event.toolTip.add(EnumChatFormatting.DARK_PURPLE + "Provides full hazmat protection."); - } else { - // Logger.INFO("[Hazmat] Finding Tooltip Data"); - String[] aTooltips = getTooltips(aStack); - if (aTooltips == null || aTooltips.length == 0) { - // Logger.INFO("[Hazmat] No Info!"); - return; - } else { - // Logger.INFO("[Hazmat] Found Tooltips!"); - if (providesProtection(aStackTemp)) { - event.toolTip.add(EnumChatFormatting.LIGHT_PURPLE + "Provides full hazmat protection."); - } else { - event.toolTip.add(mToolTipText); - for (String r : aTooltips) { - event.toolTip.add(" - " + r); - } - } - } - } - } - } - } - - /** - * Static function to replace {@link #ic2.core.item.armor.ItemArmorHazmat.hasCompleteHazmat(EntityLivingBase)}. - * Because IC2 doesn't let us register things ourself, anything registered via GT/GT++ will return true. - * - * @param living - Entity Wearing Armour - * @return - Does {@link EntityLivingBase} have a full hazmat suit on? - */ - public static boolean hasCompleteHazmat(EntityLivingBase living) { - // Entity is Null, cannot have Hazmat. - if (living == null || living.isDead) { - return false; - } else { - - // Map All Player Armour slots - AutoMap<ItemStack> aEquipment = new AutoMap<ItemStack>(); - for (int i = 1; i < 5; ++i) { - ItemStack stack = living.getEquipmentInSlot(i); - - // Item is Null, cannot have full suit - if (stack == null) { - return false; - } else { - aEquipment.put(stack); - } - } - - // Compare Equipment to all items mapped for full hazmat. - for (ItemStack aSlotStack : aEquipment) { - if (!isHazmatPiece(aSlotStack)) { - // Logger.INFO("Found item which is not hazmat. "+ItemUtils.getItemName(aSlotStack)); - return false; - } - } - - // We are in some kind of full hazmat, huzzah! - // Logger.INFO("Has full hazmat."); - return true; - } - } - - /** - * Is this item vanilla IC2 hazmat? - * - * @param aArmour - The Armour to provide protection. - * @return - */ - public static boolean isVanillaHazmatPiece(ItemStack aArmour) { - return aArmour != null ? aArmour.getItem() instanceof ItemArmorHazmat : false; - } - - /** - * Is this item vanilla IC2 Nanosuit? - * - * @param aArmour - The Armour to provide protection. - * @return - */ - public static boolean isNanoArmourPiece(ItemStack aArmour) { - return aArmour != null ? aArmour.getItem() instanceof ItemArmorNanoSuit : false; - } - - /** - * Is this item vanilla IC2 Quantum? - * - * @param aArmour - The Armour to provide protection. - * @return - */ - public static boolean isQuantumArmourPiece(ItemStack aArmour) { - return aArmour != null ? aArmour.getItem() instanceof ItemArmorQuantumSuit : false; - } - - /** - * Is this item a registered piece of full hazmat? (Provides all 6 protections) - * - * @param aStack - The Armour to provide protection. - * @return - */ - public static boolean isHazmatPiece(ItemStack aStack) { - return isVanillaHazmatPiece(aStack) || providesProtection(aStack); - } - - /** - * Registers the {@link ItemStack} to all types of protection. Provides full hazmat protection. Frost, Fire, Bio, - * Gas, Radioaton & Electricity. - * - * @param aStack - The Armour to provide protection. - * @return - Did we register this ItemStack properly? - */ - public static boolean addProtection(ItemStack aVanStack) { - if (!ItemUtils.checkForInvalidItems(aVanStack)) { - Logger.INFO("=================Bad Hazmat Addition======================"); - Logger.INFO("Called from: " + ReflectionUtils.getMethodName(0)); - Logger.INFO(ReflectionUtils.getMethodName(1)); - Logger.INFO(ReflectionUtils.getMethodName(2)); - Logger.INFO(ReflectionUtils.getMethodName(3)); - Logger.INFO(ReflectionUtils.getMethodName(4)); - Logger.INFO(ReflectionUtils.getMethodName(5)); - Logger.INFO(ReflectionUtils.getMethodName(6)); - Logger.INFO("=========================================================="); - return false; - } - Logger.INFO("[Hazmat] Registering " + ItemUtils.getItemName(aVanStack) + " for full Hazmat protection."); - GT_ItemStack aStack = getGtStackFromVanilla(aVanStack); - AutoMap<Boolean> aAdded = new AutoMap<Boolean>(); - aAdded.put(addProtection_Frost(aStack)); - aAdded.put(addProtection_Fire(aStack)); - aAdded.put(addProtection_Biohazard(aStack)); - aAdded.put(addProtection_Gas(aStack)); - aAdded.put(addProtection_Radiation(aStack)); - aAdded.put(addProtection_Electricty(aStack)); - for (boolean b : aAdded) { - if (!b) { - return false; - } - } - Logger.INFO("[Hazmat] Protection added for all 6 damage types, registering to master Hazmat list."); - sHazmatList.add(aStack); - return true; - } - - public static boolean addProtection_Frost(GT_ItemStack aStack) { - registerTooltip(aStack, EnumChatFormatting.AQUA + "Frost"); - return addProtection_Generic(sFrostHazmatList, aStack); - } - - public static boolean addProtection_Fire(GT_ItemStack aStack) { - registerTooltip(aStack, EnumChatFormatting.DARK_RED + "Heat"); - return addProtection_Generic(sHeatHazmatList, aStack); - } - - public static boolean addProtection_Biohazard(GT_ItemStack aStack) { - registerTooltip(aStack, EnumChatFormatting.GREEN + "Biohazards"); - return addProtection_Generic(sBioHazmatList, aStack); - } - - public static boolean addProtection_Gas(GT_ItemStack aStack) { - registerTooltip(aStack, EnumChatFormatting.WHITE + "Gas"); - return addProtection_Generic(sGasHazmatList, aStack); - } - - public static boolean addProtection_Radiation(GT_ItemStack aStack) { - registerTooltip(aStack, EnumChatFormatting.DARK_GREEN + "Radiation"); - return addProtection_Generic(sRadioHazmatList, aStack); - } - - public static boolean addProtection_Electricty(GT_ItemStack aStack) { - registerTooltip(aStack, EnumChatFormatting.YELLOW + "Electricity"); - return addProtection_Generic(sElectroHazmatList, aStack); - } - - private static boolean addProtection_Generic(GT_HashSet<GT_ItemStack> aSet, GT_ItemStack aStack) { - int aMapSize = aSet.size(); - aSet.add(aStack); - return aMapSize < aSet.size(); - } - - /** - * Does this item provide hazmat protection? (Protection against Frost, Heat, Bio, Gas, Rads, Elec) An item may - * return false even if it protects against all six damage types. This is because it's not actually registered as - * hazmat correct. - * - * @param aStack - The item to check for protection - * @return - */ - public static boolean providesProtection(ItemStack aStack) { - return providesProtetion_Generic(sHazmatList, aStack); - } - - public static boolean providesProtetion_Frost(ItemStack aStack) { - return providesProtetion_Generic(sFrostHazmatList, aStack); - } - - public static boolean providesProtetion_Fire(ItemStack aStack) { - return providesProtetion_Generic(sHeatHazmatList, aStack); - } - - public static boolean providesProtetion_Biohazard(ItemStack aStack) { - return providesProtetion_Generic(sBioHazmatList, aStack); - } - - public static boolean providesProtetion_Gas(ItemStack aStack) { - return providesProtetion_Generic(sGasHazmatList, aStack); - } - - public static boolean providesProtetion_Radiation(ItemStack aStack) { - return providesProtetion_Generic(sRadioHazmatList, aStack); - } - - public static boolean providesProtetion_Electricity(ItemStack aStack) { - return providesProtetion_Generic(sElectroHazmatList, aStack); - } - - private static boolean providesProtetion_Generic(GT_HashSet<GT_ItemStack> aSet, ItemStack aStack) { - if (isVanillaHazmatPiece(aStack)) { - return true; - } - for (GT_ItemStack o : aSet) { - if (o != null && o.mItem != null && aStack != null && aStack.getItem() != null) { - if (GT_Utility.areStacksEqual(o.toStack(), aStack, true)) { - return true; - } - if (o.isStackEqual(aStack)) { - return true; - } - if (o.mItem == aStack.getItem() && EnergyUtils.EU.isElectricItem(aStack)) { - return true; - } - } - } - return false; - } - - private static String[] getTooltips(GT_ItemStack aStack) { - String aKey = convertGtItemstackToStringDataIgnoreDamage(aStack); - AutoMap<String> aTempTooltipData = mToolTips.get(aKey); - if (aTempTooltipData == null || aTempTooltipData.isEmpty()) { - // Logger.INFO("[Hazmat] Item was not mapped for TTs - "+aKey); - return new String[] {}; - } else { - // Logger.INFO("[Hazmat] Item was mapped for TTs"); - // Collections.sort(aTempTooltipData); - // Logger.INFO("[Hazmat] Sorted TTs"); - - String[] mBuiltOutput = new String[aTempTooltipData.size()]; - int aIndex = 0; - for (String i : aTempTooltipData) { - mBuiltOutput[aIndex++] = i; - } - - return mBuiltOutput; - } - } - - private static void registerTooltip(GT_ItemStack aStack, String aTooltip) { - String aKey = convertGtItemstackToStringDataIgnoreDamage(aStack); - Logger.INFO("[Hazmat] Mapping " + aTooltip + " for " + aKey); - AutoMap<String> aTempTooltipData = mToolTips.get(aKey); - if (aTempTooltipData == null) { - Logger.INFO("No data mapped yet, creating."); - aTempTooltipData = new AutoMap<String>(); - mToolTips.put(aKey, aTempTooltipData); - } - aTempTooltipData.add(aTooltip); - } - - public static ItemStack getStackFromGtStack(GT_ItemStack aGtStack) { - return ItemUtils.simpleMetaStack(aGtStack.mItem, aGtStack.mMetaData, aGtStack.mStackSize); - } - - public static GT_ItemStack getGtStackFromVanilla(ItemStack aStack) { - return new GT_ItemStack(aStack); - } - - private static String convertGtItemstackToStringData(GT_ItemStack aStack) { - if (aStack == null) { - return "NULL"; - } else { - return aStack.mItem.getUnlocalizedName() + "." + aStack.mMetaData + "." + aStack.mStackSize; - } - } - - private static String convertGtItemstackToStringDataIgnoreDamage(GT_ItemStack aStack) { - if (aStack == null) { - return "NULL"; - } else { - return aStack.mItem.getUnlocalizedName() + "." + aStack.mStackSize; - } - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index ab1f940057..182b2b22ee 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1,5 +1,10 @@ package gtPlusPlus.core.util.minecraft; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Minecraft; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -114,7 +119,7 @@ public class ItemUtils { if (moreTemp == null) { final int cellID = 0; - final ItemStack temp = GT_ModHandler.getModItem("IC2", "itemCellEmpty", 1L, cellID); + final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, cellID); return temp != null ? temp : null; } @@ -122,7 +127,7 @@ public class ItemUtils { } public static ItemStack getIC2Cell(final int meta) { - final ItemStack temp = GT_ModHandler.getModItem("IC2", "itemCellEmpty", 1L, meta); + final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta); return temp != null ? temp : null; } @@ -134,7 +139,7 @@ public class ItemUtils { if (ItemList.Cell_Empty.hasBeenSet()) { return ItemList.Cell_Empty.get(i); } - final ItemStack temp = GT_ModHandler.getModItem("IC2", "itemCellEmpty", i, 0); + final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0); return temp != null ? temp : null; } @@ -316,7 +321,7 @@ public class ItemUtils { final int colourOverlay) { final Item itemSpawnEgg = new BasicSpawnEgg(entityModID, parSpawnName, colourEgg, colourOverlay) .setUnlocalizedName("spawn_egg_" + parSpawnName.toLowerCase()) - .setTextureName(CORE.MODID + ":spawn_egg"); + .setTextureName(GTPlusPlus.ID + ":spawn_egg"); GameRegistry.registerItem(itemSpawnEgg, "spawnEgg" + parSpawnName); } @@ -893,14 +898,14 @@ public class ItemUtils { final GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item); if (id != null) { final String modname = (id.modId == null ? id.name : id.modId); - value = ((id == null) || id.modId.equals("")) ? "minecraft" : modname; + value = ((id == null) || id.modId.equals("")) ? Minecraft.ID : modname; } } catch (final Throwable t) { try { final UniqueIdentifier t2 = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(item)); if (t2 != null) { final String modname = (t2.modId == null ? t2.name : t2.modId); - value = ((t2 == null) || t2.modId.equals("")) ? "minecraft" : modname; + value = ((t2 == null) || t2.modId.equals("")) ? Minecraft.ID : modname; } } catch (final Throwable t3) { t3.printStackTrace(); @@ -924,7 +929,7 @@ public class ItemUtils { ItemStack returnvalue; for (int xrc = 0; xrc < oreDictList.size(); xrc++) { final String modid = getModId(oreDictList.get(xrc).getItem()); - if (modid != null && (modid.equals("gregtech") || modid.equals(CORE.MODID))) { + if (modid != null && (modid.equals(GregTech.ID) || modid.equals(GTPlusPlus.ID))) { returnvalue = oreDictList.get(xrc).copy(); returnvalue.stackSize = amount; return returnvalue; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 66e92e3eda..78e6034b06 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -1,14 +1,23 @@ package gtPlusPlus.core.util.minecraft; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.*; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Element; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TextureSet; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.*; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.api.objects.data.TypeCounter; import gtPlusPlus.core.client.CustomTextureSet.TextureSets; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; @@ -16,10 +25,11 @@ import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.plates.BaseItemPlateHeavy; import gtPlusPlus.core.item.base.wire.BaseItemFineWire; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.data.*; +import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 4ce4af0922..74b0ad6a62 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -1,6 +1,11 @@ package gtPlusPlus.core.util.minecraft; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.WeakHashMap; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java index 1ce69a51fd..7730a9a522 100644 --- a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java +++ b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java @@ -1,7 +1,19 @@ package gtPlusPlus.core.util.player; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java index 8e825c891b..08fa644785 100644 --- a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java +++ b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java @@ -1,6 +1,11 @@ package gtPlusPlus.core.world.explosions; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -9,7 +14,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.Vec3; import net.minecraft.world.ChunkPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java index ac3665e855..00c6f7deec 100644 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades; +import static gregtech.api.enums.Mods.GTPlusPlusEverglades; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -15,11 +17,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; +import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.Everglades; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.ORES; import gtPlusPlus.everglades.biome.Biome_Everglades; @@ -33,14 +34,14 @@ import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; @MCVersion(value = "1.7.10") @Mod( - modid = Everglades.MODID, + modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, name = Everglades.NAME, version = Everglades.VERSION, - dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;") + dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;") public class GTplusplus_Everglades implements ActionListener { // Mod Instance - @Mod.Instance(Everglades.MODID) + @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES) public static GTplusplus_Everglades instance; // Dark World Handler @@ -51,7 +52,7 @@ public class GTplusplus_Everglades implements ActionListener { // Pre-Init @Mod.EventHandler public void preInit(final FMLPreInitializationEvent event) { - Logger.INFO("Loading " + Everglades.MODID + " V" + Everglades.VERSION); + Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); // Setup setVars(event); @@ -72,7 +73,7 @@ public class GTplusplus_Everglades implements ActionListener { @EventHandler public void load(final FMLInitializationEvent e) { - Logger.INFO("Begin resource allocation for " + Everglades.MODID + " V" + Everglades.VERSION); + Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); // Load World and Biome GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE); @@ -127,15 +128,6 @@ public class GTplusplus_Everglades implements ActionListener { MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE); MaterialGenerator.generateOreMaterial(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT); - // Custom Ores - if (LoadedMods.Big_Reactors) { - MaterialGenerator.generateOreMaterial( - ELEMENT.getInstance().YELLORIUM, - false, - false, - true, - new short[] { 255, 242, 10 }); - } } protected synchronized void setVars(FMLPreInitializationEvent event) { diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java index 2ea16a553a..b0139b2252 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java @@ -1,7 +1,27 @@ package gtPlusPlus.everglades.biome; -import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*; -import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.*; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.BIG_SHROOM; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CACTUS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CLAY; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.DEAD_BUSH; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FLOWERS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.GRASS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LAKE; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LILYPAD; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.PUMPKIN; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.REED; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND_PASS2; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SHROOM; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.TREE; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.COAL; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.DIAMOND; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.DIRT; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.GOLD; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.GRAVEL; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.IRON; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.LAPIS; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.REDSTONE; import java.util.Random; @@ -11,7 +31,15 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeDecorator; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenBigMushroom; +import net.minecraft.world.gen.feature.WorldGenCactus; +import net.minecraft.world.gen.feature.WorldGenDeadBush; +import net.minecraft.world.gen.feature.WorldGenFlowers; +import net.minecraft.world.gen.feature.WorldGenLiquids; +import net.minecraft.world.gen.feature.WorldGenPumpkin; +import net.minecraft.world.gen.feature.WorldGenReed; +import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.OreGenEvent; diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java index 0d3b59e166..a91ed0cd84 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.block.BlockGrass; import gtPlusPlus.api.interfaces.ITileTooltip; @@ -11,7 +13,7 @@ public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip { this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround"); this.setHardness(1.0F); - this.setBlockTextureName("minecraft" + ":" + "grass"); + this.setBlockTextureName(Minecraft.ID + ":" + "grass"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java index 7590af19ef..43bb2ecac0 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.block.BlockDirt; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; @@ -15,7 +17,7 @@ public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround2"); this.setHardness(0.5F); - this.setBlockTextureName("minecraft" + ":" + "dirt"); + this.setBlockTextureName(Minecraft.ID + ":" + "dirt"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java index e034d3e09e..1f8b82e9ca 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java @@ -1,11 +1,12 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip { @@ -15,7 +16,7 @@ public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip { this.setBlockName("blockDarkWorldPortalFrame"); this.setHardness(3.0F); this.setLightLevel(0.5F); - this.setBlockTextureName(CORE.MODID + ":" + "metro/TEXTURE_TECH_PANEL_A"); + this.setBlockTextureName(GTPlusPlus.ID + ":" + "metro/TEXTURE_TECH_PANEL_A"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index 66e03d8a77..4e1ca32dd0 100644 --- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java +++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java @@ -1,6 +1,11 @@ package gtPlusPlus.everglades.block; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.*; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockFluidLakes; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockPortalFrame; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockSecondLayer; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockTopLayer; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalBlock; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalItem; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index f9dcba5df4..6fafb08a31 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -9,11 +9,19 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.MathHelper; -import net.minecraft.world.*; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.SpawnerAnimals; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.*; +import net.minecraft.world.gen.MapGenBase; +import net.minecraft.world.gen.MapGenCaves; +import net.minecraft.world.gen.MapGenRavine; +import net.minecraft.world.gen.NoiseGenerator; +import net.minecraft.world.gen.NoiseGeneratorOctaves; +import net.minecraft.world.gen.NoiseGeneratorPerlin; import net.minecraft.world.gen.feature.WorldGenLakes; import net.minecraft.world.gen.structure.MapGenMineshaft; import net.minecraft.world.gen.structure.MapGenScatteredFeature; diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index eeb45cee22..fcc7c05ae2 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -1,6 +1,10 @@ package gtPlusPlus.everglades.gen.gt; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index 0489cec91e..fa34803054 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -4,7 +4,10 @@ import static gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base.debugWorldGen; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java index 5e3d82a4b4..2f85fa50e9 100644 --- a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java +++ b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.item; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.Block; @@ -13,7 +15,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; @@ -24,7 +25,7 @@ public class ItemEvergladesPortalTrigger extends Item { this.maxStackSize = 1; setMaxDamage(64); setCreativeTab(CreativeTabs.tabTools); - this.setTextureName(CORE.MODID + ":" + "itemAlkalusDisk"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemAlkalusDisk"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 1d700b16b0..2951ed3a57 100644 --- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -1,10 +1,16 @@ package gtPlusPlus.everglades.world; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.*; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.Direction; +import net.minecraft.util.LongHashMap; +import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; diff --git a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java index dc566d9896..b31a0639db 100644 --- a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java +++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java @@ -1,6 +1,8 @@ package gtPlusPlus.nei; -import java.awt.Rectangle; +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -18,7 +20,6 @@ import gtPlusPlus.core.gui.machine.GUI_DecayablesChest; import gtPlusPlus.core.handler.Recipes.DecayableRecipe; import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; import gtPlusPlus.core.item.materials.DustDecayable; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.VanillaColours; import gtPlusPlus.nei.handlers.NeiTextureHandler; @@ -31,7 +32,7 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { } public String getGuiTexture() { - return CORE.MODID + ":textures/gui/nei/decayables.png"; + return GTPlusPlus.ID + ":textures/gui/nei/decayables.png"; } public Class<? extends GuiContainer> getGuiClass() { diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java index 75f4fa3ba0..1019c43948 100644 --- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java @@ -1,6 +1,6 @@ package gtPlusPlus.nei; -import java.awt.Rectangle; +import java.awt.*; import java.lang.ref.SoftReference; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java index 244fa687db..24792570a7 100644 --- a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java +++ b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java @@ -1,9 +1,12 @@ package gtPlusPlus.nei; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.NotEnoughItems; + import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.event.FMLInterModComms; -import gtPlusPlus.core.lib.LoadedMods; public class NEI_IMC_Sender { @@ -59,7 +62,7 @@ public class NEI_IMC_Sender { sendHandler("gtpp.recipe.quantumforcesmelter", "gregtech:gt.blockmachines:31151"); sendCatalyst("gtpp.recipe.quantumforcesmelter", "gregtech:gt.blockmachines:31151"); - if (LoadedMods.AdvancedSolarPanel) { + if (AdvancedSolarPanel.isModLoaded()) { sendHandler("gtpp.recipe.moleculartransformer", "AdvancedSolarPanel:BlockMolecularTransformer"); sendCatalyst("gtpp.recipe.moleculartransformer", "gregtech:gt.blockmachines:31072"); } @@ -97,14 +100,14 @@ public class NEI_IMC_Sender { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handler", aRecipeName); aNBT.setString("modName", "GT++"); - aNBT.setString("modId", "miscutils"); + aNBT.setString("modId", GTPlusPlus.ID); aNBT.setBoolean("modRequired", true); aNBT.setString("itemName", aBlock); aNBT.setInteger("yShift", 6); aNBT.setInteger("handlerHeight", 135); aNBT.setInteger("handlerWidth", 166); aNBT.setInteger("maxRecipesPerPage", aRecipesPerPage); - FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerHandlerInfo", aNBT); } private static void sendCatalyst(String aName, String aStack, int aPriority) { @@ -112,7 +115,7 @@ public class NEI_IMC_Sender { aNBT.setString("handlerID", aName); aNBT.setString("itemName", aStack); aNBT.setInteger("priority", aPriority); - FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerCatalystInfo", aNBT); } private static void sendCatalyst(String aName, String aStack) { @@ -123,6 +126,6 @@ public class NEI_IMC_Sender { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handlerID", aName); aNBT.setString("itemName", aStack); - FMLInterModComms.sendMessage("NotEnoughItems", "removeCatalystInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "removeCatalystInfo", aNBT); } } diff --git a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java index bbc3c5b9a2..fc02e86011 100644 --- a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java +++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java @@ -1,5 +1,7 @@ package gtPlusPlus.nei.handlers; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; @@ -10,8 +12,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import gtPlusPlus.core.lib.CORE; - /** * Based on crazypants.enderio.gui.IconEIO * @@ -50,7 +50,8 @@ public final class NeiTextureHandler { public final double width; public final double height; - public static final ResourceLocation TEXTURE = new ResourceLocation(CORE.MODID + ":textures/gui/nei/widgets.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation( + GTPlusPlus.ID + ":textures/gui/nei/widgets.png"); public NeiTextureHandler(int x, int y) { this(x, y, 16, 16); diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index c2d1bb58b6..b9f48562ab 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -1,5 +1,8 @@ package gtPlusPlus.plugin.agrichem; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.Railcraft; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; @@ -26,7 +29,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.recipe.common.CI; @@ -378,7 +380,7 @@ public class BioRecipes { 30); // Add Charcoal Recipe - if (LoadedMods.Railcraft) { + if (Railcraft.isModLoaded()) { RailcraftUtils.addCokeOvenRecipe( ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), true, @@ -957,7 +959,7 @@ public class BioRecipes { private static void recipeCompost() { ItemStack aFert; - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertForestry, 32); CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(11), diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java index d7c2b36598..17e0ccf4e9 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.plugin.agrichem.item.algae; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -19,7 +21,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.OreDictUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -149,7 +150,7 @@ public class ItemAgrichemBase extends Item { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < this.base.length; i++) { - String aPath = CORE.MODID + ":" + "bioscience/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "bioscience/MetaItem1/" + i; this.base[i] = u.registerIcon(aPath); } } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index 6940e0a466..6aae34fdf1 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.plugin.agrichem.item.algae; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +18,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.AlgaeDefinition; import gtPlusPlus.plugin.agrichem.IAlgalItem; @@ -161,8 +162,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "bioscience/BasicAlgae"); - this.overlay = i.registerIcon(CORE.MODID + ":" + "bioscience/BasicAlgae" + "_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae"); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae" + "_Overlay"); } public static ItemStack initNBT(ItemStack aFreshAlgae) { diff --git a/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java index 5d1b36b134..6a39fb0166 100644 --- a/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java @@ -1,10 +1,11 @@ package gtPlusPlus.plugin.villagers; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.CORE; public class VillagerObject { @@ -29,7 +30,7 @@ public class VillagerObject { if (aSkin instanceof String) { String s = (String) aSkin; - aSkin = new ResourceLocation(CORE.MODID + ":" + "textures/entity/villager/" + s + ".png"); + aSkin = new ResourceLocation(GTPlusPlus.ID + ":" + "textures/entity/villager/" + s + ".png"); } if (aSkin instanceof ResourceLocation) { Core_VillagerAdditions.mVillagerSkins.put(aID, (ResourceLocation) aSkin); diff --git a/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java b/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java index af63ab1307..2e050f411d 100644 --- a/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java +++ b/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java @@ -1,7 +1,8 @@ package gtPlusPlus.plugin.waila; +import static gregtech.api.enums.Mods.Waila; + import gtPlusPlus.api.interfaces.IPlugin; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.plugin.manager.Core_Manager; public class Core_WailaPlugin implements IPlugin { @@ -20,7 +21,7 @@ public class Core_WailaPlugin implements IPlugin { @Override public boolean preInit() { - if (LoadedMods.Waila) { + if (Waila.isModLoaded()) { mActive = true; } return mActive; diff --git a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index 21d53cd615..f4b152e523 100644 --- a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java @@ -1,5 +1,7 @@ package gtPlusPlus.preloader; +import static gregtech.api.enums.Mods.GregTech; + import net.minecraft.item.ItemStack; import org.apache.logging.log4j.Level; @@ -7,7 +9,6 @@ import org.apache.logging.log4j.Level; import cpw.mods.fml.relauncher.FMLRelaunchLog; import gregtech.common.items.GT_MetaGenerated_Item_01; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -17,13 +18,13 @@ public class Preloader_GT_OreDict { if (bannedItem == null) { return false; - } else if (!CORE_Preloader.enableOldGTcircuits && !LoadedMods.Mekanism) { + } else if (!CORE_Preloader.enableOldGTcircuits) { return false; } try { if (CORE_Preloader.enableOldGTcircuits) { - if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")) { + if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals(GregTech.ID)) { final int damageValue = bannedItem.getItemDamage() - 32000; if (bannedItem.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720 if ((damageValue >= 700) && (damageValue <= 720)) { @@ -56,127 +57,6 @@ public class Preloader_GT_OreDict { } } - // Mekanism Support - Let's not make Mek Osmium useful in GT anymore. - if ((((bannedItem != null) && !LoadedMods.RedTech - && (ItemUtils.getModId(bannedItem).toLowerCase().equals("mekanism"))) || (LoadedMods.Mekanism)) - && !LoadedMods.RedTech) { - // Circuits - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemControlCircuit")) { - final Class<?> MekCircuit = ReflectionUtils.getClass("mekanism.common.item.ItemControlCircuit"); - if (isInstanceOf(MekCircuit, bannedItem.getItem())) { - for (int r = 0; r < 4; r++) { - if (bannedItem.getItemDamage() == r) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - } - // Ingots - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemIngot")) { - final Class<?> MekIngot = ReflectionUtils.getClass("mekanism.common.item.ItemIngot"); - if (isInstanceOf(MekIngot, bannedItem.getItem())) { - if (bannedItem.getItemDamage() == 1) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - // Dirty Dust - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemDirtyDust")) { - final Class<?> MekIngot = ReflectionUtils.getClass("mekanism.common.item.ItemDirtyDust"); - if (isInstanceOf(MekIngot, bannedItem.getItem())) { - if (bannedItem.getItemDamage() == 2) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - // Dust - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemDust")) { - final Class<?> MekIngot = ReflectionUtils.getClass("mekanism.common.item.ItemDust"); - if (isInstanceOf(MekIngot, bannedItem.getItem())) { - if (bannedItem.getItemDamage() == 2) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - // Crystal - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemCrystal")) { - final Class<?> MekIngot = ReflectionUtils.getClass("mekanism.common.item.ItemCrystal"); - if (isInstanceOf(MekIngot, bannedItem.getItem())) { - if (bannedItem.getItemDamage() == 2) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - // Shard - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemShard")) { - final Class<?> MekIngot = ReflectionUtils.getClass("mekanism.common.item.ItemShard"); - if (isInstanceOf(MekIngot, bannedItem.getItem())) { - if (bannedItem.getItemDamage() == 2) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - // Clump - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemClump")) { - final Class<?> MekIngot = ReflectionUtils.getClass("mekanism.common.item.ItemClump"); - if (isInstanceOf(MekIngot, bannedItem.getItem())) { - if (bannedItem.getItemDamage() == 2) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - // Ores - if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemBlockOre")) { - final Class<?> MekOre = ReflectionUtils.getClass("mekanism.common.item.ItemBlockOre"); - if (isInstanceOf(MekOre, bannedItem.getItem()) - || (bannedItem == ItemUtils.simpleMetaStack("Mekanism:OreBlock", 0, 1))) { - if (bannedItem.getItemDamage() == 0) { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", - Level.INFO, - "Removing %s from the OreDictionary to balance Mekanism.", - bannedItem.getDisplayName()); - return true; - } - } - } - } - } catch (final Throwable e) { if (CORE.ConfigSwitches.showHiddenNEIItems) { FMLRelaunchLog.log( diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java index 6f464484a5..41cba8d85b 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java @@ -1,5 +1,8 @@ package gtPlusPlus.preloader.asm; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import java.io.File; import java.util.Arrays; @@ -33,7 +36,7 @@ public class Preloader_DummyContainer extends DummyModContainer { meta.updateUrl = ""; meta.screenshots = new String[0]; meta.logoFile = ""; - meta.parent = "miscutils"; + meta.parent = GTPlusPlus.ID; // meta.dependencies = (List<ArtifactVersion>) CORE_Preloader.DEPENDENCIES; Preloader_Logger.INFO("Initializing DummyModContainer"); } @@ -83,7 +86,7 @@ public class Preloader_DummyContainer extends DummyModContainer { // Circuits CORE_Preloader.enableOldGTcircuits = config.getBoolean( "enableOldGTcircuits", - "gregtech", + GregTech.ID, false, "Restores circuits and their recipes from Pre-5.09.28 times."); } @@ -96,7 +99,7 @@ public class Preloader_DummyContainer extends DummyModContainer { // Circuits CORE_Preloader.enableOldGTcircuits = config.getBoolean( "enableOldGTcircuits", - "gregtech", + GregTech.ID, false, "Restores circuits and their recipes from Pre-5.09.28 times."); CORE_Preloader.enableWatchdogBGM = config.getInt( diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java index e26c5b0d03..cda4384f7d 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java @@ -1,6 +1,46 @@ package gtPlusPlus.preloader.asm.transformers; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.AASTORE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ANEWARRAY; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.ATHROW; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.F_APPEND; +import static org.objectweb.asm.Opcodes.F_FULL; +import static org.objectweb.asm.Opcodes.F_SAME; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.ICONST_2; +import static org.objectweb.asm.Opcodes.ICONST_3; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFLE; +import static org.objectweb.asm.Opcodes.IFNE; +import static org.objectweb.asm.Opcodes.IFNONNULL; +import static org.objectweb.asm.Opcodes.IFNULL; +import static org.objectweb.asm.Opcodes.IF_ACMPNE; +import static org.objectweb.asm.Opcodes.IF_ICMPLE; +import static org.objectweb.asm.Opcodes.IF_ICMPLT; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INTEGER; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.TOP; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java index ca268f9f37..1e989fd235 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java @@ -1,6 +1,38 @@ package gtPlusPlus.preloader.asm.transformers; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ANEWARRAY; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.DDIV; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.F_APPEND; +import static org.objectweb.asm.Opcodes.F_CHOP; +import static org.objectweb.asm.Opcodes.F_FULL; +import static org.objectweb.asm.Opcodes.F_SAME; +import static org.objectweb.asm.Opcodes.F_SAME1; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.ICONST_M1; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFNONNULL; +import static org.objectweb.asm.Opcodes.IFNULL; +import static org.objectweb.asm.Opcodes.IF_ICMPEQ; +import static org.objectweb.asm.Opcodes.IF_ICMPLE; +import static org.objectweb.asm.Opcodes.IF_ICMPNE; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INSTANCEOF; +import static org.objectweb.asm.Opcodes.INTEGER; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.RETURN; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java index 8ed7241b63..d449e1d4de 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java @@ -1,6 +1,35 @@ package gtPlusPlus.preloader.asm.transformers; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.F_CHOP; +import static org.objectweb.asm.Opcodes.F_FULL; +import static org.objectweb.asm.Opcodes.F_SAME; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFNE; +import static org.objectweb.asm.Opcodes.IFNONNULL; +import static org.objectweb.asm.Opcodes.IFNULL; +import static org.objectweb.asm.Opcodes.IF_ACMPNE; +import static org.objectweb.asm.Opcodes.IF_ICMPGE; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INTEGER; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.TOP; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java index e9589ff756..e194c6d466 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java @@ -1,6 +1,52 @@ package gtPlusPlus.preloader.asm.transformers; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.AALOAD; +import static org.objectweb.asm.Opcodes.AASTORE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARRAYLENGTH; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.BIPUSH; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.F_APPEND; +import static org.objectweb.asm.Opcodes.F_CHOP; +import static org.objectweb.asm.Opcodes.F_FULL; +import static org.objectweb.asm.Opcodes.F_SAME; +import static org.objectweb.asm.Opcodes.F_SAME1; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.IADD; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.ICONST_2; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFLE; +import static org.objectweb.asm.Opcodes.IFNE; +import static org.objectweb.asm.Opcodes.IFNONNULL; +import static org.objectweb.asm.Opcodes.IFNULL; +import static org.objectweb.asm.Opcodes.IF_ACMPNE; +import static org.objectweb.asm.Opcodes.IF_ICMPGE; +import static org.objectweb.asm.Opcodes.IF_ICMPGT; +import static org.objectweb.asm.Opcodes.IF_ICMPLT; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INSTANCEOF; +import static org.objectweb.asm.Opcodes.INTEGER; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IREM; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.ISUB; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.TOP; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java index 7dde3c4c55..da5907e6fd 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java @@ -1,6 +1,12 @@ package gtPlusPlus.preloader.asm.transformers; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.IRETURN; import java.util.Random; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java index 831da8f90d..9f48313f8f 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java @@ -1,6 +1,38 @@ package gtPlusPlus.preloader.asm.transformers; -import static org.objectweb.asm.Opcodes.*; +import static gregtech.api.enums.Mods.TinkerConstruct; +import static org.objectweb.asm.Opcodes.AALOAD; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.BIPUSH; +import static org.objectweb.asm.Opcodes.D2F; +import static org.objectweb.asm.Opcodes.DADD; +import static org.objectweb.asm.Opcodes.DDIV; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.DUP_X1; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.I2D; +import static org.objectweb.asm.Opcodes.IADD; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFLE; +import static org.objectweb.asm.Opcodes.IFNE; +import static org.objectweb.asm.Opcodes.IFNONNULL; +import static org.objectweb.asm.Opcodes.IFNULL; +import static org.objectweb.asm.Opcodes.IF_ICMPEQ; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IREM; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.ISUB; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.RETURN; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -9,9 +41,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import org.apache.logging.log4j.Level; -import org.objectweb.asm.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; -import cpw.mods.fml.common.Loader; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.Preloader_Logger; @@ -104,7 +140,7 @@ public class ClassTransformer_TT_ThaumicRestorer { ReflectionUtils.setField(aTile, mTicksExisted, ticksExisted); boolean aDidRun = false; if (ticksExisted % 10 == 0) { - if (Loader.isModLoaded("TConstruct") && repairTConTools + if (TinkerConstruct.isModLoaded() && repairTConTools && inventorySlots[0] != null && isTConstructTool(inventorySlots[0])) { final int dmg = getDamage(inventorySlots[0]); @@ -263,7 +299,7 @@ public class ClassTransformer_TT_ThaumicRestorer { Label l2 = new Label(); mv.visitLabel(l2); mv.visitLineNumber(60, l2); - mv.visitLdcInsn("TConstruct"); + mv.visitLdcInsn(TinkerConstruct.ID); mv.visitMethodInsn(INVOKESTATIC, "cpw/mods/fml/common/Loader", "isModLoaded", "(Ljava/lang/String;)Z", false); Label l3 = new Label(); mv.visitJumpInsn(IFEQ, l3); diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java index 98a1ab48e4..4392802ba3 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java @@ -1,6 +1,16 @@ package gtPlusPlus.preloader.asm.transformers; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.F_APPEND; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.IFLE; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INTEGER; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.ISTORE; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index 4d48a5a917..ad92f5b096 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -1,6 +1,32 @@ package gtPlusPlus.preloader.asm.transformers; -import static gtPlusPlus.preloader.asm.ClassesToTransform.*; +import static gtPlusPlus.preloader.asm.ClassesToTransform.COFH_ORE_DICTIONARY_ARBITER; +import static gtPlusPlus.preloader.asm.ClassesToTransform.FORGE_CHUNK_MANAGER; +import static gtPlusPlus.preloader.asm.ClassesToTransform.FORGE_ORE_DICTIONARY; +import static gtPlusPlus.preloader.asm.ClassesToTransform.GALACTICRAFT_ENTITY_AUTO_ROCKET; +import static gtPlusPlus.preloader.asm.ClassesToTransform.GALACTICRAFT_FLUID_UTILS; +import static gtPlusPlus.preloader.asm.ClassesToTransform.GALACTICRAFT_TILE_ENTITY_FUEL_LOADER; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_BASE_TILE_ENTITY; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_CHARGEPAD; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_ELECTRIC; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_GENERATOR; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_HEAT_GENERATOR; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_KINETIC_GENERATOR; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_LUMINATOR; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_MACHINE1; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_MACHINE2; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_MACHINE3; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_PERSONAL; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_ACCESS_HATCH; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_CHAMBER; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_FLUID_PORT; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_REDSTONE_PORT; +import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_VESSEL; +import static gtPlusPlus.preloader.asm.ClassesToTransform.LWJGL_KEYBOARD; +import static gtPlusPlus.preloader.asm.ClassesToTransform.MINECRAFT_GAMESETTINGS; +import static gtPlusPlus.preloader.asm.ClassesToTransform.MINECRAFT_GAMESETTINGS_OBF; +import static gtPlusPlus.preloader.asm.ClassesToTransform.THAUMCRAFT_ITEM_WISP_ESSENCE; +import static gtPlusPlus.preloader.asm.ClassesToTransform.TINKERS_FLUID_BLOCK; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java b/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java new file mode 100644 index 0000000000..9aabff7a99 --- /dev/null +++ b/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java @@ -0,0 +1,72 @@ +package gtPlusPlus.recipes; + +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.reflect.AddGregtechRecipe; + +public class CokeAndPyrolyseOven { + + public static void onLoadComplete() { + convertPyroToCokeOven(); + } + + public static void postInit() { + Logger.INFO("Loading Recipes for Industrial Coking Oven."); + // Wood to Charcoal + // Try use all woods found + ArrayList<ItemStack> aLogData = OreDictionary.getOres("logWood"); + for (ItemStack stack : aLogData) { + AddGregtechRecipe.addCokeAndPyrolyseRecipes( + ItemUtils.getSimpleStack(stack, 20), + 20, + GT_ModHandler.getSteam(1000), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L), + FluidUtils.getFluidStack("fluid.coalgas", 1440), + 60, + 30); + } + + // Coal to Coke + AddGregtechRecipe.addCokeAndPyrolyseRecipes( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), + 22, + GT_ModHandler.getSteam(1000), + ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10), + FluidUtils.getFluidStack("fluid.coalgas", 2880), + 30, + 120); + + // Coke & Coal + CORE.RA.addCokeOvenRecipe( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), + ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6), + GT_ModHandler.getSteam(2000), + FluidUtils.getFluidStack("fluid.coalgas", 5040), + ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14), + 60 * 20, + 240); + + } + + private static void convertPyroToCokeOven() { + int aCount = 0; + for (GT_Recipe g : GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes.mRecipeList) { + if (AddGregtechRecipe.importPyroRecipe(g)) { + aCount++; + } + } + Logger.INFO("Converted " + aCount + " Pyrolyse recipes into Industrial Coke Oven recipes."); + } +} diff --git a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java new file mode 100644 index 0000000000..aae5f988f3 --- /dev/null +++ b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java @@ -0,0 +1,132 @@ +package gtPlusPlus.recipes; + +import static gtPlusPlus.core.util.minecraft.MaterialUtils.getMaterialName; + +import java.util.Collection; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.ArrayUtils; + +import advsolar.common.AdvancedSolarPanel; +import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; +import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Recipe; +import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; + +public class RecipeRemovals { + + public static void postInit() { + if (Mods.AdvancedSolarPanel.isModLoaded()) { + RecipeUtils.removeRecipeByOutput(ItemUtils.getSimpleStack(AdvancedSolarPanel.blockMolecularTransformer)); + } + } + + public static void onLoadComplete() { + removeCrudeTurbineRotors(); + removeGTRareEarthRecipe(); + } + + // Doesn't actually remove recipes, just hide them + private static void removeCrudeTurbineRotors() { + int aRemoved = 0; + int CUT = CORE.turbineCutoffBase; + Item aU; + Collection<GT_Recipe> aAssRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList; + // 170, 172, 174, 176 + if (aAssRecipes.size() > 0) { + for (GT_Recipe aG : aAssRecipes) { + if (ArrayUtils.isNotEmpty(aG.mOutputs)) { + for (ItemStack aI : aG.mOutputs) { + if (aI == null) { + continue; + } + aU = aI.getItem(); + if (aU == null) { + continue; + } + if (aU instanceof GT_MetaGenerated_Tool_01) { + int aMeta = aI.getItemDamage(); + // Found a Turbine + if (aMeta >= 170 && aMeta <= 176) { + int aCutoff; + String aType; + switch (aMeta) { + case 170: + aCutoff = CUT; + aType = "Small "; + break; + case 172: + aCutoff = 2 * CUT; + aType = ""; + break; + case 174: + aCutoff = 3 * CUT; + aType = "Large "; + break; + default: // 176 + aCutoff = 4 * CUT; + aType = "Huge "; + break; + } + Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI); + Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI); + long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(aI); + if (rotorDurabilityMax < aCutoff) { + Logger.WARNING( + "[Turbine Cleanup] " + getMaterialName(aMainMaterial) + + " " + + aType + + "Turbines have " + + rotorDurabilityMax + + ", which is below the cutoff durability of " + + aCutoff + + ", disabling."); + aG.mEnabled = false; + aG.mHidden = true; + aG.mCanBeBuffered = false; + aRemoved++; + } else { + break; + } + } + } + } + } + } + } + + Logger.INFO("Removed " + aRemoved + " useless Turbines."); + } + + private static void removeGTRareEarthRecipe() { + + Logger.INFO("Processing Gregtech recipe maps, removing recipes to suit GT++."); + // Remove Rare Earth Centrifuging + // 1 Rare Earth Dust - 25% chance for small piles of: neodymium, yttrium, lanthanum, cerium, cadmium, and + // caesium + // Replaced by advanced sifting recipe. + GT_Recipe aRareEarthCentrifuging = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe( + null, + false, + 20, + new FluidStack[] {}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1) }); + if (aRareEarthCentrifuging != null && aRareEarthCentrifuging.mEnabled) { + aRareEarthCentrifuging.mEnabled = false; + aRareEarthCentrifuging.mHidden = true; + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.remove(aRareEarthCentrifuging); + GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.remove(aRareEarthCentrifuging); + Logger.INFO("Removed vanilla GT Rare Earth processing."); + } + + } +} diff --git a/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java b/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java deleted file mode 100644 index 72c6025323..0000000000 --- a/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.xmod.advsolar; - -import advsolar.common.AdvancedSolarPanel; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; - -public class HANDLER_AdvSolar { - - public static void postInit() { - if (LoadedMods.AdvancedSolarPanel) { - RecipeUtils.removeRecipeByOutput(ItemUtils.getSimpleStack(AdvancedSolarPanel.blockMolecularTransformer)); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java index 9207749655..9ca5488280 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java @@ -1,6 +1,5 @@ package gtPlusPlus.xmod.bartcrops; -import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -10,10 +9,6 @@ public class HANDLER_CropsPlusPlus { LoaderOfTheCrops.load(preinit); } - public static void init(FMLInitializationEvent init) { - // registerItems(); - } - public static void postInit(FMLPostInitializationEvent postinit) { LoaderOfTheCrops.register(); LoaderOfTheCrops.registerBaseSeed(); diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index 279300487f..e2951c8394 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bartcrops.abstracts; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -11,7 +13,6 @@ import net.minecraft.util.IIcon; import speiger.src.crops.api.ICropCardInfo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import ic2.api.crops.CropCard; import ic2.api.crops.ICropTile; @@ -22,7 +23,8 @@ public abstract class BaseCrop extends CropCard implements ICropCardInfo { public void registerSprites(IIconRegister iconRegister) { this.textures = new IIcon[this.maxSize()]; for (int i = 1; i <= this.textures.length; ++i) { - this.textures[i - 1] = iconRegister.registerIcon(CORE.MODID + ":crop/blockCrop." + this.name() + "." + i); + this.textures[i - 1] = iconRegister + .registerIcon(GTPlusPlus.ID + ":crop/blockCrop." + this.name() + "." + i); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java index 39aee4681f..918ec9621d 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java +++ b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.bop; +import static gregtech.api.enums.Mods.BiomesOPlenty; + import java.lang.reflect.Field; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; @@ -33,19 +34,14 @@ public class HANDLER_BiomesOPlenty { public static void preInit() { BOP_Block_Registrator.run(); - if (LoadedMods.BiomesOPlenty) { + if (BiomesOPlenty.isModLoaded()) { setFields(); registerPineconeToOreDict(); } } - public static void init() { - if (LoadedMods.BiomesOPlenty) {} - } - public static void postInit() { BOP_Block_Registrator.recipes(); - if (LoadedMods.BiomesOPlenty) {} } private static void registerPineconeToOreDict() { diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 8c8b712c07..22732d647a 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.Random; @@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -93,7 +94,7 @@ public class LeavesBase extends BlockLeaves { this.leafTextures[i] = new IIcon[leafType[i].length]; for (int j = 0; j < leafType[i].length; ++j) { this.leafTextures[i][j] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); } } setVanillaVariable(this.field_150129_M, this.leafTextures); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 10f217a42d..3547c8b5bf 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.BlockLog; @@ -15,7 +17,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -74,9 +75,9 @@ public abstract class LogBase extends BlockLog { this.textureTop = new IIcon[treeType.length]; for (int i = 0; i < this.textureSide.length; ++i) { - this.textureSide[i] = iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i]); + this.textureSide[i] = iIcon.registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i]); this.textureTop[i] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); } setVanillaVariable(this.field_150167_a, this.textureSide); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index 6a8e1f9cc7..75c0d5bd59 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.Random; @@ -23,7 +25,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -180,7 +181,7 @@ public class SaplingBase extends BlockSapling { public void registerBlockIcons(IIconRegister iIcon) { for (int i = 0; i < saplingTextures.length; ++i) { saplingTextures[i] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); } } } diff --git a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java index c652a427ab..1c13f16a4b 100644 --- a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java +++ b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java @@ -1,13 +1,14 @@ package gtPlusPlus.xmod.cofh; +import static gregtech.api.enums.Mods.COFHCore; + import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.general.RF2EU_Battery; -import gtPlusPlus.core.lib.LoadedMods; public class HANDLER_COFH { public static void initItems() { - if (LoadedMods.CoFHCore) { + if (COFHCore.isModLoaded()) { ModItems.RfEuBattery = new RF2EU_Battery(); } } diff --git a/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java b/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java deleted file mode 100644 index 446f232beb..0000000000 --- a/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java +++ /dev/null @@ -1,68 +0,0 @@ -package gtPlusPlus.xmod.computronics; - -import gregtech.GT_Mod; -import gregtech.api.enums.*; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.lib.LoadedMods; - -public class HANDLER_Computronics { - - public static void preInit() { - if (LoadedMods.Computronics) {} - } - - public static void init() { - if (LoadedMods.Computronics) { - - } else { - GT_Mod.gregtechproxy.addFluid( - "Argon", - "Argon", - Materials.Argon, - 2, - 295, - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - 1000); - GT_Values.RA.addDistilleryRecipe( - ItemList.Circuit_Integrated.getWithDamage(0L, 1L), - Materials.Air.getGas(1000L), - Materials.Nitrogen.getGas(780L), - 1600, - 32, - false); - GT_Values.RA.addDistilleryRecipe( - ItemList.Circuit_Integrated.getWithDamage(0L, 2L), - Materials.Air.getGas(1000L), - Materials.Oxygen.getGas(210L), - 1600, - 128, - false); - GT_Values.RA.addDistilleryRecipe( - ItemList.Circuit_Integrated.getWithDamage(0L, 3L), - Materials.Air.getGas(1000L), - Materials.Argon.getGas(5L), - 6000, - 512, - false); - GT_Values.RA.addElectrolyzerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Air, 1L), - null, - null, - Materials.Air.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - null, - null, - null, - null, - null, - null, - 800, - 30); - } - } - - public static void postInit() { - if (LoadedMods.Computronics) {} - } -} diff --git a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index e586bbc0c4..caa49973d7 100644 --- a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.eio.handler; +import static gregtech.api.enums.Mods.EnderIO; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; import java.lang.reflect.Field; @@ -9,7 +10,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gregtech.api.enums.Materials; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; @@ -22,7 +22,7 @@ public class HandlerTooltip_EIO { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event) { // Is EIO loaded? - if (!disableEnderIOIngotTooltips && LoadedMods.EnderIO) { + if (!disableEnderIOIngotTooltips && EnderIO.isModLoaded()) { // Is the EIO Ingot Item null? // If it is, reflect in. diff --git a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java index 4bf3b3a840..0d07901310 100644 --- a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java @@ -1,6 +1,10 @@ package gtPlusPlus.xmod.eio.material; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.material.state.MaterialState; public class MaterialEIO { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index 1ad9fbad13..0b9702acb1 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.forestry; +import static gregtech.api.enums.Mods.ExtraTrees; +import static gregtech.api.enums.Mods.Forestry; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -13,7 +16,7 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; import forestry.arboriculture.genetics.TreeDefinition; -import gtPlusPlus.core.lib.LoadedMods; +import gregtech.api.enums.Mods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; @@ -23,39 +26,35 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr public class HANDLER_FR { public static void preInit() { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { FR_ItemRegistry.Register(); } } - public static void Init() { - if (LoadedMods.Forestry) {} - } - public static void postInit() { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { FR_Gregtech_Recipes.registerItems(); new GTPP_Bees(); mapForestrySaplingToLog(); } - if (LoadedMods.ExtraTrees) { + if (ExtraTrees.isModLoaded()) { mapExtraTreesSaplingToLog(); } } public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z, final Block block) { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { createBlockBreakParticles_INTERNAL(world, x, y, z, block); } return false; } - @Optional.Method(modid = "Forestry") + @Optional.Method(modid = Mods.Names.FORESTRY) private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z, final Block block) { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { Class oClass; try { oClass = ReflectionUtils.getClass("forestry.core.proxy.ProxyCommon"); @@ -77,7 +76,7 @@ public class HANDLER_FR { } } - @Optional.Method(modid = "Forestry") + @Optional.Method(modid = Mods.Names.FORESTRY) private static void mapForestrySaplingToLog() { for (TreeDefinition value : TreeDefinition.values()) { ItemStack aSaplingStack = value.getMemberStack(EnumGermlingType.SAPLING); @@ -100,7 +99,7 @@ public class HANDLER_FR { } } - @Optional.Method(modid = "ExtraTrees") + @Optional.Method(modid = Mods.Names.EXTRA_TREES) private static void mapExtraTreesSaplingToLog() { for (ExtraTreeSpecies value : ExtraTreeSpecies.values()) { ItemStack aSaplingStack = TreeManager.treeRoot diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java index 00799a1030..4c8912b21e 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java @@ -10,12 +10,22 @@ import net.minecraftforge.common.BiomeDictionary.Type; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.text.WordUtils; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IAlleleBeeSpeciesCustom; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.apiculture.genetics.*; +import forestry.apiculture.genetics.Bee; +import forestry.apiculture.genetics.BeeDefinition; +import forestry.apiculture.genetics.BeeVariation; +import forestry.apiculture.genetics.IBeeDefinition; import forestry.core.genetics.alleles.AlleleHelper; import gregtech.loaders.misc.GT_BeeDefinition; import gtPlusPlus.api.objects.Logger; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java index f5d37817ff..d27f478169 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.custom; +import static gregtech.api.enums.Mods.Forestry; + import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -10,9 +12,6 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.reflect.FieldUtils; -import cpw.mods.fml.common.Loader; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; import gregtech.GT_Mod; import gregtech.api.enums.Materials; import gtPlusPlus.api.objects.Logger; @@ -48,15 +47,7 @@ public class GTPP_Bees { // public static GTPP_Branch_Definition definition; public GTPP_Bees() { - if (Loader.isModLoaded("Forestry") /* && tryGetBeesBoolean() */) { - - for (IAllele o : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { - // Utils.LOG_DEBUG_BEES(" =================================================="); - // Utils.LOG_DEBUG_BEES(" Name: "+o.getName()); - // Utils.LOG_DEBUG_BEES(" Name: "+o.getUnlocalizedName()); - // Utils.LOG_DEBUG_BEES(" getUID: "+o.getUID()); - // Utils.LOG_DEBUG_BEES(" isDominant: "+o.isDominant()); - } + if (Forestry.isModLoaded()) { // Set Materials and Comb stacks from GT via Reflection setMaterials(); @@ -75,20 +66,13 @@ public class GTPP_Bees { private void setCustomItems() { dropForceGem = new BaseItemMisc("Force", new short[] { 250, 250, 20 }, 64, MiscTypes.GEM, null); - // MaterialUtils.tryEnableMaterial(Materials.Force); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Force); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Force); dropBiomassBlob = new BaseItemMisc("Biomass", new short[] { 33, 225, 24 }, 64, MiscTypes.DROP, null); dropEthanolBlob = new BaseItemMisc("Ethanol", new short[] { 255, 128, 0 }, 64, MiscTypes.DROP, null); // Nikolite may not exist, so lets make it. dropNikoliteDust = ItemUtils .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2]; - // MaterialUtils.tryEnableMaterial(Materials.Nikolite); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Nikolite); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Nikolite); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.plate, Materials.Nikolite); - // MaterialUtils.tryEnableMaterial(Materials.BlueAlloy); + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) { new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0); } @@ -160,9 +144,6 @@ public class GTPP_Bees { if (Comb_Stone == null) { Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone); } - /* - * } else { Utils.LOG_BEES("oCombObject was not an instance of gregtech.common.items.ItemComb"); } - */ } catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException | SecurityException | InvocationTargetException e) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java index 43ab2fb191..a7896ab662 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.custom; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,10 +15,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import gregtech.GT_Mod; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemCustomComb extends Item { @@ -29,7 +33,7 @@ public class ItemCustomComb extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.comb"); - GameRegistry.registerItem(this, "gtpp.comb", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID); } public ItemStack getStackForType(CustomCombs type) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java index eac0e5f7b6..31671afaa1 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java @@ -14,7 +14,11 @@ import java.util.Collection; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeekeepingMode; +import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.InventoryBeeHousing; import forestry.apiculture.inventory.IApiaryInventory; import forestry.core.access.IAccessHandler; 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 fb77c4c2e0..8af5b97b00 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,7 @@ 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.LoadedMods; +import gregtech.api.enums.Mods; public class FR_ItemRegistry { @@ -45,7 +45,7 @@ public class FR_ItemRegistry { public static MB_ItemFrame hiveFrameStalilize; public static MB_ItemFrame hiveFrameArborist; - @Optional.Method(modid = "Forestry") + @Optional.Method(modid = Mods.Names.FORESTRY) public static void Register() { // Forestry Frames @@ -93,15 +93,6 @@ public class FR_ItemRegistry { ChestGenHooks.DUNGEON_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12)); - // Extra Bee like Frames - if (!LoadedMods.ExtraBees) { - hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common, ""); - hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common, ""); - hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, ""); - hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, ""); - hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame."); - } - // Frame Items added by bartimaeusnek hiveFrameDecay = new MB_ItemFrame( MB_FrameType.DECAYING, diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java index d2f3747cc3..70856235dd 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,9 +14,12 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class MB_ItemFrame extends Item implements IHiveFrame { @@ -49,7 +54,7 @@ public class MB_ItemFrame extends Item implements IHiveFrame { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + this.type.getName()); + this.itemIcon = par1IconRegister.registerIcon(GTPlusPlus.ID + ":frame" + this.type.getName()); } // --------- IHiveFrame functions ----------------------------------------- diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java index 9ca749e599..6b075c2b60 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -31,7 +34,7 @@ public class GTPP_Comb extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.comb"); - GameRegistry.registerItem(this, "gtpp.comb", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_CombType type) { @@ -96,13 +99,13 @@ public class GTPP_Comb extends Item { addChemicalRecipe( GTPP_CombType.DRAGONBLOOD, - new ItemStack[] { GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0), GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD), GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) }, new int[] { 3000, 1500, 500 }); addChemicalRecipe( GTPP_CombType.FORCE, - new ItemStack[] { GT_ModHandler.getModItem("Forestry", "beeswax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0), GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE), GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) }, new int[] { 5000, 3000, 1000 }); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java index 873c2859c8..f9fef391e8 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,7 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; @@ -29,7 +30,7 @@ public class GTPP_Drop extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.drop"); - GameRegistry.registerItem(this, "gtpp.drop", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.drop", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_DropType type) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java index ffd1ec7cbb..f8f403ed38 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType; public class GTPP_Pollen extends Item { @@ -25,7 +26,7 @@ public class GTPP_Pollen extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.pollen"); - GameRegistry.registerItem(this, "gtpp.pollen", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.pollen", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_PollenType type) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java index 78425a96d0..d2ce94ce54 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -27,7 +29,7 @@ public class GTPP_Propolis extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.propolis"); - GameRegistry.registerItem(this, "gtpp.propolis", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.propolis", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_PropolisType type) { 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_Recipes.java index 3ba28fd98c..f16abb573d 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.forestry.bees.recipe; +import static gregtech.api.enums.Mods.MagicBees; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; @@ -64,7 +65,7 @@ public class FR_Gregtech_Recipes { rod_Uranium, rod_Uranium, hiveFrameMutagenic); - if (LoadedMods.MagicBees) { + if (MagicBees.isModLoaded()) { RecipeUtils.addShapelessGregtechRecipe( new ItemStack[] { hiveFrameVoid }, ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1)); @@ -81,57 +82,6 @@ public class FR_Gregtech_Recipes { "stickBlueSteel", hiveFrameBusy); - if (!LoadedMods.ExtraBees) { - // Extra Bee Like Frames - RecipeUtils.addShapedRecipe( - null, - itemCocoaBeans, - null, - itemCocoaBeans, - hiveFrameImpregnated, - itemCocoaBeans, - null, - itemCocoaBeans, - null, - hiveFrameCocoa); - - RecipeUtils.addShapedRecipe( - hiveFrameImpregnated, - blockIronBars, - null, - null, - null, - null, - null, - null, - null, - hiveFrameCaged); - - RecipeUtils.addShapedRecipe( - hiveFrameImpregnated, - blockSoulSand, - null, - null, - null, - null, - null, - null, - null, - hiveFrameSoul); - - RecipeUtils.addShapedRecipe( - null, - itemClayDust, - null, - itemClayDust, - hiveFrameImpregnated, - itemClayDust, - null, - itemClayDust, - null, - hiveFrameClay); - } - // Frame Items added by bartimaeusnek RecipeUtils.addShapedGregtechRecipe( ItemUtils.getItemStackOfAmountFromOreDict("stickLongTumbaga", 1), diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java index fef7d1fe7e..ee3d8d05ef 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java @@ -1,7 +1,12 @@ package gtPlusPlus.xmod.forestry.bees.registry; -import static forestry.api.apiculture.EnumBeeChromosome.*; +import static forestry.api.apiculture.EnumBeeChromosome.EFFECT; +import static forestry.api.apiculture.EnumBeeChromosome.HUMIDITY_TOLERANCE; +import static forestry.api.apiculture.EnumBeeChromosome.LIFESPAN; +import static forestry.api.apiculture.EnumBeeChromosome.SPECIES; +import static forestry.api.apiculture.EnumBeeChromosome.TEMPERATURE_TOLERANCE; import static forestry.api.core.EnumHumidity.ARID; +import static gregtech.api.enums.Mods.Forestry; import java.lang.reflect.Field; import java.util.Arrays; @@ -13,16 +18,25 @@ import net.minecraftforge.common.BiomeDictionary.Type; import org.apache.commons.lang3.text.WordUtils; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.*; -import forestry.apiculture.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleFlowers; +import forestry.apiculture.genetics.Bee; +import forestry.apiculture.genetics.BeeVariation; +import forestry.apiculture.genetics.IBeeDefinition; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele.Lifespan; import forestry.core.genetics.alleles.EnumAllele.Tolerance; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; @@ -39,7 +53,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", STANDALONE.DRAGON_METAL, true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.DRAGONBLOOD), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java index 75b43ff8f1..a5d351ea09 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java @@ -8,7 +8,11 @@ import net.minecraft.world.World; import org.apache.commons.lang3.reflect.FieldUtils; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java index 56383192c0..69d9319884 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java @@ -1,16 +1,21 @@ package gtPlusPlus.xmod.forestry.bees.registry; -import static gregtech.api.enums.GT_Values.MOD_ID_FR; +import static gregtech.api.enums.Mods.Forestry; import java.util.HashMap; -import cpw.mods.fml.common.Loader; import gregtech.GT_Mod; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.forestry.bees.handler.*; -import gtPlusPlus.xmod.forestry.bees.items.output.*; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Comb; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Drop; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Pollen; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Propolis; public class GTPP_Bees { @@ -32,7 +37,7 @@ public class GTPP_Bees { public static HashMap<Integer, GTPP_CombType> sCombMappings = new HashMap<Integer, GTPP_CombType>(); public GTPP_Bees() { - if (Loader.isModLoaded(MOD_ID_FR) && GT_Mod.gregtechproxy.mGTBees) { + if (Forestry.isModLoaded() && GT_Mod.gregtechproxy.mGTBees) { Logger.BEES("Creating required items."); propolis = new GTPP_Propolis(); pollen = new GTPP_Pollen(); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java index a55330b5df..4c367e25d4 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java @@ -1,6 +1,17 @@ package gtPlusPlus.xmod.forestry.bees.registry; -import static forestry.api.apiculture.EnumBeeChromosome.*; +import static forestry.api.apiculture.EnumBeeChromosome.CAVE_DWELLING; +import static forestry.api.apiculture.EnumBeeChromosome.EFFECT; +import static forestry.api.apiculture.EnumBeeChromosome.FERTILITY; +import static forestry.api.apiculture.EnumBeeChromosome.FLOWERING; +import static forestry.api.apiculture.EnumBeeChromosome.FLOWER_PROVIDER; +import static forestry.api.apiculture.EnumBeeChromosome.HUMIDITY_TOLERANCE; +import static forestry.api.apiculture.EnumBeeChromosome.LIFESPAN; +import static forestry.api.apiculture.EnumBeeChromosome.NOCTURNAL; +import static forestry.api.apiculture.EnumBeeChromosome.SPEED; +import static forestry.api.apiculture.EnumBeeChromosome.TEMPERATURE_TOLERANCE; +import static forestry.api.apiculture.EnumBeeChromosome.TERRITORY; +import static forestry.api.apiculture.EnumBeeChromosome.TOLERANT_FLYER; import java.util.Arrays; import java.util.function.Consumer; @@ -11,7 +22,13 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.alleles.AlleleHelper; -import forestry.core.genetics.alleles.EnumAllele.*; +import forestry.core.genetics.alleles.EnumAllele.Fertility; +import forestry.core.genetics.alleles.EnumAllele.Flowering; +import forestry.core.genetics.alleles.EnumAllele.Flowers; +import forestry.core.genetics.alleles.EnumAllele.Lifespan; +import forestry.core.genetics.alleles.EnumAllele.Speed; +import forestry.core.genetics.alleles.EnumAllele.Territory; +import forestry.core.genetics.alleles.EnumAllele.Tolerance; public enum GTPP_BranchDefinition { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java index 5a2263fdac..56df184fc1 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java @@ -8,7 +8,11 @@ ******************************************************************************/ package gtPlusPlus.xmod.forestry.bees.tileentities; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -16,7 +20,10 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBeeHousingInventory; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.ApiaryBeeListener; import forestry.apiculture.ApiaryBeeModifier; import forestry.apiculture.IApiary; diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java deleted file mode 100644 index 1cbf4a4787..0000000000 --- a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java +++ /dev/null @@ -1,31 +0,0 @@ -package gtPlusPlus.xmod.galacticraft; - -import gtPlusPlus.core.lib.LoadedMods; - -public class HANDLER_GalactiCraft { - - // private static final HashMap<String, BaseSolarSystem> mSystemsCache = new HashMap<String, BaseSolarSystem>(); - - public static void preInit() { - if (LoadedMods.GalacticraftCore) { - // mSystemsCache.put("HD10180", new SystemHD10180()); - /* - * for (BaseSolarSystem solar : mSystemsCache.values()) { - * Logger.SPACE("Running 'pre-init' for "+solar.mSystemName); solar.preInit(); } - */ - } - } - - public static void init() { - if (LoadedMods.GalacticraftCore) { - /* - * for (BaseSolarSystem solar : mSystemsCache.values()) { - * Logger.SPACE("Running 'init' for "+solar.mSystemName); solar.init(); } - */ - } - } - - public static void postInit() { - if (LoadedMods.GalacticraftCore) {} - } -} diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java index 103699e228..54cde6194c 100644 --- a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java +++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.galacticraft.handler; +import static gregtech.api.enums.Mods.GalacticraftCore; + import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedHashMap; @@ -11,7 +13,6 @@ import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gtPlusPlus.core.item.chemistry.RocketFuels; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.asm.AsmConfig; @@ -29,7 +30,7 @@ public class HandlerTooltip_GC { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event) { - if (LoadedMods.GalacticraftCore && AsmConfig.enableGcFuelChanges) { + if (GalacticraftCore.isModLoaded() && AsmConfig.enableGcFuelChanges) { if (mBlock == null) { try { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 0d83b88b8c..3828a66353 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -1,53 +1,38 @@ package gtPlusPlus.xmod.gregtech; -import static gtPlusPlus.core.recipe.common.CI.bits; -import static gtPlusPlus.core.util.minecraft.MaterialUtils.getMaterialName; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.Element; -import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_ModHandler.RecipeBits; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.behaviors.Behaviour_DataOrb; import gtPlusPlus.api.helpers.GregtechPlusPlus_API.Multiblock_API; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.minecraft.multi.NoEUBonusMultiBehaviour; import gtPlusPlus.api.objects.minecraft.multi.NoOutputBonusMultiBehaviour; import gtPlusPlus.api.objects.minecraft.multi.NoSpeedBonusMultiBehaviour; import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.core.util.reflect.AddGregtechRecipe; import gtPlusPlus.everglades.gen.gt.WorldGen_GT; +import gtPlusPlus.recipes.CokeAndPyrolyseOven; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; @@ -67,7 +52,6 @@ import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_MolecularTransformer; -import gtPlusPlus.xmod.gregtech.recipes.RecipesToRemove; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; public class HANDLER_GT { @@ -102,11 +86,6 @@ public class HANDLER_GT { if (CORE.ConfigSwitches.enableSkookumChoochers) { sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance(); } - - // Generates recipes for all gregtech smelting and alloy smelting combinations. - // RecipeGen_BlastSmelterGT.generateRecipes(); - // new RecipeGen_BlastSmelterGT_Ex(); - } public static void postInit() { @@ -145,18 +124,13 @@ public class HANDLER_GT { } public static void onLoadComplete(FMLLoadCompleteEvent event) { - removeCrudeTurbineRotors(); - if (ConfigSwitches.enableHarderRecipesForHighTierCasings) { - removeOldHighTierCasingRecipes(); - } - RecipesToRemove.go(); - convertPyroToCokeOven(); + CokeAndPyrolyseOven.onLoadComplete(); generateElementalDuplicatorRecipes(); Meta_GT_Proxy.fixIC2FluidNames(); GT_Computercube_Description.addStandardDescriptions(); GT_ComputerCube_Setup.init(); RecipeLoader_AlgaeFarm.generateRecipes(); - if (LoadedMods.AdvancedSolarPanel) { + if (AdvancedSolarPanel.isModLoaded()) { RecipeLoader_MolecularTransformer.run(); } } @@ -217,303 +191,4 @@ public class HANDLER_GT { + GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size() + " Replicator recipes."); } - - private static void convertPyroToCokeOven() { - int aCount = 0; - for (GT_Recipe g : GT_Recipe_Map.sPyrolyseRecipes.mRecipeList) { - if (AddGregtechRecipe.importPyroRecipe(g)) { - aCount++; - } - } - Logger.INFO("Converted " + aCount + " Pyrolyse recipes into Industrial Coke Oven recipes."); - } - - private static GT_Recipe replaceItemInRecipeWithAnother(GT_Recipe aRecipe, ItemStack aExisting, - ItemStack aNewItem) { - ItemStack[] aInputItemsCopy = aRecipe.mInputs; - String aOutputName = ItemUtils.getItemName(aRecipe.mOutputs[0]); - boolean aDidChange = false; - Logger.INFO("Attempting to Modify Recipe for " + aOutputName); - for (int i = 0; i < aRecipe.mInputs.length; i++) { - ItemStack aCurrentInputSlot = aRecipe.mInputs[i]; - if (aCurrentInputSlot != null) { - if (GT_Utility.areStacksEqual(aCurrentInputSlot, aExisting, true)) { - aInputItemsCopy[i] = ItemUtils.getSimpleStack(aNewItem, aCurrentInputSlot.stackSize); - aDidChange = true; - } - } - } - if (aDidChange) { - aRecipe.mInputs = aInputItemsCopy; - Logger.INFO("Modifed Recipe for " + aOutputName); - return aRecipe; - } else { - Logger.INFO("Failed to Modify Recipe for " + aOutputName); - return aRecipe; - } - } - - private static void updateRecipeMap(GT_Recipe aOld, GT_Recipe aNew, GT_Recipe_Map aMap) { - RecipeUtils.removeGtRecipe(aOld, aMap); - RecipeUtils.addGtRecipe(aNew, aMap); - Logger.INFO("Updating recipe map: " + aMap.mNEIName); - Logger.INFO("Removed Recipe with hash: " + aOld.hashCode()); - Logger.INFO("Added Recipe with hash: " + aNew.hashCode()); - } - - private static void removeOldHighTierCasingRecipes() { - // Static objects to save memory - ItemStack aCasing_LUV = CI.machineCasing_LuV; - ItemStack aCasing_ZPM = CI.machineCasing_ZPM; - ItemStack aCasing_UV = CI.machineCasing_UV; - ItemStack aCasing_MAX = CI.machineCasing_MAX; - - ItemStack aHull_LUV = CI.machineHull_LuV; - ItemStack aHull_ZPM = CI.machineHull_ZPM; - ItemStack aHull_UV = CI.machineHull_UV; - ItemStack aHull_MAX = CI.machineHull_MAX; - - int aTier_LUV = 5; - int aTier_ZPM = 6; - int aTier_UV = 7; - // int aTier_MAX = 8; - - ItemStack[] aCasings = new ItemStack[] { aCasing_LUV, aCasing_ZPM, aCasing_UV, aCasing_MAX }; - ItemStack[] aHulls = new ItemStack[] { aHull_LUV, aHull_ZPM, aHull_UV, aHull_MAX }; - - // Remove Hand Crafting Recipes - - // Casings - Logger.INFO("Removing shaped crafting for Casings."); - RecipeUtils.removeRecipeByOutput(aCasing_LUV); - RecipeUtils.removeRecipeByOutput(aCasing_ZPM); - RecipeUtils.removeRecipeByOutput(aCasing_UV); - // RecipeUtils.removeRecipeByOutput(aCasing_MAX); - - // Hulls - Logger.INFO("Removing shaped crafting for Hulls."); - RecipeUtils.removeRecipeByOutput(aHull_LUV); - RecipeUtils.removeRecipeByOutput(aHull_ZPM); - RecipeUtils.removeRecipeByOutput(aHull_UV); - // RecipeUtils.removeRecipeByOutput(aHull_MAX); - - // Modify Assembler Recipes - Logger.INFO( - "Attempting to modify existing Assembly recipes for Casings & Hulls, this should provide best compatibility."); - int aUpdateCount = 0; - - AutoMap<Pair<GT_Recipe, GT_Recipe>> aDataToModify = new AutoMap<Pair<GT_Recipe, GT_Recipe>>(); - - Outer: for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) { - - if (r != null && r.mOutputs != null && r.mOutputs.length > 0) { - - GT_Recipe aOldRecipeCopy = r; - GT_Recipe aNewRecipe = r.copy(); - - // Casings - Inner: for (ItemStack aCasingObject : aCasings) { - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasingObject)) { - String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]); - Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName); - // Replace Chrome - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_LUV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), - ELEMENT.getInstance().SELENIUM.getPlate(1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Iridium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_ZPM)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), - CI.getPlate(aTier_ZPM, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Osmium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_UV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), - CI.getPlate(aTier_UV, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } else { - continue Inner; - } - } - } - - // Hulls - Inner: for (ItemStack aHullObject : aHulls) { - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHullObject)) { - String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]); - Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName); - // Replace Chrome - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_LUV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), - ELEMENT.getInstance().SELENIUM.getPlate(1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Iridium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_ZPM)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), - CI.getPlate(aTier_ZPM, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Osmium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_UV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), - CI.getPlate(aTier_UV, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } else { - continue Inner; - } - } - } - } - } - - Logger.INFO("There is " + aUpdateCount + " recipes flagged for update."); - - if (aUpdateCount > 0) { - for (Pair<GT_Recipe, GT_Recipe> g : aDataToModify) { - updateRecipeMap(g.getKey(), g.getValue(), GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); - } - Logger.INFO("Modified " + aUpdateCount + " recipes."); - } - - Logger.INFO("Adding new Shaped recipes for Casings."); - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_LuV.get(1), - bits, - new Object[] { "PPP", "PwP", "PPP", 'P', ELEMENT.getInstance().SELENIUM.getPlate(1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_ZPM.get(1), - bits, - new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_ZPM, 1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_UV.get(1), - bits, - new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_UV, 1) }); - - if (!GT_Mod.gregtechproxy.mHardMachineCasings) { - Logger.INFO("Adding new easy Shaped recipes for Hulls."); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_LuV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "CMC", 'M', ItemList.Casing_LuV, 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_ZPM.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "CMC", 'M', ItemList.Casing_ZPM, 'C', - OrePrefixes.cableGt01.get(Materials.Naquadah) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_UV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "CMC", 'M', ItemList.Casing_UV, 'C', - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy) }); - } else { - - Materials aPolytetrafluoroethylene = MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"); - - Logger.INFO("Adding new hard Shaped recipes for Hulls."); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_LuV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "PHP", "CMC", 'M', ItemList.Casing_LuV, 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', - ELEMENT.getInstance().SELENIUM.getPlate(1), 'P', - OrePrefixes.plate.get(Materials.Plastic) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_ZPM.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "PHP", "CMC", 'M', ItemList.Casing_ZPM, 'C', - OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', CI.getPlate(aTier_ZPM, 1), 'P', - OrePrefixes.plate.get(aPolytetrafluoroethylene) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_UV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "PHP", "CMC", 'M', ItemList.Casing_UV, 'C', - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', CI.getPlate(aTier_UV, 1), 'P', - OrePrefixes.plate.get(aPolytetrafluoroethylene) }); - } - } - - private static int removeCrudeTurbineRotors() { - int aRemoved = 0; - int CUT = CORE.turbineCutoffBase; - Item aU; - Collection<GT_Recipe> aAssRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList; - // 170, 172, 174, 176 - if (aAssRecipes.size() > 0) { - recipe: for (GT_Recipe aG : aAssRecipes) { - if (aG.mOutputs != null && aG.mOutputs.length > 0) { - outputs: for (ItemStack aI : aG.mOutputs) { - if (aI == null) { - continue; - } - aU = aI.getItem(); - if (aU == null) { - continue; - } - if (aU instanceof GT_MetaGenerated_Tool_01) { - int aMeta = aI.getItemDamage(); - if (aMeta >= 170 && aMeta <= 176) { - // Found a Turbine - int aCutoff = aMeta == 170 ? CUT - : (aMeta == 172 ? CUT * 2 : (aMeta == 174 ? CUT * 3 : CUT * 4)); - String aType = aMeta == 170 ? "Small " - : (aMeta == 172 ? "" : (aMeta == 174 ? "Large " : "Huge ")); - Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI); - Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI); - long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(aI); - if (rotorDurabilityMax < aCutoff) { - Logger.WARNING( - "[Turbine Cleanup] " + getMaterialName(aMainMaterial) - + " " - + aType - + "Turbines have " - + rotorDurabilityMax - + ", which is below the cutoff durability of " - + aCutoff - + ", disabling."); - aG.mEnabled = false; - aG.mHidden = true; - aG.mCanBeBuffered = false; - aRemoved++; - } else { - break; - } - } - } - } - } - } - } - - Logger.INFO("Removed " + aRemoved + " useless Turbines."); - - return aRemoved; - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index f71e07f0a3..0b7e44ce14 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -1,21 +1,37 @@ package gtPlusPlus.xmod.gregtech.api.enums; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.B; +import static gregtech.api.enums.GT_Values.D2; +import static gregtech.api.enums.GT_Values.M; import static gtPlusPlus.core.util.Utils.getTcAspectStack; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.*; +import gregtech.api.enums.ConfigCategories; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Element; +import gregtech.api.enums.Materials; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.interfaces.*; +import gregtech.api.enums.TextureSet; +import gregtech.api.interfaces.IColorModulationContainer; +import gregtech.api.interfaces.ICondition; +import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.objects.GT_FluidStack; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.*; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; @@ -948,12 +964,6 @@ public enum GregtechOrePrefixes { ConfigCategories.Materials.blastinductionsmelter, tString, tMaterial.mBlastFurnaceTemp < 1500)) {} - // GT_ModHandler.ThermalExpansion.addSmelterBlastOre(tMaterial); - // tMaterial.mHandleMaterial = (tMaterial == Desh ? tMaterial.mHandleMaterial : tMaterial == Diamond || - // tMaterial == Thaumium ? Wood : tMaterial.contains(SubTag.BURNING) ? Blaze : - // tMaterial.contains(SubTag.MAGICAL) && tMaterial.contains(SubTag.CRYSTAL) && - // Loader.isModLoaded(MOD_ID_TC) ? Thaumium : tMaterial.getMass() > Element.Tc.getMass() * 2 ? - // TungstenSteel : tMaterial.getMass() > Element.Tc.getMass() ? Steel : Wood); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java index dee662ac20..1b9a88e230 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.enums; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; @@ -62,7 +63,7 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this); + this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this); } @Override @@ -92,7 +93,7 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + this.mIconName); + this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); } @Override @@ -146,8 +147,9 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this); - this.mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this + "_OVERLAY"); + this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this); + this.mOverlay = Meta_GT_Proxy.sItemIcons + .registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this + "_OVERLAY"); } public static class CustomIcon implements Interface_IconContainer, Runnable { @@ -172,8 +174,9 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName); - this.mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName + "_OVERLAY"); + this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); + this.mOverlay = Meta_GT_Proxy.sItemIcons + .registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java index 26de142e22..8cf0e88473 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.gui; -import static gtPlusPlus.core.lib.CORE.MODID; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -10,132 +10,148 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture; public class GTPP_UITextures { - public static final UITexture OVERLAY_SLOT_COAL = UITexture.fullImage(MODID, "gui/overlay_slot/coal"); + public static final UITexture OVERLAY_SLOT_COAL = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/coal"); public static final UITexture OVERLAY_SLOT_CANISTER_DARK = UITexture - .fullImage(MODID, "gui/overlay_slot/canister_dark"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/canister_dark"); public static final AdaptableUITexture BACKGROUND_YELLOW = AdaptableUITexture - .of(MODID, "gui/background/yellow", 176, 166, 4); + .of(GTPlusPlus.ID, "gui/background/yellow", 176, 166, 4); public static final AdaptableUITexture SLOT_ITEM_YELLOW = AdaptableUITexture - .of(MODID, "gui/slot/item_yellow", 18, 18, 1); + .of(GTPlusPlus.ID, "gui/slot/item_yellow", 18, 18, 1); public static final AdaptableUITexture[] SLOT_INVENTORY_MANAGER = new AdaptableUITexture[] { - AdaptableUITexture.of(MODID, "gui/slot/red", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/green", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/blue", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/cyan", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/magenta", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/yellow", 18, 18, 1), }; + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/red", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/green", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/blue", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/cyan", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/magenta", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/yellow", 18, 18, 1), }; - public static final UITexture BUTTON_STANDARD_BRONZE = UITexture.fullImage(MODID, "gui/button/standard_bronze"); - public static final UITexture BUTTON_STANDARD_16x16 = UITexture.fullImage(MODID, "gui/button/standard_16x16"); + public static final UITexture BUTTON_STANDARD_BRONZE = UITexture + .fullImage(GTPlusPlus.ID, "gui/button/standard_bronze"); + public static final UITexture BUTTON_STANDARD_16x16 = UITexture + .fullImage(GTPlusPlus.ID, "gui/button/standard_16x16"); - public static final UITexture OVERLAY_SLOT_WEED_EX = UITexture.fullImage(MODID, "gui/overlay_slot/weed_ex"); - public static final UITexture OVERLAY_SLOT_FERTILIZER = UITexture.fullImage(MODID, "gui/overlay_slot/fertilizer"); + public static final UITexture OVERLAY_SLOT_WEED_EX = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/weed_ex"); + public static final UITexture OVERLAY_SLOT_FERTILIZER = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/fertilizer"); public static final UITexture OVERLAY_SLOT_ELECTRIC_TOOL = UITexture - .fullImage(MODID, "gui/overlay_slot/electric_tool"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/electric_tool"); public static final UITexture OVERLAY_SLOT_PAGE_PRINTED_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_slot/page_printed_bronze"); - public static final UITexture OVERLAY_SLOT_ARROW = UITexture.fullImage(MODID, "gui/overlay_slot/arrow"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/page_printed_bronze"); + public static final UITexture OVERLAY_SLOT_ARROW = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow"); public static final UITexture OVERLAY_SLOT_ARROW_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_slot/arrow_bronze"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_bronze"); public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT = UITexture - .fullImage(MODID, "gui/overlay_slot/craft_output"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/craft_output"); public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_slot/craft_output_bronze"); - public static final UITexture OVERLAY_SLOT_PARK = UITexture.fullImage(MODID, "gui/overlay_slot/park"); - public static final UITexture OVERLAY_SLOT_PARK_BRONZE = UITexture.fullImage(MODID, "gui/overlay_slot/park_bronze"); - public static final UITexture OVERLAY_SLOT_INGOT = UITexture.fullImage(MODID, "gui/overlay_slot/ingot"); - public static final UITexture OVERLAY_SLOT_ARROW_4 = UITexture.fullImage(MODID, "gui/overlay_slot/arrow_4"); - public static final UITexture OVERLAY_SLOT_TURBINE = UITexture.fullImage(MODID, "gui/overlay_slot/turbine"); - public static final UITexture OVERLAY_SLOT_CHEST = UITexture.fullImage(MODID, "gui/overlay_slot/chest"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/craft_output_bronze"); + public static final UITexture OVERLAY_SLOT_PARK = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/park"); + public static final UITexture OVERLAY_SLOT_PARK_BRONZE = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/park_bronze"); + public static final UITexture OVERLAY_SLOT_INGOT = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/ingot"); + public static final UITexture OVERLAY_SLOT_ARROW_4 = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_4"); + public static final UITexture OVERLAY_SLOT_TURBINE = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/turbine"); + public static final UITexture OVERLAY_SLOT_CHEST = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/chest"); public static final UITexture[] OVERLAY_SLOT_INVENTORY_MANAGER_COLOR = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_slot/red"), UITexture.fullImage(MODID, "gui/overlay_slot/green"), - UITexture.fullImage(MODID, "gui/overlay_slot/blue"), UITexture.fullImage(MODID, "gui/overlay_slot/cyan"), - UITexture.fullImage(MODID, "gui/overlay_slot/magenta"), - UITexture.fullImage(MODID, "gui/overlay_slot/yellow"), }; + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/red"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/green"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/blue"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/cyan"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/magenta"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/yellow"), }; public static final UITexture[] OVERLAY_SLOT_INVENTORY_MANAGER_ARROW = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_red"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_green"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_blue"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_cyan"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_magenta"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_yellow"), }; + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_red"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_green"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_blue"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_cyan"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_magenta"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_yellow"), }; public static final UITexture PROGRESSBAR_FLUID_REACTOR = UITexture - .fullImage(MODID, "gui/progressbar/fluid_reactor"); - public static final UITexture PROGRESSBAR_BOILER_EMPTY = UITexture.fullImage(MODID, "gui/progressbar/boiler_empty"); - public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(MODID, "gui/progressbar/fuel"); - public static final UITexture PROGRESSBAR_ARROW_2 = UITexture.fullImage(MODID, "gui/progressbar/arrow_2"); + .fullImage(GTPlusPlus.ID, "gui/progressbar/fluid_reactor"); + public static final UITexture PROGRESSBAR_BOILER_EMPTY = UITexture + .fullImage(GTPlusPlus.ID, "gui/progressbar/boiler_empty"); + public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(GTPlusPlus.ID, "gui/progressbar/fuel"); + public static final UITexture PROGRESSBAR_ARROW_2 = UITexture.fullImage(GTPlusPlus.ID, "gui/progressbar/arrow_2"); public static final UITexture PROGRESSBAR_COMPUTER_ENERGY = UITexture - .fullImage(MODID, "gui/progressbar/computer_energy"); - public static final UITexture PROGRESSBAR_PSS_ENERGY = UITexture.fullImage(MODID, "gui/progressbar/pss_energy"); + .fullImage(GTPlusPlus.ID, "gui/progressbar/computer_energy"); + public static final UITexture PROGRESSBAR_PSS_ENERGY = UITexture + .fullImage(GTPlusPlus.ID, "gui/progressbar/pss_energy"); public static final AdaptableUITexture TAB_TITLE_YELLOW = AdaptableUITexture - .of(MODID, "gui/tab/title_yellow", 28, 28, 4); + .of(GTPlusPlus.ID, "gui/tab/title_yellow", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_ANGULAR_YELLOW = AdaptableUITexture - .of(MODID, "gui/tab/title_angular_yellow", 28, 28, 4); + .of(GTPlusPlus.ID, "gui/tab/title_angular_yellow", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_DARK_YELLOW = AdaptableUITexture - .of(MODID, "gui/tab/title_dark_yellow", 28, 28, 4); + .of(GTPlusPlus.ID, "gui/tab/title_dark_yellow", 28, 28, 4); public static final UITexture OVERLAY_BUTTON_HARVESTER_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/harvester_mode"); - public static final UITexture OVERLAY_BUTTON_FLUSH = UITexture.fullImage(MODID, "gui/overlay_button/flush"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/harvester_mode"); + public static final UITexture OVERLAY_BUTTON_FLUSH = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/flush"); public static final UITexture OVERLAY_BUTTON_FLUSH_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_button/flush_bronze"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/flush_bronze"); public static final UITexture OVERLAY_BUTTON_AUTOMATION = UITexture - .fullImage(MODID, "gui/overlay_button/automation"); - public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(MODID, "gui/overlay_button/lock"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/automation"); + public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/lock"); public static final UITexture[] OVERLAY_BUTTON_THROUGHPUT = IntStream.range(0, 4) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_THROUGHPUT - .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/throughput_" + i)) + .mapToObj(i -> UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/throughput_" + i)) .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture[] OVERLAY_BUTTON_MODE = IntStream.range(0, 10) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_MODES - .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/mode_" + i)).collect(Collectors.toList()) - .toArray(new UITexture[0]); + .mapToObj(i -> UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/mode_" + i)) + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture OVERLAY_BUTTON_COMPUTER_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/computer_mode"); - public static final UITexture OVERLAY_BUTTON_SAVE = UITexture.fullImage(MODID, "gui/overlay_button/save"); - public static final UITexture OVERLAY_BUTTON_LOAD = UITexture.fullImage(MODID, "gui/overlay_button/load"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/computer_mode"); + public static final UITexture OVERLAY_BUTTON_SAVE = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/save"); + public static final UITexture OVERLAY_BUTTON_LOAD = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/load"); public static final UITexture OVERLAY_BUTTON_NUCLEAR_SWITCH = UITexture - .fullImage(MODID, "gui/overlay_button/nuclear_switch"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/nuclear_switch"); public static final UITexture OVERLAY_BUTTON_ARROW_LEFT = UITexture - .fullImage(MODID, "gui/overlay_button/arrow_left"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/arrow_left"); public static final UITexture OVERLAY_BUTTON_ARROW_RIGHT = UITexture - .fullImage(MODID, "gui/overlay_button/arrow_right"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/arrow_right"); public static final UITexture[] OVERLAY_BUTTON_DIRECTION = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_button/bottom"), - UITexture.fullImage(MODID, "gui/overlay_button/top"), - UITexture.fullImage(MODID, "gui/overlay_button/north"), - UITexture.fullImage(MODID, "gui/overlay_button/south"), - UITexture.fullImage(MODID, "gui/overlay_button/west"), - UITexture.fullImage(MODID, "gui/overlay_button/east"), }; + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/bottom"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/top"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/north"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/south"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/west"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/east"), }; public static final UITexture[] OVERLAY_BUTTON_DIRECTION_GRAY = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_button/bottom_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/top_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/north_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/south_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/west_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/east_gray"), }; - public static final UITexture OVERLAY_BUTTON_TIP_GREEN = UITexture.fullImage(MODID, "gui/overlay_button/tip_green"); - public static final UITexture OVERLAY_BUTTON_TIP_RED = UITexture.fullImage(MODID, "gui/overlay_button/tip_red"); + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/bottom_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/top_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/north_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/south_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/west_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/east_gray"), }; + public static final UITexture OVERLAY_BUTTON_TIP_GREEN = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_button/tip_green"); + public static final UITexture OVERLAY_BUTTON_TIP_RED = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_button/tip_red"); public static final UITexture OVERLAY_BUTTON_ACTIVE_STATE = UITexture - .fullImage(MODID, "gui/overlay_button/active_state"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/active_state"); public static final UITexture OVERLAY_BUTTON_CHANGE_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/change_mode"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/change_mode"); public static final UITexture OVERLAY_BUTTON_PLUS_MINUS = UITexture - .fullImage(MODID, "gui/overlay_button/plus_minus"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/plus_minus"); - public static final UITexture PICTURE_WORKBENCH_CIRCLE = UITexture.fullImage(MODID, "gui/picture/workbench_circle"); - public static final UITexture PICTURE_ARROW_WHITE_DOWN = UITexture.fullImage(MODID, "gui/picture/arrow_white_down"); - public static final UITexture PICTURE_V202 = UITexture.fullImage(MODID, "gui/picture/v202"); - public static final UITexture PICTURE_COMPUTER_TOP = UITexture.fullImage(MODID, "gui/picture/computer_top"); - public static final UITexture PICTURE_COMPUTER_GRID = UITexture.fullImage(MODID, "gui/picture/computer_grid"); - public static final UITexture PICTURE_ARROWS_SEPARATE = UITexture.fullImage(MODID, "gui/picture/arrows_separate"); - public static final UITexture PICTURE_ARROWS_FUSION = UITexture.fullImage(MODID, "gui/picture/arrows_fusion"); + public static final UITexture PICTURE_WORKBENCH_CIRCLE = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/workbench_circle"); + public static final UITexture PICTURE_ARROW_WHITE_DOWN = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/arrow_white_down"); + public static final UITexture PICTURE_V202 = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/v202"); + public static final UITexture PICTURE_COMPUTER_TOP = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/computer_top"); + public static final UITexture PICTURE_COMPUTER_GRID = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/computer_grid"); + public static final UITexture PICTURE_ARROWS_SEPARATE = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/arrows_separate"); + public static final UITexture PICTURE_ARROWS_FUSION = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/arrows_fusion"); public static final UITexture PICTURE_REDSTONE_CIRCUIT_SCREEN = UITexture - .fullImage(MODID, "gui/picture/redstone_circuit_screen"); + .fullImage(GTPlusPlus.ID, "gui/picture/redstone_circuit_screen"); public static final UITexture PICTURE_ELECTRICITY_ERROR = UITexture - .fullImage(MODID, "gui/picture/electricity_error"); - public static final UITexture PICTURE_ELECTRICITY_FINE = UITexture.fullImage(MODID, "gui/picture/electricity_fine"); - public static final UITexture PICTURE_ENERGY_FRAME = UITexture.fullImage(MODID, "gui/picture/energy_frame"); + .fullImage(GTPlusPlus.ID, "gui/picture/electricity_error"); + public static final UITexture PICTURE_ELECTRICITY_FINE = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/electricity_fine"); + public static final UITexture PICTURE_ENERGY_FRAME = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/energy_frame"); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java index 3eefd1c314..01628d60d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java @@ -1,10 +1,15 @@ package gtPlusPlus.xmod.gregtech.api.items; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.dispenser.*; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.BehaviorProjectileDispense; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.dispenser.IPosition; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +29,6 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; /** @@ -53,7 +57,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { this.mTooltip = null; } this.setCreativeTab(AddToCreativeTab.tabMachines); - GameRegistry.registerItem(this, this.mName, CORE.MODID); + GameRegistry.registerItem(this, this.mName, GTPlusPlus.ID); BlockDispenser.dispenseBehaviorRegistry.putObject(this, new GT_Item_Dispense()); } @@ -75,7 +79,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister aIconRegister) { - this.mIcon = aIconRegister.registerIcon(CORE.MODID + ":" + this.mName); + this.mIcon = aIconRegister.registerIcon(GTPlusPlus.ID + ":" + this.mName); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java index aa4f6fb45f..db41fd1e9f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java @@ -1,8 +1,13 @@ package gtPlusPlus.xmod.gregtech.api.items; import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.Mods.GTPlusPlus; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.HashMap; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -27,7 +32,6 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { @@ -298,10 +302,10 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { if (this.mEnabledItems.get(i)) { for (byte k = 1; k < this.mIconList[i].length; k++) { this.mIconList[i][k] = aIconRegister - .registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i + "/" + k); + .registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName() + "/" + i + "/" + k); } this.mIconList[i][0] = aIconRegister - .registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i); + .registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName() + "/" + i); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java index 6ed72a8803..631e004178 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.items; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GT_Values.V; import java.util.ArrayList; import java.util.HashMap; @@ -21,10 +22,16 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import gregtech.api.enums.SubTag; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; -import ic2.api.item.*; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index 11a4c02fbb..5c92944345 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java @@ -29,6 +29,7 @@ import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.Optional; import gregtech.api.enchants.Enchantment_Radioactivity; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.IDamagableItem; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -42,10 +43,11 @@ import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, * null); */ -@Optional.InterfaceList({ @Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = "Forestry"), - @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = "Railcraft"), +@Optional.InterfaceList({ + @Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = Mods.Names.FORESTRY), + @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = Mods.Names.RAILCRAFT), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), - @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO") }) + @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) }) public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements IDamagableItem, IToolCrowbar, IToolWrench { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java index 77b407109e..a7bc99e85c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java @@ -28,7 +28,10 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; /** diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java index 6ed462d31f..c387c513a4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java @@ -17,7 +17,10 @@ import gregtech.api.enums.Materials; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gregtech.common.blocks.GT_Block_Ores; import gregtech.common.blocks.GT_TileEntity_Ores; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java index b1d0731521..d9eeb9d84b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java @@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import gregtech.api.gui.*; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java index edb9a357a7..61a8e62359 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java @@ -1,6 +1,9 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import gregtech.api.enums.*; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index d3b50f48fc..bb9f1a0e56 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1,9 +1,17 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; +import static gregtech.api.enums.Mods.TecTech; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map.Entry; +import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; @@ -50,7 +58,16 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.objects.GT_ItemStack; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_OreDictUnificator; @@ -65,10 +82,9 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.api.helpers.GregtechPlusPlus_API.Multiblock_API; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.*; +import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -76,7 +92,11 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.preloader.asm.AsmConfig; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.*; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ControlCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; // Glee8e - 11/12/21 - 2:15pm // Yeah, now I see what's wrong. Someone inherited from GregtechMeta_MultiBlockBase instead of @@ -1225,14 +1245,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } // Handle TT Multi-A Energy Hatches - else if (LoadedMods.TecTech && isThisHatchMultiEnergy(aMetaTileEntity)) { + else if (TecTech.isModLoaded() && isThisHatchMultiEnergy(aMetaTileEntity)) { log("Found isThisHatchMultiEnergy"); aDidAdd = addToMachineListInternal(mTecTechEnergyHatches, aMetaTileEntity, aBaseCasingIndex); updateMasterEnergyHatchList(aMetaTileEntity); } // Handle TT Multi-A Dynamos - else if (LoadedMods.TecTech && isThisHatchMultiDynamo(aMetaTileEntity)) { + else if (TecTech.isModLoaded() && isThisHatchMultiDynamo(aMetaTileEntity)) { log("Found isThisHatchMultiDynamo"); aDidAdd = addToMachineListInternal(mTecTechDynamoHatches, aMetaTileEntity, aBaseCasingIndex); updateMasterDynamoHatchList(aMetaTileEntity); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java index d1b4b5d951..29a897eb50 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java @@ -22,9 +22,16 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.*; +import gregtech.api.util.GT_HatchElementBuilder; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gtPlusPlus.api.objects.data.*; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.IGT_HatchAdder; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.api.objects.data.ConcurrentHashSet; +import gtPlusPlus.api.objects.data.ConcurrentSet; +import gtPlusPlus.api.objects.data.FlexiblePair; +import gtPlusPlus.api.objects.data.Triplet; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusOutput; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java index 32783ec437..b7f41b11c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java @@ -1,9 +1,10 @@ package gtPlusPlus.xmod.gregtech.api.objects; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraftforge.fluids.Fluid; import gregtech.api.GregTech_API; -import gtPlusPlus.core.lib.CORE; public class GregtechFluid extends Fluid implements Runnable { @@ -25,6 +26,6 @@ public class GregtechFluid extends Fluid implements Runnable { @Override public void run() { - this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":" + "fluids/fluid." + this.mTextureName)); + this.setIcons(GregTech_API.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid." + this.mTextureName)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index 787299ef6b..b9dc5d4b70 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -1,6 +1,10 @@ package gtPlusPlus.xmod.gregtech.api.objects; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java index 3f91aa7f55..d532459a70 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java @@ -3,7 +3,10 @@ package gtPlusPlus.xmod.gregtech.common; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,10 +26,17 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TAE; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -35,7 +45,10 @@ import gtPlusPlus.core.handler.AchievementHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.LangUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index be77280550..2d790b5491 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -6,7 +6,6 @@ import net.minecraftforge.fluids.FluidRegistry; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -21,72 +20,40 @@ public class GregtechFluidHandler { } private static void start() { - - /* - * Meta_GT_Proxy.addFluid("lubricant", "Lubricant", Materials.Lubricant, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("creosote", "Creosote Oil", Materials.Creosote, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("seedoil", "Seed Oil", Materials.SeedOil, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("fishoil", "Fish Oil", Materials.FishOil, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("oil", "Oil", Materials.Oil, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, - * Materials.Oil, 1L), ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("fuel", "Diesel", Materials.Fuel, - * 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("for.honey", "Honey", Materials.Honey, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("biomass", "Biomass", Materials.Biomass, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("bioethanol", "Bio Ethanol", Materials.Ethanol, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("sulfuricacid", "Sulfuric Acid", Materials.SulfuricAcid, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), ItemUtils.getEmptyCell(), 1000); - * Meta_GT_Proxy.addFluid("milk", "Milk", Materials.Milk, 1, 290, GT_OreDictUnificator.get(OrePrefixes.cell, - * Materials.Milk, 1L), ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239", - * Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), - * ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("glue", "Glue", Materials.Glue, 1, 295, - * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemUtils.getEmptyCell(), 1000); - */ - - if (!LoadedMods.ThermalFoundation) { - - Logger.INFO("Adding in our own GT versions of Thermal Foundation Fluids if they do not already exist."); - if (!FluidRegistry.isFluidRegistered("cryotheum")) { - FluidUtils.addGtFluid( - "cryotheum", - "Gelid Cryotheum", - GT_Materials.Cryotheum, - 4, - -1200, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), - ItemUtils.getEmptyCell(), - 1000); - } - if (!FluidRegistry.isFluidRegistered("pyrotheum")) { - FluidUtils.addGtFluid( - "pyrotheum", - "Blazing Pyrotheum", - GT_Materials.Pyrotheum, - 4, - 4000, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), - ItemUtils.getEmptyCell(), - 1000); - } - if (!FluidRegistry.isFluidRegistered("ender")) { - FluidUtils.addGtFluid( - "ender", - "Resonant Ender", - GT_Materials.Ender, - 4, - 4000, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L), - ItemUtils.getEmptyCell(), - 1000); - } + Logger.INFO("Adding in our own GT versions of Thermal Foundation Fluids if they do not already exist."); + if (!FluidRegistry.isFluidRegistered("cryotheum")) { + FluidUtils.addGtFluid( + "cryotheum", + "Gelid Cryotheum", + GT_Materials.Cryotheum, + 4, + -1200, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), + ItemUtils.getEmptyCell(), + 1000); + } + if (!FluidRegistry.isFluidRegistered("pyrotheum")) { + FluidUtils.addGtFluid( + "pyrotheum", + "Blazing Pyrotheum", + GT_Materials.Pyrotheum, + 4, + 4000, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), + ItemUtils.getEmptyCell(), + 1000); + } + if (!FluidRegistry.isFluidRegistered("ender")) { + FluidUtils.addGtFluid( + "ender", + "Resonant Ender", + GT_Materials.Ender, + 4, + 4000, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L), + ItemUtils.getEmptyCell(), + 1000); } - Logger.INFO("Adding in GT Fluids for various nuclear related content."); FluidUtils.addGtFluid( @@ -131,15 +98,9 @@ public class GregtechFluidHandler { false); generateIC2FluidCell("SulfuricApatite"); - // Check for IHL Hydrogen Chloride - if (!LoadedMods.IHL || (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null)) { + // Check for Hydrogen Chloride + if (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null) { if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null) { - if (LoadedMods.IHL) { - Logger.INFO( - "IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own."); - } else { - Logger.INFO("No Suitable versions of Hydrogen Chloride available, adding our own."); - } FluidUtils.addGtFluid( "hydrogenChloride", "Industrial Strength Hydrogen Chloride", @@ -181,10 +142,7 @@ public class GregtechFluidHandler { private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps) { Logger.INFO("Adding a Cell for " + fluidNameWithCaps); - if (!LoadedMods.IndustrialCraft2Classic) { - return Utils.createInternalNameAndFluidCell(fluidNameWithCaps); - } - return null; + return Utils.createInternalNameAndFluidCell(fluidNameWithCaps); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index aede466688..fc213a381d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -33,7 +36,7 @@ public class TexturesGtBlock { protected String mModID; public CustomIcon(final String aIconName) { - this(CORE.MODID, aIconName); + this(GTPlusPlus.ID, aIconName); } public CustomIcon(final String aModID, final String aIconName) { @@ -90,7 +93,7 @@ public class TexturesGtBlock { @Override public void run() { - this.mIcon = GregTech_API.sBlockIcons.registerIcon("minecraft" + ":" + this.mIconName); + this.mIcon = GregTech_API.sBlockIcons.registerIcon(Minecraft.ID + ":" + this.mIconName); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java index 03afcfaa27..5dda99f469 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import static gregtech.api.enums.Mods.ZTones; + import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; public class TexturesGtCutomCovers { @@ -24,7 +26,7 @@ public class TexturesGtCutomCovers { for (CustomIcon[] t : aArrays) { for (int s = 0; s < 16; s++) { t[s] = new CustomIcon( - "Ztones", + ZTones.ID, "sets/" + aZtoneCoverTextureNames[aArrayIndex] + "/" + aZtoneCoverTextureNames[aArrayIndex] diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java index 8f9f57110e..9819f9d59b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -7,7 +9,6 @@ import net.minecraft.util.ResourceLocation; import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; public final class TexturesGtTools { @@ -40,9 +41,9 @@ public final class TexturesGtTools { @Override public void run() { - this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName); + this.mIcon = GregTech_API.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); // Utils.LOG_INFO("Registering a Custom Texture. "+mIcon.g); - this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName + "_OVERLAY"); + this.mOverlay = GregTech_API.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java index a56acd41c7..0479241d52 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java @@ -72,7 +72,24 @@ import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE6; import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE7; import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE8; import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE9; -import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.*; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE1; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE1_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE2; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE2_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE3; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE3_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE4; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE4_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE5; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE5_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE6; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE6_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE7; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE7_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE8; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE8_ACTIVE; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE9; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.OVERLAY_SC_TURBINE9_ACTIVE; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java index a3cf7e8219..e14d8eec78 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.computer; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GoodGenerator; import static gtPlusPlus.xmod.gregtech.common.tileentities.misc.GT_TileEntity_ComputerCube.sReactorList; import java.util.ArrayList; @@ -12,7 +14,6 @@ import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.bartworks.BW_Utils; import gtPlusPlus.xmod.goodgenerator.GG_Utils; @@ -60,14 +61,14 @@ public class GT_ComputerCube_Setup { sReactorList.add(new GT_ItemStack(aItem.get(1))); } - if (LoadedMods.BartWorks) { + if (BartWorks.isModLoaded()) { ArrayList<ItemStack> aBartReactorItems = BW_Utils.getAll(1); for (ItemStack aReactorItem : aBartReactorItems) { sReactorList.add(new GT_ItemStack(aReactorItem)); } } - if (LoadedMods.GoodGenerator) { + if (GoodGenerator.isModLoaded()) { ArrayList<ItemStack> aGlodReactorItems = GG_Utils.getAll(1); for (ItemStack aReactorItem : aGlodReactorItems) { sReactorList.add(new GT_ItemStack(aReactorItem)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java index 9a5cf5f64c..94d5402589 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java @@ -1,12 +1,12 @@ package gtPlusPlus.xmod.gregtech.common.covers; +import static gregtech.api.enums.Mods.ZTones; import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_AGON; import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_BITT; import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_ISZM; import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_JELT; import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_KORP; -import cpw.mods.fml.common.Loader; import gtPlusPlus.core.lib.VanillaColours; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers; @@ -33,7 +33,7 @@ public class CoverManager { // GT Machine Casings Cover_Gt_Machine_Casing = new MetaItemCoverCasings(); - if (Loader.isModLoaded("Ztones")) { + if (ZTones.isModLoaded()) { String[] aZtoneCoverTextureNames = new String[] { "agon", "iszm", "korp", "jelt", "bitt" }; MetaCustomCoverItem[] aZtoneCoverItems = new MetaCustomCoverItem[] { Cover_Agon, Cover_Iszm, Cover_Korp, Cover_Jelt, Cover_Bitt }; @@ -43,7 +43,7 @@ public class CoverManager { ZTONES.RGB_BITT }; for (int y = 0; y < aZtoneCoverTextureNames.length; y++) { aZtoneCoverItems[y] = new MetaCustomCoverItem( - "Ztones", + ZTones.ID, 16, aZtoneCoverTextureNames[y], aArrays[y], diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java index fff2e68200..842e19438b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.helpers; import static gregtech.api.GregTech_API.mEUtoRF; +import static gregtech.api.enums.Mods.COFHCore; import java.util.HashMap; import java.util.Map; @@ -23,7 +24,6 @@ import gregtech.common.items.GT_MetaGenerated_Tool_01; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -484,7 +484,7 @@ public class ChargingHelper { } public static boolean isItemValidRF(final ItemStack itemStack) { - return itemStack != null && LoadedMods.CoFHCore && itemStack.getItem() instanceof IEnergyContainerItem; + return itemStack != null && COFHCore.isModLoaded() && itemStack.getItem() instanceof IEnergyContainerItem; } public static boolean accepts(final ItemStack stack) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java index 7ce06c7974..3083dee782 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.helpers; +import static gregtech.api.enums.Mods.Forestry; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableTreeFarmerParticles; import java.util.ArrayList; @@ -39,6 +40,7 @@ import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import gnu.trove.set.hash.THashSet; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.enums.ToolDictNames; @@ -50,7 +52,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.players.FakeFarmer; import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL; import gtPlusPlus.core.util.Utils; @@ -328,7 +329,7 @@ public class TreeFarmHelper { public static Block blockHumus; public static boolean isForestryValid() { - if (!LoadedMods.Forestry) { + if (!Forestry.isModLoaded()) { return false; } if (ReflectionUtils.doesClassExist("forestry.core.blocks.BlockSoil")) { @@ -349,7 +350,7 @@ public class TreeFarmHelper { return true; } - @Optional.Method(modid = "Forestry") + @Optional.Method(modid = Mods.Names.FORESTRY) public static Block getHumus() { if (blockHumus != null) { return blockHumus; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java index f31337228b..e54542f35b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java @@ -2,7 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.helpers.autocrafter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java index 3d54bcdf5f..a3c33f0290 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java @@ -1,7 +1,10 @@ package gtPlusPlus.xmod.gregtech.common.helpers.autocrafter; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java index e490c3dd81..93442675ca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java @@ -1,9 +1,14 @@ package gtPlusPlus.xmod.gregtech.common.helpers.tesseract; -import static gtPlusPlus.core.lib.CORE.*; +import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap; +import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java index 4fe1fda076..1a0a92b2ef 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.items; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -21,7 +23,6 @@ import gregtech.api.objects.GT_MultiTexture; import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; @@ -43,7 +44,7 @@ public class MetaCustomCoverItem extends Item { mTextureSetName = Utils.sanitizeString(aTextureSetName); mTextures = aTextures; mRGB = aRGB; - this.setTextureName(CORE.MODID + ":" + "itemPlate"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemPlate"); this.setHasSubtypes(true); String unlocalizedName = "itemCustomMetaCover." + mModID + "." + mTextureSetName; this.setUnlocalizedName(unlocalizedName); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java index e41e3ad47b..e96a064128 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.items.covers; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -8,7 +10,6 @@ import net.minecraft.util.StatCollector; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Textures; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem; @@ -16,7 +17,7 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem { public MetaItemCoverCasings() { super( - CORE.MODID, + GTPlusPlus.ID, Textures.BlockIcons.MACHINECASINGS_SIDE.length, "Gt Machine Casings", Textures.BlockIcons.MACHINECASINGS_SIDE, @@ -26,7 +27,7 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem { @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < icons.length; i++) { - this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "covers/" + i); + this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "covers/" + i); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index b8eb41274a..df83976033 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java @@ -1,6 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.render; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.Date; import java.util.List; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index 80e7db9bbf..2fc239d14b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.automation; -import static gtPlusPlus.core.lib.CORE.*; +import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap; +import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap; import java.util.UUID; @@ -13,7 +14,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index 76e83fca65..ed6e05047c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -1,10 +1,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; -import net.minecraft.entity.player.*; -import net.minecraft.item.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -16,14 +20,16 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.ProgressBar; import com.gtnewhorizons.modularui.common.widget.SlotGroup; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.*; +import gregtech.api.objects.GT_ItemStack; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -31,7 +37,8 @@ import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import ic2.api.crops.*; +import ic2.api.crops.CropCard; +import ic2.api.crops.ICropTile; import ic2.core.item.DamageHandler; public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java index 4e5a6e352a..9c7ab14e89 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.GregTech; import java.util.ArrayList; import java.util.List; @@ -247,7 +248,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered if (tSimpleClassName.contains("conduit") || tSimpleClassName.contains("wire") || tSimpleClassName.contains("cable")) return true; - if (tCanonicalName.contains("appeng") || tCanonicalName.contains("gregtech")) + if (tCanonicalName.contains("appeng") || tCanonicalName.contains(GregTech.ID)) // Don't accelerate ANY Gregtech machines! return true; for (String tS : BlacklistedTileEntiyClassNames) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index b85ab6e9c5..72a287e7dd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.GTPlusPlus; import static net.minecraftforge.common.ForgeChunkManager.getMaxChunkDepthFor; import java.util.HashSet; @@ -54,13 +55,13 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa public static int getMaxChunksToLoadForTier(int aTier) { if (aTier < 4) { - return Math.min(3 * 3, getMaxChunkDepthFor(CORE.MODID)); + return Math.min(3 * 3, getMaxChunkDepthFor(GTPlusPlus.ID)); } if (aTier < 6) { - return Math.min(7 * 7, getMaxChunkDepthFor(CORE.MODID)); + return Math.min(7 * 7, getMaxChunkDepthFor(GTPlusPlus.ID)); } if (aTier < 8) { - return Math.min(15 * 15, getMaxChunkDepthFor(CORE.MODID)); + return Math.min(15 * 15, getMaxChunkDepthFor(GTPlusPlus.ID)); } else { return 0; } @@ -68,13 +69,13 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa public static int getChunkRadiusForTier(int aTier) { if (aTier < 4) { - return Math.min(1, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(CORE.MODID)))); + return Math.min(1, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); } if (aTier < 6) { - return Math.min(3, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(CORE.MODID)))); + return Math.min(3, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); } if (aTier < 8) { - return Math.min(7, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(CORE.MODID)))); + return Math.min(7, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); } else { return 0; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java index 2bafaa1b03..39461f24bf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java @@ -1,6 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index a27509b284..e705d0a156 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java index 7aea74c777..48ee33bfc0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofCoil; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index 0892419b70..edfc8cdf79 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -2,7 +2,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.block.Block; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java index d81c7319f2..95d711c748 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.block.Block; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java index b00f126111..978d6ef6ad 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java index ba5b466114..5532180944 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java @@ -4,7 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java index 9ed380e15f..9931936844 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java @@ -3,7 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.block.Block; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 259a92e108..ee901e2d89 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofCoil; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java index 2e76367ad5..58a88a0db2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java index cb204181bc..0d07b9f94e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java index f7b62e108a..0550cc8809 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.block.Block; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java index 61f8e29634..d5e79e3c16 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java @@ -1,7 +1,19 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.ThaumicBases; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.HashMap; @@ -32,7 +44,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -68,13 +79,13 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Forge Hammer") .addInfo("Speed: +100% | EU Usage: 100% | Parallel: Tier x Anvil Tier x 8") .addInfo("T1 - Vanilla Anvil"); - if (LoadedMods.Railcraft) { + if (Railcraft.isModLoaded()) { tt.addInfo("T2 - Steel Anvil"); } - if (LoadedMods.EnderIO) { + if (EnderIO.isModLoaded()) { tt.addInfo("T3 - Dark Steel Anvil"); } - if (LoadedMods.ThaumicBases) { + if (ThaumicBases.isModLoaded()) { tt.addInfo("T3 - Thaumium Anvil"); tt.addInfo("T4 - Void Metal Anvil"); } @@ -95,17 +106,17 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends anvilTiers.put(Blocks.anvil, 1); - if (LoadedMods.Railcraft) { - anvilTiers.put(GameRegistry.findBlock("Railcraft", "anvil"), 2); + if (Railcraft.isModLoaded()) { + anvilTiers.put(GameRegistry.findBlock(Railcraft.ID, "anvil"), 2); } - if (LoadedMods.EnderIO) { - anvilTiers.put(GameRegistry.findBlock("EnderIO", "blockDarkSteelAnvil"), 3); + if (EnderIO.isModLoaded()) { + anvilTiers.put(GameRegistry.findBlock(EnderIO.ID, "blockDarkSteelAnvil"), 3); } - if (LoadedMods.ThaumicBases) { - anvilTiers.put(GameRegistry.findBlock("thaumicbases", "thaumicAnvil"), 3); - anvilTiers.put(GameRegistry.findBlock("thaumicbases", "voidAnvil"), 4); + if (ThaumicBases.isModLoaded()) { + anvilTiers.put(GameRegistry.findBlock(ThaumicBases.ID, "thaumicAnvil"), 3); + anvilTiers.put(GameRegistry.findBlock(ThaumicBases.ID, "voidAnvil"), 4); } STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialForgeHammer>builder() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java index bf2654b97c..1087e7159e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java @@ -4,7 +4,11 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.Random; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index a268027067..47fd916f13 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java index cfe225eb27..a90ca96811 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java @@ -2,7 +2,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.block.Block; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 49fa530a74..31bf3121c7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -26,7 +32,12 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OverclockCalculator; +import gregtech.api.util.GT_ParallelHelper; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index 9ab3b26f87..07516ad929 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java index 6e7cc02da0..a866829e32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.Random; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java index 093e6aabc1..6c4814ab7b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java @@ -4,7 +4,11 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.block.Block; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index e42f719e4f..8667cb142c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -4,7 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java index e30e39341a..93037637a7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -1,7 +1,18 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.block.Block; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java index da2193e47a..eeb55cfb93 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java index 571a03225b..8c46f4f59f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java @@ -4,7 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java index 90c8290d2c..80c756772f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java @@ -1,7 +1,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; @@ -24,8 +32,13 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.GasSpargingRecipe; +import gregtech.api.util.GasSpargingRecipeMap; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java index e19393213a..d640aeb3e8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java @@ -1,7 +1,17 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index e4bec9f824..84f2ecb26f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -4,7 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofCoil; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java index 258285f324..ff47520fcc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java @@ -1,6 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import net.minecraft.block.Block; @@ -20,8 +23,13 @@ import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.*; -import gregtech.api.util.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index 2887866651..9deecc180d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -1,6 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.GregTech_API.sBlockCasings4; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; @@ -13,8 +16,14 @@ import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.*; -import gregtech.api.util.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java index 3328ff3c4f..a68afae3ec 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java @@ -1,7 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.GregTech_API.sBlockCasings1; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; @@ -16,7 +18,6 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.*; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java index 925e161fbe..a73dd4a923 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java @@ -3,7 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java index 69a10271fb..62032b3e77 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import net.minecraft.item.Item; @@ -24,7 +30,11 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.general.ItemLavaFilter; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java index 516230ae6b..90057d2e0e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java @@ -4,7 +4,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java index b86c677db4..ea3024bb5f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java @@ -2,7 +2,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.Objects; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index d20f05df3c..dc8d0e95c0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -4,7 +4,11 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Dynamo; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.filterByMTETier; @@ -25,7 +29,11 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.objects.GT_ItemStack; import gregtech.api.render.TextureFactory; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java index abf0021af1..55ed8fefb6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java @@ -3,11 +3,22 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Dynamo; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 7ab091fd74..4bffa7899e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -3,7 +3,27 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.ForbiddenMagic; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GalaxySpace; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.PamsHarvestTheNether; +import static gregtech.api.enums.Mods.TaintedMagic; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.ThaumicBases; +import static gregtech.api.enums.Mods.TinkerConstruct; +import static gregtech.api.enums.Mods.TwilightForest; +import static gregtech.api.enums.Mods.Witchery; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy; @@ -341,8 +361,8 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< public static void loadMapWoodFromSapling() { // galaxySpace - mapSaplingToLog("GalaxySpace:barnardaCsapling:1", GT_ModHandler.getModItem("GalaxySpace", "barnardaClog", 1)); // barnarda - // c + mapSaplingToLog("GalaxySpace:barnardaCsapling:1", GT_ModHandler.getModItem(GalaxySpace.ID, "barnardaClog", 1)); // barnarda + // c // minecraft mapSaplingToLog("minecraft:sapling:0", new ItemStack(Blocks.log, 1, 0)); // oak @@ -353,85 +373,85 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< mapSaplingToLog("minecraft:sapling:5", new ItemStack(Blocks.log2, 1, 1)); // dark oak // ic2 - mapSaplingToLog("IC2:blockRubSapling:0", GT_ModHandler.getModItem("IC2", "blockRubWood", 1)); // rubber + mapSaplingToLog("IC2:blockRubSapling:0", GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockRubWood", 1)); // rubber // natura - mapSaplingToLog("Natura:florasapling:0", GT_ModHandler.getModItem("Natura", "redwood", 1, 1)); // redwood - mapSaplingToLog("Natura:florasapling:1", GT_ModHandler.getModItem("Natura", "tree", 1, 0)); // eucalyptus - mapSaplingToLog("Natura:florasapling:2", GT_ModHandler.getModItem("Natura", "tree", 1, 3)); // hopseed - mapSaplingToLog("Natura:florasapling:3", GT_ModHandler.getModItem("Natura", "tree", 1, 1)); // sakura - mapSaplingToLog("Natura:florasapling:4", GT_ModHandler.getModItem("Natura", "tree", 1, 2)); // ghostwood - mapSaplingToLog("Natura:florasapling:5", GT_ModHandler.getModItem("Natura", "bloodwood", 1, 0)); // bloodwood - mapSaplingToLog("Natura:florasapling:6", GT_ModHandler.getModItem("Natura", "Dark Tree", 1, 0)); // darkwood - mapSaplingToLog("Natura:florasapling:7", GT_ModHandler.getModItem("Natura", "Dark Tree", 1, 1)); // fusewood - - mapSaplingToLog("Natura:Rare Sapling:0", GT_ModHandler.getModItem("Natura", "Rare Tree", 1, 0)); // maple - mapSaplingToLog("Natura:Rare Sapling:1", GT_ModHandler.getModItem("Natura", "Rare Tree", 1, 1)); // silverbell - mapSaplingToLog("Natura:Rare Sapling:2", GT_ModHandler.getModItem("Natura", "Rare Tree", 1, 2)); // amaranth - mapSaplingToLog("Natura:Rare Sapling:3", GT_ModHandler.getModItem("Natura", "Rare Tree", 1, 3)); // tigerwood - mapSaplingToLog("Natura:Rare Sapling:4", GT_ModHandler.getModItem("Natura", "willow", 1, 0)); // willow + mapSaplingToLog("Natura:florasapling:0", GT_ModHandler.getModItem(Natura.ID, "redwood", 1, 1)); // redwood + mapSaplingToLog("Natura:florasapling:1", GT_ModHandler.getModItem(Natura.ID, "tree", 1, 0)); // eucalyptus + mapSaplingToLog("Natura:florasapling:2", GT_ModHandler.getModItem(Natura.ID, "tree", 1, 3)); // hopseed + mapSaplingToLog("Natura:florasapling:3", GT_ModHandler.getModItem(Natura.ID, "tree", 1, 1)); // sakura + mapSaplingToLog("Natura:florasapling:4", GT_ModHandler.getModItem(Natura.ID, "tree", 1, 2)); // ghostwood + mapSaplingToLog("Natura:florasapling:5", GT_ModHandler.getModItem(Natura.ID, "bloodwood", 1, 0)); // bloodwood + mapSaplingToLog("Natura:florasapling:6", GT_ModHandler.getModItem(Natura.ID, "Dark Tree", 1, 0)); // darkwood + mapSaplingToLog("Natura:florasapling:7", GT_ModHandler.getModItem(Natura.ID, "Dark Tree", 1, 1)); // fusewood + + mapSaplingToLog("Natura:Rare Sapling:0", GT_ModHandler.getModItem(Natura.ID, "Rare Tree", 1, 0)); // maple + mapSaplingToLog("Natura:Rare Sapling:1", GT_ModHandler.getModItem(Natura.ID, "Rare Tree", 1, 1)); // silverbell + mapSaplingToLog("Natura:Rare Sapling:2", GT_ModHandler.getModItem(Natura.ID, "Rare Tree", 1, 2)); // amaranth + mapSaplingToLog("Natura:Rare Sapling:3", GT_ModHandler.getModItem(Natura.ID, "Rare Tree", 1, 3)); // tigerwood + mapSaplingToLog("Natura:Rare Sapling:4", GT_ModHandler.getModItem(Natura.ID, "willow", 1, 0)); // willow // BOP - mapSaplingToLog("BiomesOPlenty:colorizedSaplings:0", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 0)); // Sacred - // Oak - mapSaplingToLog("BiomesOPlenty:colorizedSaplings:1", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 2)); // Mangrove - mapSaplingToLog("BiomesOPlenty:colorizedSaplings:2", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 3)); // Palm - mapSaplingToLog("BiomesOPlenty:colorizedSaplings:3", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 0)); // Redwood - mapSaplingToLog("BiomesOPlenty:colorizedSaplings:4", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 1)); // Willow - mapSaplingToLog("BiomesOPlenty:colorizedSaplings:5", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 0)); // Pine - mapSaplingToLog("BiomesOPlenty:colorizedSaplings:6", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 3)); // Mahogany - mapSaplingToLog("BiomesOPlenty:saplings:2", GT_ModHandler.getModItem("BiomesOPlenty", "bamboo", 1, 0)); // Bamboo - mapSaplingToLog("BiomesOPlenty:saplings:3", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 1)); // Magic - mapSaplingToLog("BiomesOPlenty:saplings:4", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 2)); // Dark - mapSaplingToLog("BiomesOPlenty:saplings:5", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 2)); // Dying/Dead - mapSaplingToLog("BiomesOPlenty:saplings:6", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 3)); // Fir - mapSaplingToLog("BiomesOPlenty:saplings:7", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 0)); // Ethereal - mapSaplingToLog("BiomesOPlenty:saplings:10", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 1)); // Pink - // Cherry - mapSaplingToLog("BiomesOPlenty:saplings:12", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 1)); // White - // Cherry - mapSaplingToLog("BiomesOPlenty:saplings:13", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 1)); // Hellbark - mapSaplingToLog("BiomesOPlenty:saplings:14", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 2)); // Jacaranda - mapSaplingToLog("minecraft:yellow_flower:0", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 3)); // Giant - // Flower - // Stem - mapSaplingToLog("minecraft:red_flower:0", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 3)); // Giant - // Flower - // Stem + mapSaplingToLog("BiomesOPlenty:colorizedSaplings:0", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs1", 1, 0)); // Sacred + // Oak + mapSaplingToLog("BiomesOPlenty:colorizedSaplings:1", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs2", 1, 2)); // Mangrove + mapSaplingToLog("BiomesOPlenty:colorizedSaplings:2", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs2", 1, 3)); // Palm + mapSaplingToLog("BiomesOPlenty:colorizedSaplings:3", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs3", 1, 0)); // Redwood + mapSaplingToLog("BiomesOPlenty:colorizedSaplings:4", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs3", 1, 1)); // Willow + mapSaplingToLog("BiomesOPlenty:colorizedSaplings:5", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs4", 1, 0)); // Pine + mapSaplingToLog("BiomesOPlenty:colorizedSaplings:6", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs4", 1, 3)); // Mahogany + mapSaplingToLog("BiomesOPlenty:saplings:2", GT_ModHandler.getModItem(BiomesOPlenty.ID, "bamboo", 1, 0)); // Bamboo + mapSaplingToLog("BiomesOPlenty:saplings:3", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs2", 1, 1)); // Magic + mapSaplingToLog("BiomesOPlenty:saplings:4", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs1", 1, 2)); // Dark + mapSaplingToLog("BiomesOPlenty:saplings:5", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs3", 1, 2)); // Dying/Dead + mapSaplingToLog("BiomesOPlenty:saplings:6", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs1", 1, 3)); // Fir + mapSaplingToLog("BiomesOPlenty:saplings:7", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs2", 1, 0)); // Ethereal + mapSaplingToLog("BiomesOPlenty:saplings:10", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs1", 1, 1)); // Pink + // Cherry + mapSaplingToLog("BiomesOPlenty:saplings:12", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs1", 1, 1)); // White + // Cherry + mapSaplingToLog("BiomesOPlenty:saplings:13", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs4", 1, 1)); // Hellbark + mapSaplingToLog("BiomesOPlenty:saplings:14", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs4", 1, 2)); // Jacaranda + mapSaplingToLog("minecraft:yellow_flower:0", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs3", 1, 3)); // Giant + // Flower + // Stem + mapSaplingToLog("minecraft:red_flower:0", GT_ModHandler.getModItem(BiomesOPlenty.ID, "logs3", 1, 3)); // Giant + // Flower + // Stem // Witchery - mapSaplingToLog("witchery:witchsapling:0", GT_ModHandler.getModItem("witchery", "witchlog", 1, 0)); // Rowan - mapSaplingToLog("witchery:witchsapling:1", GT_ModHandler.getModItem("witchery", "witchlog", 1, 1)); // Alder - mapSaplingToLog("witchery:witchsapling:2", GT_ModHandler.getModItem("witchery", "witchlog", 1, 2)); // Hawthorn + mapSaplingToLog("witchery:witchsapling:0", GT_ModHandler.getModItem(Witchery.ID, "witchlog", 1, 0)); // Rowan + mapSaplingToLog("witchery:witchsapling:1", GT_ModHandler.getModItem(Witchery.ID, "witchlog", 1, 1)); // Alder + mapSaplingToLog("witchery:witchsapling:2", GT_ModHandler.getModItem(Witchery.ID, "witchlog", 1, 2)); // Hawthorn // TConstruct - mapSaplingToLog("TConstruct:slime.sapling:0", GT_ModHandler.getModItem("TConstruct", "slime.gel", 1)); // green - // slime - // blocks + mapSaplingToLog("TConstruct:slime.sapling:0", GT_ModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1)); // green + // slime + // blocks // TaintedMagic mapSaplingToLog( "TaintedMagic:BlockWarpwoodSapling:0", - GT_ModHandler.getModItem("TaintedMagic", "BlockWarpwoodLog", 1)); // warpwood + GT_ModHandler.getModItem(TaintedMagic.ID, "BlockWarpwoodLog", 1)); // warpwood // Thaumcraft mapSaplingToLog( "Thaumcraft:blockCustomPlant:0", - GT_ModHandler.getModItem("Thaumcraft", "blockMagicalLog", 1, 0)); // greatwood + GT_ModHandler.getModItem(Thaumcraft.ID, "blockMagicalLog", 1, 0)); // greatwood mapSaplingToLog( "Thaumcraft:blockCustomPlant:1", - GT_ModHandler.getModItem("Thaumcraft", "blockMagicalLog", 1, 1)); // silverwood + GT_ModHandler.getModItem(Thaumcraft.ID, "blockMagicalLog", 1, 1)); // silverwood // gt++ mapSaplingToLog( "miscutils:blockRainforestOakSapling:0", - GT_ModHandler.getModItem("miscutils", "blockRainforestOakLog", 1)); // rainforest - mapSaplingToLog("miscutils:blockPineSapling:0", GT_ModHandler.getModItem("miscutils", "blockPineLogLog", 1)); // pine + GT_ModHandler.getModItem(GTPlusPlus.ID, "blockRainforestOakLog", 1)); // rainforest + mapSaplingToLog("miscutils:blockPineSapling:0", GT_ModHandler.getModItem(GTPlusPlus.ID, "blockPineLogLog", 1)); // pine // Harvestcraft mapSaplingToLog("harvestcraft:pampistachioSapling:0", new ItemStack(Blocks.log, 1, 3)); // Pistachio mapSaplingToLog("harvestcraft:pampapayaSapling:0", new ItemStack(Blocks.log, 1, 3)); // Papaya - mapSaplingToLog("harvestcraft:pammapleSapling:0", GT_ModHandler.getModItem("harvestcraft", "pamMaple", 1)); // Maple + mapSaplingToLog("harvestcraft:pammapleSapling:0", GT_ModHandler.getModItem(PamsHarvestCraft.ID, "pamMaple", 1)); // Maple mapSaplingToLog("harvestcraft:pamappleSapling:0", new ItemStack(Blocks.log, 1, 0)); // Apple mapSaplingToLog("harvestcraft:pamdateSapling:0", new ItemStack(Blocks.log, 1, 3)); // Date mapSaplingToLog("harvestcraft:pamorangeSapling:0", new ItemStack(Blocks.log, 1, 3)); // Orange @@ -439,7 +459,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< mapSaplingToLog("harvestcraft:pamnutmegSapling:0", new ItemStack(Blocks.log, 1, 0)); // NutMeg mapSaplingToLog( "harvestcraft:pampaperbarkSapling:0", - GT_ModHandler.getModItem("harvestcraft", "pamPaperbark", 1)); // Paperbark + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "pamPaperbark", 1)); // Paperbark mapSaplingToLog("harvestcraft:pammangoSapling:0", new ItemStack(Blocks.log, 1, 3)); // Mango mapSaplingToLog("harvestcraft:pamavocadoSapling:0", new ItemStack(Blocks.log, 1, 0)); // Avocado mapSaplingToLog("harvestcraft:pamchestnutSapling:0", new ItemStack(Blocks.log, 1, 0)); // Chestnut @@ -450,7 +470,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< mapSaplingToLog("harvestcraft:pamoliveSapling:0", new ItemStack(Blocks.log, 1, 3)); // Olive mapSaplingToLog( "harvestcraft:pamcinnamonSapling:0", - GT_ModHandler.getModItem("harvestcraft", "pamCinnamon", 1)); // Cinnamon + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "pamCinnamon", 1)); // Cinnamon mapSaplingToLog("harvestcraft:pampeachSapling:0", new ItemStack(Blocks.log, 1, 3)); // Peach mapSaplingToLog("harvestcraft:pamlemonSapling:0", new ItemStack(Blocks.log, 1, 3)); // Lemon mapSaplingToLog("harvestcraft:pamvanillabeanSapling:0", new ItemStack(Blocks.log, 1, 3)); // Vanilla @@ -473,48 +493,48 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< // Harvest The Nether mapSaplingToLog( "harvestthenether:netherSapling:0", - GT_ModHandler.getModItem("harvestthenether", "netherLog", 1)); // Nether + GT_ModHandler.getModItem(PamsHarvestTheNether.ID, "netherLog", 1)); // Nether // The Twilight Forest mapSaplingToLog( "TwilightForest:tile.TFSapling:0", - GT_ModHandler.getModItem("TwilightForest", "tile.TFLog", 1, 0)); // Sickly Twilight Oak + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFLog", 1, 0)); // Sickly Twilight Oak mapSaplingToLog( "TwilightForest:tile.TFSapling:1", - GT_ModHandler.getModItem("TwilightForest", "tile.TFLog", 1, 1)); // Canopy Tree + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFLog", 1, 1)); // Canopy Tree mapSaplingToLog( "TwilightForest:tile.TFSapling:2", - GT_ModHandler.getModItem("TwilightForest", "tile.TFLog", 1, 2)); // Twilight Mangrove + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFLog", 1, 2)); // Twilight Mangrove mapSaplingToLog( "TwilightForest:tile.TFSapling:3", - GT_ModHandler.getModItem("TwilightForest", "tile.TFLog", 1, 3)); // Darkwood + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFLog", 1, 3)); // Darkwood mapSaplingToLog( "TwilightForest:tile.TFSapling:4", - GT_ModHandler.getModItem("TwilightForest", "tile.TFLog", 1, 0)); // Robust Twilight Oad + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFLog", 1, 0)); // Robust Twilight Oad mapSaplingToLog( "TwilightForest:tile.TFSapling:5", - GT_ModHandler.getModItem("TwilightForest", "tile.TFMagicLog", 1, 0)); // Tree of Time + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFMagicLog", 1, 0)); // Tree of Time mapSaplingToLog( "TwilightForest:tile.TFSapling:6", - GT_ModHandler.getModItem("TwilightForest", "tile.TFMagicLog", 1, 1)); // Tree of Trasformation + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFMagicLog", 1, 1)); // Tree of Trasformation mapSaplingToLog( "TwilightForest:tile.TFSapling:7", - GT_ModHandler.getModItem("TwilightForest", "tile.TFMagicLog", 1, 2)); // Miner's Tree + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFMagicLog", 1, 2)); // Miner's Tree mapSaplingToLog( "TwilightForest:tile.TFSapling:8", - GT_ModHandler.getModItem("TwilightForest", "tile.TFMagicLog", 1, 3)); // Sorting Tree + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFMagicLog", 1, 3)); // Sorting Tree mapSaplingToLog( "TwilightForest:tile.TFSapling:9", - GT_ModHandler.getModItem("TwilightForest", "tile.TFLog", 1, 0)); // Rainbow Oak + GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFLog", 1, 0)); // Rainbow Oak // Thaumic Bases mapSaplingToLog("thaumicbases:goldenOakSapling:0", new ItemStack(Blocks.log, 1, 0)); // Golden Oak - mapSaplingToLog("thaumicbases:goldenOakSapling:1", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 0)); // Peaceful - mapSaplingToLog("thaumicbases:goldenOakSapling:2", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 1)); // Nether - mapSaplingToLog("thaumicbases:goldenOakSapling:3", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 2)); // Ender + mapSaplingToLog("thaumicbases:goldenOakSapling:1", GT_ModHandler.getModItem(ThaumicBases.ID, "genLogs", 1, 0)); // Peaceful + mapSaplingToLog("thaumicbases:goldenOakSapling:2", GT_ModHandler.getModItem(ThaumicBases.ID, "genLogs", 1, 1)); // Nether + mapSaplingToLog("thaumicbases:goldenOakSapling:3", GT_ModHandler.getModItem(ThaumicBases.ID, "genLogs", 1, 2)); // Ender // Forbidden Magic - mapSaplingToLog("ForbiddenMagic:TaintSapling:0", GT_ModHandler.getModItem("ForbiddenMagic", "TaintLog", 1)); // Tainted + mapSaplingToLog("ForbiddenMagic:TaintSapling:0", GT_ModHandler.getModItem(ForbiddenMagic.ID, "TaintLog", 1)); // Tainted } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java index 6be3a57f8c..c93d3f5edb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java index 7e1a2dd3af..9123ad24b9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -21,7 +27,11 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index 5ab08331f8..1b8849968e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -3,7 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; @@ -30,7 +35,13 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.*; +import gregtech.api.util.FishPondFakeRecipe; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OverclockCalculator; +import gregtech.api.util.GT_ParallelHelper; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java index 8d4bef3922..156bcd3294 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java @@ -3,7 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.GT_Values.E; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; @@ -28,8 +33,14 @@ import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_OverclockCalculator; +import gregtech.api.util.GT_ParallelHelper; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java index bee5241c79..4391bbd888 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Dynamo; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.AirIntake; import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index a06c85f096..ac28f09f0e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -3,7 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -27,8 +33,15 @@ import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OverclockCalculator; +import gregtech.api.util.GT_ParallelHelper; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java index 137f64795b..57b77b405d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java @@ -1,7 +1,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.ExoticEnergy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_OreDictUnificator.getAssociation; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; @@ -26,7 +34,11 @@ import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; -import com.gtnewhorizon.structurelib.structure.*; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; +import com.gtnewhorizon.structurelib.structure.ITierConverter; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -45,7 +57,12 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.objects.ItemData; import gregtech.api.render.TextureFactory; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OverclockCalculator; +import gregtech.api.util.GT_ParallelHelper; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.minecraft.ItemUtils; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java index db403aee02..1d86a367e4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java @@ -4,7 +4,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.filterByMTETier; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java index 6543720022..30f6d842fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -17,7 +20,6 @@ import gregtech.common.GT_Worldgen_GT_Ore_Layer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.ORES; @@ -466,12 +468,12 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G mMixedOreData.put(new Pair<String, Integer>("oreLapis", 40)); mMixedOreData.put(new Pair<String, Integer>("oreRedstone", 40)); - if (LoadedMods.Thaumcraft || (OreDictUtils.containsValidEntries("oreAmber") + if (Thaumcraft.isModLoaded() || (OreDictUtils.containsValidEntries("oreAmber") && OreDictUtils.containsValidEntries("oreCinnabar"))) { mMixedOreData.put(new Pair<String, Integer>("oreAmber", 20)); mMixedOreData.put(new Pair<String, Integer>("oreCinnabar", 20)); } - if (LoadedMods.Railcraft || OreDictUtils.containsValidEntries("oreSaltpeter")) { + if (Railcraft.isModLoaded() || OreDictUtils.containsValidEntries("oreSaltpeter")) { mMixedOreData.put(new Pair<String, Integer>("oreSaltpeter", 10)); } mMixedOreData.put(new Pair<String, Integer>("oreUranium", 10)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 9f068a1fa2..f23483d8d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -3,7 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.c import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.filterByMTETier; import static gregtech.api.util.GT_StructureUtility.ofCoil; @@ -23,7 +27,12 @@ import net.minecraftforge.fluids.FluidStack; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; -import com.gtnewhorizon.structurelib.structure.*; +import com.gtnewhorizon.structurelib.structure.AutoPlaceEnvironment; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.IStructureElement; +import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureUtility; import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; @@ -31,7 +40,14 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.GregTechTileClientEvents; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_OverclockCalculator; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java index 90a40a0213..f9326161fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java @@ -1,12 +1,21 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.ExoticEnergy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.util.GT_StructureUtility.*; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GT_StructureUtility.ofCoil; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,9 +39,15 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.render.TextureFactory; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OverclockCalculator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java index c3af163cb2..7e3b8e3997 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java @@ -2,7 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.t import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Dynamo; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 5216f1eadf..a10f9a7e95 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -1,9 +1,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onlyIf; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; import static gregtech.api.enums.GT_HatchElement.Dynamo; import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.Mods.TecTech; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; @@ -23,7 +29,12 @@ import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.constructable.ChannelDataAccessor; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; -import com.gtnewhorizon.structurelib.structure.*; +import com.gtnewhorizon.structurelib.structure.AutoPlaceEnvironment; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.IStructureElement; +import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureUtility; import com.gtnewhorizons.modularui.api.drawable.Text; import com.gtnewhorizons.modularui.api.forge.PlayerMainInvWrapper; import com.gtnewhorizons.modularui.api.screen.ModularWindow; @@ -54,7 +65,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.MovingAverageLong; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -456,7 +466,7 @@ public class GregtechMetaTileEntity_PowerSubStationController return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (LoadedMods.TecTech) { + } else if (TecTech.isModLoaded()) { if (isThisHatchMultiDynamo(aMetaTileEntity)) { return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (isThisHatchMultiEnergy(aMetaTileEntity)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java index 00c76a813f..48827277a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java @@ -33,7 +33,10 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import cpw.mods.fml.common.FMLCommonHandler; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.interfaces.ITexture; @@ -41,9 +44,15 @@ import gregtech.api.interfaces.modularui.IAddGregtechLogo; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.*; -import gregtech.api.util.*; +import gregtech.api.objects.GT_ItemStack; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.ItemData; +import gregtech.api.util.GT_AssemblyLineUtils; +import gregtech.api.util.GT_Assemblyline_Server; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Utility; import gregtech.common.items.behaviors.Behaviour_DataOrb; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java index 15e0dd65cc..2c320f843a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java @@ -1,6 +1,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.redstone; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +34,10 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.*; +import gregtech.api.util.GT_CircuitryBehavior; +import gregtech.api.util.GT_CoverBehavior; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_Utility; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java index 4d959789eb..44f18f6632 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java @@ -5,7 +5,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import gregtech.api.enums.*; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java index 47257b404f..0a1b5e0dbf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java @@ -1,7 +1,16 @@ package gtPlusPlus.xmod.gregtech.loaders; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.xmod.gregtech.common.blocks.*; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks4; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks5; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocksPipeGearbox; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMachineCasings; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings2; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaTieredCasingBlocks1; public class Gregtech_Blocks { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java index 7e02cfba09..77b41790b9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java @@ -2,7 +2,10 @@ package gtPlusPlus.xmod.gregtech.loaders; import net.minecraft.item.ItemStack; -import gregtech.api.enums.*; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.ToolDictNames; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java deleted file mode 100644 index c0f1ba3b77..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java +++ /dev/null @@ -1,207 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.interfaces.IOreRecipeRegistrator; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { - - private final OrePrefixes[] mSmeltingPrefixes = { OrePrefixes.crushed, OrePrefixes.ingot, - OrePrefixes.crushedPurified, OrePrefixes.crushedCentrifuged, OrePrefixes.dust, OrePrefixes.dustPure, - OrePrefixes.dustImpure, OrePrefixes.dustRefined, OrePrefixes.dustSmall, OrePrefixes.dustTiny }; - - public RecipeGen_BlastSmelterGT_Ex() { - for (OrePrefixes tPrefix : this.mSmeltingPrefixes) tPrefix.add(this); - } - - @Override - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { - switch (aPrefix) { - case dust: - ItemStack tDustStack; - if (aMaterial.mBlastFurnaceTemp <= 3600) { - if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { - if (aMaterial.mBlastFurnaceRequired) { - addBlastRecipe( - GT_Utility.copyAmount(1L, new Object[] { aStack }), - null, - null, - null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator - .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) - : GT_Utility.copyAmount(1L, new Object[] { tDustStack }), - null, - (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, - 120, - aMaterial); - if (aMaterial.mBlastFurnaceTemp <= 1000) { - // GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new - // Object[]{aStack}), GT_Utility.copyAmount(1L, new Object[]{tDustStack}), - // aMaterial.mBlastFurnaceTemp); - } - } - } - } - case ingot: - if (aMaterial.mBlastFurnaceTemp <= 3600) { - if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { - if (aMaterial.mBlastFurnaceRequired) { - addBlastRecipe( - GT_Utility.copyAmount(1L, new Object[] { aStack }), - null, - null, - null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator - .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) - : GT_Utility.copyAmount(1L, new Object[] { tDustStack }), - null, - (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, - 120, - aMaterial); - } - } - } - break; - case dustSmall: - if (aMaterial.mBlastFurnaceTemp <= 3600) { - if (aMaterial.mBlastFurnaceRequired) { - addBlastRecipe( - GT_Utility.copyAmount(4L, new Object[] { aStack }), - null, - null, - null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial.mSmeltInto, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), - 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), - null, - (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, - 120, - aMaterial); - } - } - break; - case dustTiny: - if (aMaterial.mBlastFurnaceTemp <= 3600) { - if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) { - if (aMaterial.mBlastFurnaceRequired) { - addBlastRecipe( - GT_Utility.copyAmount(9L, new Object[] { aStack }), - null, - null, - null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial.mSmeltInto, - GT_OreDictUnificator - .get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), - 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), - null, - (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, - 120, - aMaterial); - } - } - } - break; - default: - if (aMaterial.mBlastFurnaceTemp <= 3600) { - if (!aMaterial.contains(SubTag.NO_SMELTING)) { - if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { - addBlastRecipe( - GT_Utility.copyAmount(1L, new Object[] { aStack }), - null, - null, - null, - aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - null, - (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, - 120, - aMaterial); - // if (aMaterial.mBlastFurnaceTemp <= 1000) - // GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), - // GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), aMaterial.mBlastFurnaceTemp * - // 2); - } - } - } - break; - } - } - - public boolean addBlastRecipe(ItemStack input1, ItemStack input2, FluidStack fluid1, FluidStack fluid2, - ItemStack output1, ItemStack output2, int time, int euCost, Materials smeltInto) { - - // Set up variables. - ItemStack[] components; - int count = 0; - - if (smeltInto == Materials._NULL) { - // If the material is null then we probably don't want to try. - return false; - } - if (input1 != null && input2 != null) { - count = 2; - } else if (input1 == null && input2 == null) { - // If both inputs are null, then we don't want to try. - return false; - } else { - count = 1; - } - // Set up input components. - ItemStack configCircuit = ItemUtils.getGregtechCircuit(count); - components = new ItemStack[] { configCircuit, input1, input2 }; - if (fluid1 != null || fluid2 != null) { - // If it uses an input fluid, we cannot handle this. So let's not try. (Annealed copper for example) - // return false; - if (fluid1 != null && fluid2 != null) { - // Cannot handle two input fluids - return false; - } - - FluidStack mInputfluidstack; - mInputfluidstack = (fluid1 != null) ? fluid1 : fluid2; - - // Try with new handler - // Add Blast Smelter Recipe. - return CORE.RA.addBlastSmelterRecipe( - components, - mInputfluidstack, - smeltInto.mSmeltInto.getMolten(144L), - 100, - MathUtils.roundToClosestInt(time * 0.8), - euCost); // EU Cost - } - - // Add Blast Smelter Recipe. - return CORE.RA.addBlastSmelterRecipe( - components, - smeltInto.mSmeltInto.getMolten(144L), - 100, - MathUtils.roundToClosestInt(time * 0.8), - euCost); // EU Cost - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java index 5504d3e439..a6f19d05fe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java @@ -10,7 +10,7 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.ArrayUtils; -import gregtech.api.util.*; +import gregtech.api.util.GT_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.ItemStackData; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index 1ae84685db..19f70dfb08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_ModHandler.getModItem; import net.minecraft.item.ItemStack; @@ -9,7 +12,12 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsKevlar; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.items.CombType; @@ -144,8 +152,8 @@ public class RecipeLoader_ChemicalSkips { new FluidStack[] {}, new FluidStack[] {}, new ItemStack[] { Materials.Cerium.getDust(64), Materials.Gadolinium.getDust(64), - Materials.Samarium.getDust(64), getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia - getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium + Materials.Samarium.getDust(64), getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium ItemList.SuperconductorComposite.get(1) }, new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, @@ -169,7 +177,7 @@ public class RecipeLoader_ChemicalSkips { // Stem Cells CORE.RA.addQuantumTransformerRecipe( new ItemStack[] { Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32), - getModItem("dreamcraft", "GTNHBioItems", 32, 2), + getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 32, 2), ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] { Materials.GrowthMediumRaw.getFluid(1000 * 1024), @@ -242,7 +250,7 @@ public class RecipeLoader_ChemicalSkips { private static void catalystRecipes() { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), - getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88), Materials.Osmiridium.getDust(64), + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 88), Materials.Osmiridium.getDust(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 1), @@ -352,7 +360,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2) }, + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 2) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 10), Materials.ExcitedDTCC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) }, @@ -370,7 +378,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UEV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4), + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 4), ItemList.StableAdhesive.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 12), Materials.ExcitedDTPC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), @@ -389,7 +397,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UIV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8), + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 8), ItemList.SuperconductorComposite.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 15), Materials.ExcitedDTRC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), @@ -407,7 +415,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UMV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16), + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 16), ItemList.NaquadriaSupersolid.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 20), Materials.ExcitedDTEC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index 0edc2a2d00..9bb9200107 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.TecTech; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -15,7 +20,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -34,7 +38,6 @@ public class RecipeLoader_GlueLine { chemicalReactorRecipes(); dehydratorRecipes(); distillationTowerRecipes(); - electrolyzerRecipes(); fluidHeaterRecipes(); mixerRecipes(); @@ -145,7 +148,7 @@ public class RecipeLoader_GlueLine { 30); // CaCO3 + 2HCl = CaCl2 + CO2 + H2O - if (LoadedMods.BartWorks) { + if (BartWorks.isModLoaded()) { GT_Values.RA.addChemicalRecipe( CI.getNumberedCircuit(18), ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), @@ -205,25 +208,6 @@ public class RecipeLoader_GlueLine { MaterialUtils.getVoltageForTier(5)); } - private static void electrolyzerRecipes() { - if (!LoadedMods.BartWorks) { - GT_Values.RA.addElectrolyzerRecipe( - CI.getNumberedCircuit(1), - MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(3), - null, - Materials.Chlorine.getFluid(2000), // Out - Materials.Calcium.getDust(1), - null, - null, - null, - null, - null, - new int[] { 10000, 10000, 10000 }, - 20 * 30, - 120); - } - } - private static void fluidHeaterRecipes() { CORE.RA.addFluidHeaterRecipe( @@ -327,7 +311,7 @@ public class RecipeLoader_GlueLine { 32, 8); - if (LoadedMods.TecTech) { + if (TecTech.isModLoaded()) { GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18), @@ -392,7 +376,7 @@ public class RecipeLoader_GlueLine { 1200, 1966080); } - if (LoadedMods.DreamCraft && LoadedMods.GalacticraftCore) { + if (NewHorizonsCoreMod.isModLoaded() && GalacticraftCore.isModLoaded()) { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index 44115ea7d0..c31500d084 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -1,10 +1,12 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; import static advsolar.utils.MTRecipeManager.transformerRecipes; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; +import static gregtech.api.enums.Mods.GalaxySpace; import advsolar.utils.MTRecipeRecord; -import cpw.mods.fml.common.Loader; -import gregtech.api.enums.*; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; @@ -34,41 +36,41 @@ public class RecipeLoader_MolecularTransformer { } transformerRecipes.clear(); - if (Loader.isModLoaded("AdvancedSolarPanel") && Loader.isModLoaded("GalaxySpace")) { + if (AdvancedSolarPanel.isModLoaded() && GalaxySpace.isModLoaded()) { CORE.RA.addMolecularTransformerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 600, 1920, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 0), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 0), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 150, 7680, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 1), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 1), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 38, 30720, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 2), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 2), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 10, 122880, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 3), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 3), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 3, 491520, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 4), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 4), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 1, 1996080, 2); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java index e382e0b26c..16bb025215 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java @@ -12,7 +12,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.nuclear.FLUORIDES; @@ -322,8 +321,7 @@ public class RecipeLoader_Nuclear { 1000); // EU // Calcium Hydroxide - if ((ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) - || LoadedMods.IHL) { + if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { // CaO + H2O = Ca(OH)2 CORE.RA.addDehydratorRecipe( new ItemStack[] { CI.getNumberedBioCircuit(20), @@ -338,8 +336,6 @@ public class RecipeLoader_Nuclear { Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPE"); if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { Logger.INFO("Could not find dustQuicklime, cannot make dustCalciumHydroxide."); - } else if (!LoadedMods.IHL) { - Logger.INFO("IHL not loaded."); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 923a593019..00f3845fd9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -9,9 +9,14 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; -import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.SemiFluidFuelHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java deleted file mode 100644 index aaa3ff2876..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java +++ /dev/null @@ -1,49 +0,0 @@ -package gtPlusPlus.xmod.gregtech.recipes; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.ORES; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class RecipesToRemove { - - public static void go() { - - Logger.INFO("Processing Gregtech recipe maps, removing recipes to suit GT++."); - - // Remove Rare Earth Centrifuging - // 1 Rare Earth Dust - 25% chance for small piles of: neodymium, yttrium, lanthanum, cerium, cadmium, and - // caesium - // Replaced by advanced sifting recipe. - GT_Recipe aRareEarthCentrifuging = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe( - null, - false, - 20, - new FluidStack[] {}, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1) }); - if (aRareEarthCentrifuging != null && aRareEarthCentrifuging.mEnabled) { - aRareEarthCentrifuging.mEnabled = false; - aRareEarthCentrifuging.mHidden = true; - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.remove(aRareEarthCentrifuging); - // GTPP_Recipe.GT_Recipe_Map_LargeCentrifuge.sMultiblockCentrifugeRecipes.mRecipeList.remove(aRareEarthCentrifuging); - GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.remove(aRareEarthCentrifuging); - Logger.INFO("Removed vanilla GT Rare Earth processing."); - // Set the Chemical Symbol for Rare Earth now that we are giving it custom outputs - // Best not to set this unless the original recipe is removed. - /* - * Materials.RareEarth.mChemicalFormula = "(" +ELEMENT.getInstance().YTTRIUM.vChemicalSymbol - * +ELEMENT.getInstance().NEODYMIUM.vChemicalSymbol +ELEMENT.getInstance().LANTHANUM.vChemicalSymbol - * +ELEMENT.getInstance().CERIUM.vChemicalSymbol +ELEMENT.getInstance().CADMIUM.vChemicalSymbol - * +ELEMENT.getInstance().CAESIUM.vChemicalSymbol +ELEMENT.getInstance().YTTERBIUM.vChemicalSymbol - * +ELEMENT.getInstance().SAMARIUM.vChemicalSymbol +ELEMENT.getInstance().GADOLINIUM.vChemicalSymbol+ ")"; - */ - - Material[] aLowTierOutputMaterials = new Material[] { ORES.GREENOCKITE }; - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index db616360d0..d803aa4ba2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -4,15 +4,27 @@ import gregtech.api.GregTech_API; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.*; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricAutoWorkbench; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricInventoryManager; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler; import gtPlusPlus.xmod.gregtech.common.tileentities.misc.GT_TileEntity_ComputerCube; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.*; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneButtonPanel; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneCircuitBlock; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneLamp; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthDisplay; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthScale; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_AdvancedCraftingTable; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.*; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Compartment; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Desk; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_FileCabinet; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Iron; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Large; public class Gregtech4Content { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java index 1a4771394b..81bc9efa8b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java @@ -8,7 +8,10 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 4a4c7f7e7a..ca2e45ebfa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Thaumcraft; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -16,7 +19,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; @@ -190,13 +192,7 @@ public class GregtechConduits { private static void run1() { - if (LoadedMods.Big_Reactors) { - wireFactory("Blutonium", 8196, BaseWireID, 8, 32, 2, new short[] { 28, 28, 218, 0 }); - wireFactory("Cyanite", 512, BaseWireID + 15, 2, 16, 4, new short[] { 27, 130, 178, 0 }); - wireFactory("Yellorium", 2048, BaseWireID + 30, 4, 16, 2, new short[] { 150, 195, 54, 0 }); - } - - if (LoadedMods.EnderIO) { + if (EnderIO.isModLoaded()) { wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 }); } @@ -204,7 +200,7 @@ public class GregtechConduits { makeCustomWires(ELEMENT.STANDALONE.HYPOGEN, BaseWireID - 15, 0, 0, 8, GT_Values.V[11], false, true); // superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8); - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { // superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8); } } @@ -213,7 +209,7 @@ public class GregtechConduits { generateNonGTFluidPipes(GT_Materials.Staballoy, ALLOY.STABALLOY, BasePipeID, 12500, 7500, true); generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, BasePipeID + 5, 10000, 4250, true); generateNonGTFluidPipes(GT_Materials.Tantalloy61, ALLOY.TANTALLOY_61, BasePipeID + 10, 12000, 5800, true); - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { generateNonGTFluidPipes(GT_Materials.Void, null, BasePipeID + 15, 1600, 25000, true); } generateGTFluidPipes(Materials.Europium, BasePipeID + 20, 12000, 7500, true); @@ -225,7 +221,7 @@ public class GregtechConduits { generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, BasePipeID + 50, 20000, 4200, true); generateGTFluidPipes(Materials.Tungsten, BasePipeID + 55, 4320, 7200, true); - if (LoadedMods.EnderIO) { + if (EnderIO.isModLoaded()) { generateGTFluidPipes(Materials.DarkSteel, BasePipeID + 60, 2320, 2750, true); } generateGTFluidPipes(Materials.Clay, BasePipeID + 65, 100, 500, false); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 08ceea038d..4062003d50 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -5,7 +5,16 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.*; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake_Extreme; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ControlCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Naquadah; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Reservoir; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_TurbineProvider; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Input; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Output; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase; public class GregtechCustomHatches { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 1c06d512c3..b361c6810a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.Mods.COFHCore; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_RfConvertor; @@ -26,7 +27,7 @@ public class GregtechEnergyBuffer { private static void run1() { // itemBufferCore = new - // Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + // Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(GTPlusPlus.ID // + ":itemBufferCore"); // Registry @@ -75,7 +76,7 @@ public class GregtechEnergyBuffer { "", 0).getStackForm(1L)); - if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) { + if (COFHCore.isModLoaded() && CORE.ConfigSwitches.enableMachine_RF_Convetor) { // RF Convertor Buffer Has Special ID GregtechItemList.Energy_Buffer_RF_Convertor.set( new GT_MetaTileEntity_RfConvertor(31022, "energybuffer.rf.tier.01", "RF Energy Convertor", 3, "", 0) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java index d59c6a1397..b021764ad2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java @@ -1,11 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.Mods.GoodGenerator; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_HeatExchanger; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.*; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Gas; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Plasma; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_SCSteam; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_SHSteam; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Steam; public class GregtechLargeTurbinesAndHeatExchanger { @@ -27,7 +32,7 @@ public class GregtechLargeTurbinesAndHeatExchanger { GregtechItemList.Large_Plasma_Turbine.set( new GT_MTE_LargeTurbine_Plasma(31074, "multimachine.largerplasmaturbine", "XL Turbo Plasma Turbine") .getStackForm(1L)); - if (LoadedMods.GoodGenerator) { + if (GoodGenerator.isModLoaded()) { GregtechItemList.Large_SCSteam_Turbine.set( new GT_MTE_LargeTurbine_SCSteam(31076, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine") .getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java index a48c8ac39c..e15ca67a6c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java @@ -1,6 +1,9 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import gregtech.api.enums.*; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java index bf5a5f7ba6..a69f6d7f4b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java @@ -1,14 +1,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.Mods.Thaumcraft; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator; public class GregtechThaumcraftDevices { public static void run() { - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { Logger.INFO("Gregtech5u Content | Registering Thaumcraft content."); run1(); } diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java b/src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java deleted file mode 100644 index 6dc79aa906..0000000000 --- a/src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java +++ /dev/null @@ -1,21 +0,0 @@ -package gtPlusPlus.xmod.growthcraft; - -import gtPlusPlus.core.lib.LoadedMods; - -public class HANDLER_GC { - - // Run me during Pre-Init - public static void preInit() { - if (LoadedMods.Growthcraft) { - // Register_Booze.preInit(); - } - } - - public static void init() { - if (LoadedMods.Growthcraft) {} - } - - public static void postInit() { - if (LoadedMods.Growthcraft) {} - } -} diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java deleted file mode 100644 index 2cf1032c4b..0000000000 --- a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java +++ /dev/null @@ -1,203 +0,0 @@ -package gtPlusPlus.xmod.growthcraft.fishtrap; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class FishTrapHandler { - - private static final String[] fishTypes = { "fish", "junk", "treasure" }; - private static Object mFishingRegistry; - private static Growthcraft_Old mHandler; - - public static Object getFishingRegistry() { - if (mFishingRegistry != null) { - return mFishingRegistry; - } else { - return setFishTrapRegistry(); - } - } - - private static final Object setFishTrapRegistry() { - Class mFishingRegistryClass; - try { - mFishingRegistryClass = ReflectionUtils.getClass("growthcraft.api.fishtrap.FishTrapRegistry"); - final Method mFishingRegistryMethod = mFishingRegistryClass.getDeclaredMethod("getInstance"); - mFishingRegistry = mFishingRegistryMethod.invoke(null); - if (mFishingRegistry != null) { - return mFishingRegistry; - } - } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException e) {} - return null; - } - - protected static void addFish(final String lootType, final ItemStack lootStack, final int lootChance) { - - if (mFishingRegistry == null) { - setFishTrapRegistry(); - } - if (mHandler == null) { - mHandler = new Growthcraft_Old(); - } - - final String GCVersion = LoadedMods.getModVersion("Growthcraft"); - final String[] versionString = GCVersion.split("//."); - - if (LoadedMods.getModVersion("Growthcraft").contains("2.3.1") || versionString[1].equals("3")) { - if (lootType.equals(fishTypes[0])) { - mHandler.addTrapFish(lootStack, lootChance); - Logger.INFO("Added " + lootStack.getDisplayName() + " as an extra Fish for Growthcraft Fishtraps."); - } else if (lootType.equals(fishTypes[1])) { - mHandler.addTrapJunk(lootStack, lootChance); - Logger.INFO("Added " + lootStack.getDisplayName() + " as extra Junk for Growthcraft Fishtraps."); - } else if (lootType.equals(fishTypes[2])) { - mHandler.addTrapTreasure(lootStack, lootChance); - Logger.INFO("Added " + lootStack.getDisplayName() + " as extra Treasure for Growthcraft Fishtraps."); - } else { - return; - } - } /* - * else if (LoadedMods.getModVersion("Growthcraft").contains("2.7.2")){ if (lootType.equals(fishTypes[0])){ - * Growthcraft_New.addTrapFish(lootStack, lootChance); - * Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as an extra Fish for Growthcraft Fishtraps."); } else - * if (lootType.equals(fishTypes[1])){ Growthcraft_New.addTrapJunk(lootStack, lootChance); - * Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Junk for Growthcraft Fishtraps."); } else if - * (lootType.equals(fishTypes[2])){ Growthcraft_New.addTrapTreasure(lootStack, lootChance); - * Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Treasure for Growthcraft Fishtraps."); } else - * { return; } } - */ else { - Logger.INFO( - "Extra Fish loot for Growthcraft Fishtraps disabled. Found V." - + LoadedMods.getModVersion("Growthcraft")); - } - } - - // FishTrapHandler.pamsHarvestCraftCompat(); - static final String prefix = "food"; - static final String suffix = "raw"; - static final String seaweed = "cropSeaweed"; - static final String greenheartFish = "foodGreenheartfish"; - private static final String[] harvestcraftFish = { "Anchovy", "Bass", "Calamari", "Carp", "Catfish", "Charr", - "Clam", "Crab", "Crayfish", "Eel", "Frog", "Grouper", "Herring", "Jellyfish", "Mudfish", "Octopus", "Perch", - "Scallop", "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna", "Turtle", "Walley" }; - - public static void pamsHarvestCraftCompat() { - for (int i = 0; i < harvestcraftFish.length; i++) { - final String itemName = prefix + harvestcraftFish[i] + suffix; - final int lootChance = getLootChance(harvestcraftFish[i]); - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(itemName, 1) != null) { - // addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1), lootChance); - addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)); - addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)); - addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)); - } - } - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(greenheartFish, 1) != null) { - // addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1), - // getLootChance(greenheartFish)); - addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)); - addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)); - addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)); - } - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1) != null) { - // addFish("junk", ItemUtils.getItemStackOfAmountFromOreDict(seaweed, 1), getLootChance(seaweed)); - } - } - - private static int getLootChance(final String name) { - if (name.equals(harvestcraftFish[0])) { - return 20; - } else if (name.equals(harvestcraftFish[1])) { - return 10; - } else if (name.equals(harvestcraftFish[2])) { - return 15; - } else if (name.equals(harvestcraftFish[3])) { - return 55; - } else if (name.equals(harvestcraftFish[4])) { - return 5; - } else if (name.equals(harvestcraftFish[5])) { - return 8; - } else if (name.equals(harvestcraftFish[6])) { - return 11; - } else if (name.equals(harvestcraftFish[7])) { - return 11; - } else if (name.equals(harvestcraftFish[8])) { - return 15; - } else if (name.equals(harvestcraftFish[9])) { - return 1; - } else if (name.equals(harvestcraftFish[10])) { - return 5; - } else if (name.equals(harvestcraftFish[11])) { - return 10; - } else if (name.equals(harvestcraftFish[12])) { - return 25; - } else if (name.equals(harvestcraftFish[13])) { - return 15; - } else if (name.equals(harvestcraftFish[14])) { - return 20; - } // "Perch", "Scallop", "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna", "Turtle", "Walleye"}; - else if (name.equals(harvestcraftFish[15])) { - return 22; - } else if (name.equals(harvestcraftFish[16])) { - return 10; - } else if (name.equals(harvestcraftFish[17])) { - return 35; - } else if (name.equals(harvestcraftFish[18])) { - return 3; - } else if (name.equals(harvestcraftFish[19])) { - return 20; - } else if (name.equals(harvestcraftFish[20])) { - return 4; - } else if (name.equals(harvestcraftFish[21])) { - return 40; - } else if (name.equals(harvestcraftFish[22])) { - return 30; - } else if (name.equals(harvestcraftFish[23])) { - return 5; - } else if (name.equals(harvestcraftFish[24])) { - return 8; - } else { - return 25; - } - } - - private static void addGregtechCentrifugeRecipe(final ItemStack input) { - GT_Values.RA.addCentrifugeRecipe( - input, - null, - null, - FluidUtils.getFluidStack("methane", 96), - null, - null, - null, - null, - null, - null, - null, - 19 * 20, - 5); - } - - private static void addGregtechMaceratorRecipe(final ItemStack input) { - GT_ModHandler.addPulverisationRecipe( - input, - ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBone", 1), - 0); - } - - private static void addGregtechFluidRecipe(final ItemStack input) { - CORE.RA.addFluidExtractionRecipe(input, FluidUtils.getFluidStack("fishoil", 50), 16, 4); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java deleted file mode 100644 index bd1481f6b3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java +++ /dev/null @@ -1,83 +0,0 @@ -package gtPlusPlus.xmod.growthcraft.fishtrap; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.item.ItemStack; - -public class Growthcraft_New { - - Method addTrapJunk; - Method addTrapTreasure; - Method addTrapFish; - Object FishTrapRegistryO; - - public Growthcraft_New() { - setFishTrapRegistry(); - } - - void setFishTrapRegistry() { - try { - Class<?> FishTrapRegistryClass = Class - .forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry"); - Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry"); - if (FishTrapRegistryClass.isInstance(FishTrapHandler.getFishingRegistry())) { - addTrapJunk = FishTrapRegistryClass.getDeclaredMethod("addTrapJunk", FishTrapEntry); - addTrapTreasure = FishTrapRegistryClass.getDeclaredMethod("addTrapTreasure", FishTrapEntry); - addTrapFish = FishTrapRegistryClass.getDeclaredMethod("addTrapFish", FishTrapEntry); - FishTrapRegistryO = FishTrapHandler.getFishingRegistry(); - } - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) { - e.printStackTrace(); - } - } - - private Object createFishTrapEntry(ItemStack loot, int chance) { - try { - Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry"); - Object o = FishTrapEntry.getConstructor(ItemStack.class, int.class); - if (FishTrapEntry != null) { - Constructor[] constructors = FishTrapEntry.getDeclaredConstructors(); - constructors[0].setAccessible(true); - Object x = constructors[0].newInstance(loot, chance); - if (x != null) { - return x; - } - } - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException - | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - - return null; - } - - private boolean invoke(Method m, ItemStack o, int p) { - try { - Object I = createFishTrapEntry(o, p); - m.invoke(FishTrapRegistryO, I); - return true; - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - return false; - } - - public void addTrapJunk(final ItemStack loot, final int lootChance) { - // FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance)); - if (addTrapJunk != null) { - invoke(addTrapJunk, loot, lootChance); - } - } - - public void addTrapTreasure(final ItemStack loot, final int lootChance) { - // FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance)); - if (addTrapTreasure != null) { - invoke(addTrapTreasure, loot, lootChance); - } - } - - public void addTrapFish(final ItemStack loot, final int lootChance) { - // FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance)); - if (addTrapFish != null) { - invoke(addTrapFish, loot, lootChance); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java deleted file mode 100644 index 0d1fd8e7dd..0000000000 --- a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java +++ /dev/null @@ -1,83 +0,0 @@ -package gtPlusPlus.xmod.growthcraft.fishtrap; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.item.ItemStack; - -public class Growthcraft_Old { - - Method addTrapJunk; - Method addTrapTreasure; - Method addTrapFish; - Object FishTrapRegistryO; - - public Growthcraft_Old() { - setFishTrapRegistry(); - } - - void setFishTrapRegistry() { - try { - Class<?> FishTrapRegistryClass = Class - .forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry"); - Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry"); - if (FishTrapRegistryClass.isInstance(FishTrapHandler.getFishingRegistry())) { - addTrapJunk = FishTrapRegistryClass.getDeclaredMethod("addTrapJunk", FishTrapEntry); - addTrapTreasure = FishTrapRegistryClass.getDeclaredMethod("addTrapTreasure", FishTrapEntry); - addTrapFish = FishTrapRegistryClass.getDeclaredMethod("addTrapFish", FishTrapEntry); - FishTrapRegistryO = FishTrapHandler.getFishingRegistry(); - } - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) { - e.printStackTrace(); - } - } - - private Object createFishTrapEntry(ItemStack loot, int chance) { - try { - Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry"); - Object o = FishTrapEntry.getConstructor(ItemStack.class, int.class); - if (FishTrapEntry != null) { - Constructor[] constructors = FishTrapEntry.getDeclaredConstructors(); - constructors[0].setAccessible(true); - Object x = constructors[0].newInstance(loot, chance); - if (x != null) { - return x; - } - } - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException - | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - - return null; - } - - private boolean invoke(Method m, ItemStack o, int p) { - try { - Object I = createFishTrapEntry(o, p); - m.invoke(FishTrapRegistryO, I); - return true; - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - return false; - } - - public void addTrapJunk(final ItemStack loot, final int lootChance) { - // FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance)); - if (addTrapJunk != null) { - invoke(addTrapJunk, loot, lootChance); - } - } - - public void addTrapTreasure(final ItemStack loot, final int lootChance) { - // FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance)); - if (addTrapTreasure != null) { - invoke(addTrapTreasure, loot, lootChance); - } - } - - public void addTrapFish(final ItemStack loot, final int lootChance) { - // FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance)); - if (addTrapFish != null) { - invoke(addTrapFish, loot, lootChance); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java index 192e7f41d5..475d8d5feb 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java @@ -9,8 +9,6 @@ public class HANDLER_IC2 { IC2_Items.register(); } - public static void init() {} - public static void postInit() { RECIPE_IC2.initRecipes(); } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java index f86562f1de..50787c0828 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java @@ -17,7 +17,10 @@ import cpw.mods.fml.relauncher.SideOnly; import ic2.api.energy.tile.IKineticSource; import ic2.api.item.IKineticRotor; import ic2.api.item.IKineticRotor.GearboxType; -import ic2.core.*; +import ic2.core.ContainerBase; +import ic2.core.IC2; +import ic2.core.IHasGui; +import ic2.core.WorldData; import ic2.core.block.invslot.InvSlotConsumableKineticRotor; import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java index 8dafc12de8..ceaa330e4f 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.ic2.item; +import static gregtech.api.enums.Mods.EnderIO; + import java.util.List; import net.minecraft.client.Minecraft; @@ -14,7 +16,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.LoadedMods; import ic2.api.item.IKineticRotor; import ic2.core.IC2; import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; @@ -56,7 +57,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor { mTier = aTier; this.setMaxStackSize(1); // Handle Differences if EIO is not loaded - if (!LoadedMods.EnderIO && (aTier == 0 || aTier == 2)) { + if (!EnderIO.isModLoaded() && (aTier == 0 || aTier == 2)) { this.renderTexture = mResourceLocations[(aTier == 0 ? 4 : 5)]; this.setUnlocalizedName(mUnlocalNames[(aTier == 0 ? 4 : 5)]); } else { @@ -152,7 +153,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor { @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { - if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) { + if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) { if (mTier == 0) { return mTextures[4]; } else { @@ -166,7 +167,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor { @Override @SideOnly(Side.CLIENT) public IIcon getIconIndex(ItemStack aIndex) { - if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) { + if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) { if (mTier == 0) { return mTextures[4]; } else { @@ -180,7 +181,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor { @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamageForRenderPass(int aDmg, int aPass) { - if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) { + if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) { if (mTier == 0) { return mTextures[4]; } else { @@ -209,7 +210,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) { + if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) { if (mTier == 0) { return mTextures[4]; } else { @@ -223,7 +224,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass) { - if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) { + if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) { if (mTier == 0) { return mTextures[4]; } else { diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java index e3401dcbc8..98846e6950 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.ic2.item; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -10,14 +12,13 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class IC2_ItemIC2 extends Item { public IC2_ItemIC2(final String internalName) { this.setUnlocalizedName(internalName); this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setTextureName(CORE.MODID + ":" + internalName); + this.setTextureName(GTPlusPlus.ID + ":" + internalName); GameRegistry.registerItem(this, internalName); } @@ -35,7 +36,7 @@ public class IC2_ItemIC2 extends Item { * (getTextureName(indexCount) != null) { indexCount++; if (indexCount > 32767) { throw new * RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName()); } } this.textures = new * IIcon[indexCount]; for (int index = 0; index < indexCount; index++) { this.textures[index] = - * iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName()); } } + * iconRegister.registerIcon(GTPlusPlus.ID + ":" + getUnlocalizedName()); } } * @Override * @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { if (meta < this.textures.length) { return * this.textures[meta]; } return this.textures.length < 1 ? null : this.textures[0]; } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java index 87dbd83e65..c4ca148920 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java @@ -1,11 +1,12 @@ package gtPlusPlus.xmod.ic2.item; +import static gregtech.api.enums.Mods.EnderIO; + import net.minecraft.item.ItemStack; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx; -import gtPlusPlus.core.lib.LoadedMods; public class IC2_Items { @@ -34,7 +35,7 @@ public class IC2_Items { public static void register() { - int aIndexEIO = (LoadedMods.EnderIO ? 0 : 1); + int aIndexEIO = (EnderIO.isModLoaded() ? 0 : 1); // Rotor Blades rotor_Blade_Material_1 = new ItemStack( diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java index 730ef865fc..d07f1f6314 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java @@ -1,17 +1,21 @@ package gtPlusPlus.xmod.ic2.recipe; -import static gtPlusPlus.core.recipe.RECIPES_Tools.*; +import static gregtech.api.enums.Mods.EnderIO; +import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolHardHammer; +import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolWrench; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; @@ -65,7 +69,7 @@ public class RECIPE_IC2 { private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_4.getItem()); private static boolean checkForEnderIO() { - if (!LoadedMods.EnderIO) { + if (!EnderIO.isModLoaded()) { plate_T1 = "plateMagnalium"; plate_T2 = "plateTungstenSteel"; plate_T3 = "plateUltimet"; diff --git a/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java b/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java deleted file mode 100644 index f1b84c563d..0000000000 --- a/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java +++ /dev/null @@ -1,393 +0,0 @@ -package gtPlusPlus.xmod.mekanism; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.NBTUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; - -public class HANDLER_Mekanism { - - public static void preInit() { - if (LoadedMods.Mekanism) {} - } - - public static void init() { - if (LoadedMods.Mekanism) {} - } - - public static void postInit() { - if (LoadedMods.Mekanism && !LoadedMods.RedTech) { - - Logger.INFO("Performing GT recipe balance for Mek. now that it's Osmium is useless."); - - // Steel Casing - final ItemStack tSteelCasing = ItemUtils.simpleMetaStack("Mekanism:BasicBlock:8", 8, 1); - addNewRecipe( - "plateSteel", - "blockGlass", - "plateSteel", - "blockGlass", - "plateStainlessSteel", - "blockGlass", - "plateSteel", - "blockGlass", - "plateSteel", - tSteelCasing); - - // Energy Storage - final ItemStack tAdvancedEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy(); - NBTUtils.setString(tAdvancedEnergyCube, "tier", "Advanced"); - final ItemStack tBasicEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy(); - NBTUtils.setString(tBasicEnergyCube, "tier", "Basic"); - - // Gas tanks - final ItemStack tBasicGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy(); - NBTUtils.setInteger(tBasicGasTank, "tier", 0); - final ItemStack tAdvancedGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy(); - NBTUtils.setInteger(tAdvancedGasTank, "tier", 1); - final ItemStack tEliteGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy(); - NBTUtils.setInteger(tEliteGasTank, "tier", 2); - final ItemStack tMasterGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy(); - NBTUtils.setInteger(tMasterGasTank, "tier", 3); - - // Machines that use Osmium - final ItemStack tMachineBlock_Basic = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:5", 5, 1); - final ItemStack tMachineBlock = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:6", 6, 1); - - // Smelting - final ItemStack tMachineBlock_0_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_0_Basic, "recipeType", 0); - final ItemStack tMachineBlock_0 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_0, "recipeType", 0); - // Enriching - final ItemStack tMachineBlock_1_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_1_Basic, "recipeType", 1); - final ItemStack tMachineBlock_1 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_1, "recipeType", 1); - // Crushing - final ItemStack tMachineBlock_2_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_2_Basic, "recipeType", 2); - final ItemStack tMachineBlock_2 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_2, "recipeType", 2); - // Compressing - final ItemStack tMachineBlock_3_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_3_Basic, "recipeType", 3); - final ItemStack tMachineBlock_3 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_3, "recipeType", 3); - // Combining - final ItemStack tMachineBlock_4_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_4_Basic, "recipeType", 4); - final ItemStack tMachineBlock_4 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_4, "recipeType", 4); - // Purifying - final ItemStack tMachineBlock_5_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_5_Basic, "recipeType", 5); - final ItemStack tMachineBlock_5 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_5, "recipeType", 5); - // Injecting - final ItemStack tMachineBlock_6_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_6_Basic, "recipeType", 6); - final ItemStack tMachineBlock_6 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_6, "recipeType", 6); - // Infusing - final ItemStack tMachineBlock_7_Basic = tMachineBlock_Basic.copy(); - NBTUtils.setInteger(tMachineBlock_7_Basic, "recipeType", 7); - final ItemStack tMachineBlock_7 = tMachineBlock.copy(); - NBTUtils.setInteger(tMachineBlock_7, "recipeType", 7); - - // Infuser - final ItemStack tMachineBlock_8 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:8", 8, 1); - // Purification - final ItemStack tMachineBlock_9 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:9", 9, 1); - // Pump - final ItemStack tMachineBlock_12 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:12", 12, 1); - - // <Mekanism:ElectrolyticCore> - final ItemStack tItem_1 = ItemUtils.simpleMetaStack("Mekanism:ElectrolyticCore", 0, 1); - // <Mekanism:FactoryInstaller:1> - final ItemStack tItem_2 = ItemUtils.simpleMetaStack("Mekanism:FactoryInstaller:1", 1, 1); - // <Mekanism:SpeedUpgrade> - final ItemStack tItem_3 = ItemUtils.simpleMetaStack("Mekanism:SpeedUpgrade", 0, 1); - - // MiscItems - final String tAdvancedAlloy = "alloyAdvanced"; - final String tCircuitAdvanced = "circuitAdvanced"; - final ItemStack tMekBatterySimple = ItemUtils.simpleMetaStack("Mekanism:EnergyTablet", 0, 1); - - // Items - addNewRecipe( - tAdvancedAlloy, - "plateTitanium", - tAdvancedAlloy, - "dustIron", - tAdvancedAlloy, - "dustGold", - tAdvancedAlloy, - "plateTitanium", - tAdvancedAlloy, - tItem_1); - addNewRecipe( - tAdvancedAlloy, - "circuitAdvanced", - tAdvancedAlloy, - "plateStainlessSteel", - "plankWood", - "plateStainlessSteel", - tAdvancedAlloy, - "circuitAdvanced", - tAdvancedAlloy, - tItem_2); - addNewRecipe( - null, - "blockGlass", - null, - tAdvancedAlloy, - "plateTungsten", - tAdvancedAlloy, - null, - "blockGlass", - null, - tItem_3); - - // Power Storage - addNewRecipe( - tAdvancedAlloy, - tMekBatterySimple, - tAdvancedAlloy, - "plateAluminium", - tBasicEnergyCube, - "plateAluminium", - tAdvancedAlloy, - tMekBatterySimple, - tAdvancedAlloy, - tAdvancedEnergyCube); - - // Blocks - addNewRecipe( - "plateSteel", - "craftingFurnace", - "plateSteel", - "plateRedstone", - "platePlatinum", - "plateRedstone", - "plateSteel", - "craftingFurnace", - "plateSteel", - tMachineBlock_8); - addNewRecipe( - tAdvancedAlloy, - "circuitAdvanced", - tAdvancedAlloy, - "plateTitanium", - ItemUtils.simpleMetaStack("Mekanism:MachineBlock", 0, 1), - "plateTitanium", - tAdvancedAlloy, - "circuitAdvanced", - tAdvancedAlloy, - tMachineBlock_9); - addNewRecipe( - null, - ItemUtils.getSimpleStack(Items.bucket), - null, - tAdvancedAlloy, - tSteelCasing, - tAdvancedAlloy, - "plateStainlessSteel", - "plateStainlessSteel", - "plateStainlessSteel", - tMachineBlock_12); - - // Machines - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_0_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_0); - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_1_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_1); - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_2_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_2); - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_3_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_3); - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_4_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_4); - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_5_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_5); - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_6_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_6); - addNewRecipe( - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - "plateStainlessSteel", - tMachineBlock_7_Basic, - "plateStainlessSteel", - tAdvancedAlloy, - tCircuitAdvanced, - tAdvancedAlloy, - tMachineBlock_7); - - // Gas Tanks - addNewRecipe( - "plateRedstone", - "plateAluminium", - "plateRedstone", - "plateAluminium", - null, - "plateAluminium", - "plateRedstone", - "plateAluminium", - "plateRedstone", - tBasicGasTank); - addNewRecipe( - tAdvancedAlloy, - "plateStainlessSteel", - tAdvancedAlloy, - "plateStainlessSteel", - tBasicGasTank, - "plateStainlessSteel", - tAdvancedAlloy, - "plateStainlessSteel", - tAdvancedAlloy, - tAdvancedGasTank); - addNewRecipe( - "alloyElite", - "plateTitanium", - "alloyElite", - "plateTitanium", - tAdvancedGasTank, - "plateTitanium", - "alloyElite", - "plateTitanium", - "alloyElite", - tEliteGasTank); - addNewRecipe( - "alloyUltimate", - "plateTungsten", - "alloyUltimate", - "plateTungsten", - tEliteGasTank, - "plateTungsten", - "alloyUltimate", - "plateTungsten", - "alloyUltimate", - tMasterGasTank); - } - } - - private static boolean addNewRecipe(final Object InputItem1, final Object InputItem2, final Object InputItem3, - final Object InputItem4, final Object InputItem5, final Object InputItem6, final Object InputItem7, - final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) { - - /* - * if (removeRecipe(OutputItem)){ return RecipeUtils.recipeBuilder( InputItem1, InputItem2, InputItem3, - * InputItem4, InputItem5, InputItem6, InputItem7, InputItem8, InputItem9, OutputItem); } - */ - - removeRecipe(OutputItem); - return RecipeUtils.recipeBuilder( - InputItem1, - InputItem2, - InputItem3, - InputItem4, - InputItem5, - InputItem6, - InputItem7, - InputItem8, - InputItem9, - OutputItem); - } - - private static boolean removeRecipe(final ItemStack item) { - Class<?> mekUtils; - boolean removed = false; - try { - mekUtils = Class.forName("mekanism.common.util.RecipeUtils"); - if (mekUtils != null) { - final Method mRemoveRecipe = mekUtils.getDeclaredMethod("removeRecipes", ItemStack.class); - if (mRemoveRecipe != null) { - removed = (boolean) mRemoveRecipe.invoke(null, item); - if (!removed) { - removed = (boolean) mRemoveRecipe.invoke(mekUtils, item); - } - } - } - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - Logger.INFO("[Mek] Failed to use the built-in recipe remover from Mekanism."); - } - if (!removed) { - removed = GT_ModHandler.removeRecipeByOutput(item); - } - Logger.INFO("[Mek] Successfully removed the recipe for " + item.getDisplayName() + "."); - return removed; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java b/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java index 065b28c7e7..2f9178678d 100644 --- a/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java +++ b/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java @@ -1,22 +1,19 @@ package gtPlusPlus.xmod.ob; -import gtPlusPlus.core.lib.LoadedMods; +import static gregtech.api.enums.Mods.OpenBlocks; + import gtPlusPlus.core.util.Utils; public class HANDLER_OpenBlocks { - public static void preInit() { - if (LoadedMods.OpenBlocks) {} - } - public static void init() { - if (LoadedMods.OpenBlocks) { + if (OpenBlocks.isModLoaded()) { GliderHandler.populateBlacklist(); } } public static void postInit() { - if (LoadedMods.OpenBlocks) { + if (OpenBlocks.isModLoaded()) { Utils.registerEvent(new GliderHandler()); } } diff --git a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java index 3b80442d45..37133444e5 100644 --- a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java +++ b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.ob; +import static gregtech.api.enums.Mods.Forestry; + import java.util.HashMap; import net.minecraft.init.Items; @@ -8,7 +10,6 @@ import net.minecraft.item.ItemStack; import com.google.common.base.Objects; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; /** @@ -45,7 +46,7 @@ public class SprinklerHandler { f = new ItemStack(Items.dye, 1, 15); SprinklerHandler.registerSprinklerFertilizer(f); - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { f = ItemUtils.getCorrectStacktype("Forestry:fertilizerBio", 1); if (f != null) { registerSprinklerFertilizer(f); diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java index e41b744d18..ad0953b8f2 100644 --- a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java +++ b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.railcraft; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import net.minecraft.init.Blocks; @@ -14,7 +17,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemBurnable; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -23,8 +25,6 @@ import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils; public class HANDLER_Railcraft { public static void preInit() { - if (LoadedMods.Railcraft) {} - // Register Custom Coal Coke ModItems.itemCoalCoke = new BaseItemBurnable( "itemCoalCoke", @@ -35,7 +35,7 @@ public class HANDLER_Railcraft { "Used for metallurgy.", "fuelCoke", 3200, - 0).setTextureName(CORE.MODID + ":burnables/itemCoalCoke"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCoalCoke"); // Add in things that once existed in 1.5.2 ModItems.itemCactusCharcoal = new BaseItemBurnable( @@ -47,7 +47,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelCactusCharcoal", 400, - 0).setTextureName(CORE.MODID + ":burnables/itemCactusCharcoal"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCharcoal"); ModItems.itemSugarCharcoal = new BaseItemBurnable( "itemSugarCharcoal", "Sugar Charcoal", @@ -57,7 +57,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelSugarCharcoal", 400, - 0).setTextureName(CORE.MODID + ":burnables/itemSugarCharcoal"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCharcoal"); ModItems.itemCactusCoke = new BaseItemBurnable( "itemCactusCoke", "Cactus Coke", @@ -67,7 +67,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelCactusCoke", 800, - 0).setTextureName(CORE.MODID + ":burnables/itemCactusCoke"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCoke"); ModItems.itemSugarCoke = new BaseItemBurnable( "itemSugarCoke", "Sugar Coke", @@ -77,7 +77,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelSugarCoke", 800, - 0).setTextureName(CORE.MODID + ":burnables/itemSugarCoke"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCoke"); ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), "itemCharcoalCactus"); ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCoke), "itemCokeCactus"); @@ -85,13 +85,7 @@ public class HANDLER_Railcraft { ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCoke), "itemCokeSugar"); } - public static void init() { - if (LoadedMods.Railcraft) {} - } - public static void postInit() { - if (LoadedMods.Railcraft) {} - generateCokeOvenRecipes(); } @@ -185,7 +179,7 @@ public class HANDLER_Railcraft { 40, 8); } - if (LoadedMods.Railcraft) { + if (Railcraft.isModLoaded()) { for (int i = 0; i < aOutputs.length; i++) { RailcraftUtils.addCokeOvenRecipe( aInputs1[i], @@ -205,7 +199,7 @@ public class HANDLER_Railcraft { 500); } - if (LoadedMods.DreamCraft) { + if (NewHorizonsCoreMod.isModLoaded()) { for (int i = 0; i < aOutputs.length; i++) { RailcraftUtils.addAdvancedCokeOvenRecipe(aInputs1[i], true, true, aInputs2[i], 20); } diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java b/src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java deleted file mode 100644 index 4e6317fe21..0000000000 --- a/src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java +++ /dev/null @@ -1,21 +0,0 @@ -package gtPlusPlus.xmod.reliquary; - -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.xmod.reliquary.util.ReliquaryRecipeHandler; - -public class HANDLER_Reliquary { - - public static void preInit() { - if (LoadedMods.Reliquary) {} - } - - public static void init() { - if (LoadedMods.Reliquary) {} - } - - public static void postInit() { - if (LoadedMods.Reliquary) { - ReliquaryRecipeHandler.gregifyDefaultRecipes(); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java b/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java deleted file mode 100644 index 8dbf5d60b7..0000000000 --- a/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java +++ /dev/null @@ -1,160 +0,0 @@ -package gtPlusPlus.xmod.reliquary.item; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class ReliquaryItems { - - private static Class<?> CLASS_MAIN = ReflectionUtils.getClass("xreliquary.Reliquary"); - private static Field FIELD_CONTENT = ReflectionUtils.getField(CLASS_MAIN, "CONTENT"); - private static Object OBJECT_CONTENT = ReflectionUtils.getFieldValue(FIELD_CONTENT); - private static Method METHOD_GETITEM = ReflectionUtils - .getMethod(OBJECT_CONTENT, "getItem", new Class[] { String.class }); - - public static Item getItem(String name) { - try { - return (Item) METHOD_GETITEM.invoke(OBJECT_CONTENT, name); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - return null; - } - - public static ItemStack emptyVoidTear() { - return new ItemStack(getItem("void_tear_empty"), 1, 0); - } - - public static ItemStack glowingWater() { - return new ItemStack(getItem("glowing_water")); - } - - public static ItemStack emptyVial() { - return new ItemStack(getItem("potion"), 1, 0); - } - - public static ItemStack emperorChalice() { - return new ItemStack(getItem("emperor_chalice")); - } - - public static ItemStack infernalChalice() { - return new ItemStack(getItem("infernal_chalice")); - } - - public static ItemStack witherSkull() { - return new ItemStack(Items.skull, 1, 1); - } - - public static ItemStack roseBush() { - return new ItemStack(Blocks.double_plant, 1, 4); - } - - public static ItemStack blackWool() { - return new ItemStack(Blocks.wool, 1, 15); - } - - public static ItemStack lapis() { - return new ItemStack(Items.dye, 1, 4); - } - - public static ItemStack gunPart(int i, int m) { - return new ItemStack(getItem("gun_part"), i, m); - } - - public static ItemStack magazine(int m) { - return magazine(1, m); - } - - public static ItemStack magazine(int i, int m) { - return new ItemStack(getItem("magazine"), i, m); - } - - public static ItemStack bullet(int m) { - return bullet(1, m); - } - - public static ItemStack bullet(int i, int m) { - return new ItemStack(getItem("bullet"), i, m); - } - - public static ItemStack ingredient(int m) { - return new ItemStack(getItem("mob_ingredient"), 1, m); - } - - public static ItemStack enderHeart() { - return ingredient(11); - } - - public static ItemStack creeperGland() { - return ingredient(3); - } - - public static ItemStack slimePearl() { - return ingredient(4); - } - - public static ItemStack batWing() { - return ingredient(5); - } - - public static ItemStack ribBone() { - return ingredient(0); - } - - public static ItemStack witherRib() { - return ingredient(1); - } - - public static ItemStack stormEye() { - return ingredient(8); - } - - public static ItemStack fertileEssence() { - return ingredient(9); - } - - public static ItemStack frozenCore() { - return ingredient(10); - } - - public static ItemStack moltenCore() { - return ingredient(7); - } - - public static ItemStack zombieHeart() { - return ingredient(6); - } - - public static ItemStack infernalClaw() { - return ingredient(13); - } - - public static ItemStack shellFragment() { - return ingredient(14); - } - - public static ItemStack squidBeak() { - return ingredient(12); - } - - public static ItemStack spiderFangs() { - return ingredient(2); - } - - public static ItemStack heartPearl(int m) { - return new ItemStack(getItem("heart_pearl"), 1, m); - } - - public static ItemStack nianZhu(int m) { - return new ItemStack(getItem("heart_zhu"), 1, m); - } - - public static ItemStack emptyVoidSatchel() { - return new ItemStack(getItem("void_tear_empty"), 1, 0); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java deleted file mode 100644 index 2209afddc7..0000000000 --- a/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java +++ /dev/null @@ -1,51 +0,0 @@ -package gtPlusPlus.xmod.reliquary.util; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class AlkahestRecipeWrapper { - - public ItemStack item = null; - public int yield = 0; - public int cost = 0; - public String dictionaryName = null; - - public AlkahestRecipeWrapper(ItemStack par1, int par2, int par3) { - this.item = par1; - this.yield = par2; - this.cost = par3; - } - - public AlkahestRecipeWrapper(String par1, int par2, int par3) { - this.dictionaryName = par1; - this.yield = par2; - this.cost = par3; - } - - public Object getOriginalRecipe() { - try { - Constructor<?> o; - if (dictionaryName == null) { - o = ReflectionUtils.getClass("xreliquary.util.alkahestry.AlkahestRecipe") - .getConstructor(ItemStack.class, int.class, int.class); - } else { - o = ReflectionUtils.getClass("xreliquary.util.alkahestry.AlkahestRecipe") - .getConstructor(String.class, int.class, int.class); - } - - Object r = o.newInstance(dictionaryName == null ? item : dictionaryName, yield, cost); - if (r != null) { - return r; - } - - } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - // oops - } - return null; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java deleted file mode 100644 index 093c21f898..0000000000 --- a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package gtPlusPlus.xmod.reliquary.util; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.reliquary.item.ReliquaryItems; - -public class ReliquaryRecipeHandler { - - public static boolean removeAlkahestRecipe(ItemStack aOutput) { - return false; - } - - public static boolean addAlkahestRecipe(ItemStack[] aInputs, ItemStack aOutput) { - if (aInputs == null || aInputs.length <= 0 || aInputs.length > 9) { - return false; - } - return false; - } - - public static void gregifyDefaultRecipes() { - Logger.INFO("Gregifying Reliquary recipes."); - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.glowingWater())) { - Logger.INFO("Removing recipe for Glowing Water."); - } - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.emptyVoidTear())) { - Logger.INFO("Removing recipe for Empty Void Tears."); - } - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.emperorChalice())) { - Logger.INFO("Removing recipe for the Emperor Chalice."); - } - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.infernalChalice())) { - Logger.INFO("Removing recipe for the Infernal Chalice."); - } - Logger.INFO("Finished removing original recipes."); - - // Add new recipes - if (CORE.RA.addChemicalRecipe( - ALLOY.ENERGYCRYSTAL.getDust(4), - ReliquaryItems.emptyVial(), - FluidUtils.getHotWater(2000), - null, - ReliquaryItems.glowingWater(), - 20 * 30, - 500)) { - Logger.INFO("Added new recipe for Glowing Water."); - } - if (CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { ItemUtils.simpleMetaStack(Items.ender_eye, 0, 32), CI.getFieldGenerator(5, 8), - CI.getTieredComponent(OrePrefixes.plate, 5, 16), CI.getEmitter(3, 20) }, - FluidUtils.getUUM(50), - ReliquaryItems.emptyVoidTear(), - 20 * 2000, - 2000)) { - Logger.INFO("Added new recipe for Empty Void Tears."); - } - Logger.INFO("Finished adding new recipes."); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java b/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java index 4453f55524..759afb3f17 100644 --- a/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java +++ b/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java @@ -1,17 +1,14 @@ package gtPlusPlus.xmod.sc2; +import static gregtech.api.enums.Mods.StevesCarts2; + import vswe.stevescarts.ModuleData.GppModuleData; -import gtPlusPlus.core.lib.LoadedMods; public class HANDLER_SC2 { public static synchronized void preInit() { - if (LoadedMods.StevesCarts) { + if (StevesCarts2.isModLoaded()) { GppModuleData.loadGpp(); } } - - public static void init() {} - - public static void postInit() {} } diff --git a/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java b/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java index ba4f76ae34..cb099d37f8 100644 --- a/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java +++ b/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.sc2.modules; +import static gregtech.api.enums.Mods.Forestry; import static net.minecraft.init.Blocks.farmland; import java.lang.reflect.Field; @@ -14,7 +15,6 @@ import net.minecraft.world.World; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Modules.Addons.ModuleAddon; import vswe.stevescarts.Modules.ICropModule; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; public class ModuleExoticSeeds extends ModuleAddon implements ICropModule { @@ -56,8 +56,8 @@ public class ModuleExoticSeeds extends ModuleAddon implements ICropModule { // If Forestry is loaded, let's make this upgrade convert farmland to Humus. /* - * if (LoadedMods.Forestry) { Block mFarmLand = world.getBlock(x, y-1, z); if (mFarmLand == farmland) { Block h - * = tryGetHumus(); if (h != farmland) { world.setBlock(x, y-1, z, h); } } } + * if (Forestry.isModLoaded()) { Block mFarmLand = world.getBlock(x, y-1, z); if (mFarmLand == farmland) { Block + * h = tryGetHumus(); if (h != farmland) { world.setBlock(x, y-1, z, h); } } } */ return b instanceof BlockCrops && m == 7; @@ -73,35 +73,36 @@ public class ModuleExoticSeeds extends ModuleAddon implements ICropModule { private static Block mForestryHumusBlock; private synchronized Block tryGetHumus() { - if (!LoadedMods.Forestry) { + if (!Forestry.isModLoaded()) { return farmland; - } else { - if (mForestryHumusBlockClass == null || mForestryHumusBlock == null) { - try { - mForestryHumusBlockClass = ReflectionUtils.getClass("forestry.plugins.PluginCore"); - Field blocks = ReflectionUtils.getField(mForestryHumusBlockClass, "blocks"); - if (blocks != null) { - Object blockRegistryCoreObject = blocks.get(null); - mForestryBlockRegistryCoreClass = ReflectionUtils - .getClass("forestry.core.blocks.BlockRegistryCore"); - if (mForestryBlockRegistryCoreClass != null && blockRegistryCoreObject != null) { - Field soil = ReflectionUtils.getField(mForestryBlockRegistryCoreClass, "soil"); - if (soil != null) { - Block testHumus = (Block) soil.get(blockRegistryCoreObject); - if (testHumus != null) { - mForestryHumusBlock = testHumus; - } + } + + if (mForestryHumusBlockClass == null || mForestryHumusBlock == null) { + try { + mForestryHumusBlockClass = ReflectionUtils.getClass("forestry.plugins.PluginCore"); + Field blocks = ReflectionUtils.getField(mForestryHumusBlockClass, "blocks"); + if (blocks != null) { + Object blockRegistryCoreObject = blocks.get(null); + mForestryBlockRegistryCoreClass = ReflectionUtils + .getClass("forestry.core.blocks.BlockRegistryCore"); + if (mForestryBlockRegistryCoreClass != null && blockRegistryCoreObject != null) { + Field soil = ReflectionUtils.getField(mForestryBlockRegistryCoreClass, "soil"); + if (soil != null) { + Block testHumus = (Block) soil.get(blockRegistryCoreObject); + if (testHumus != null) { + mForestryHumusBlock = testHumus; } } } - } catch (Throwable t) { - t.printStackTrace(); } - } - if (mForestryHumusBlock != null) { - return mForestryHumusBlock; + } catch (Throwable t) { + t.printStackTrace(); } } + if (mForestryHumusBlock != null) { + return mForestryHumusBlock; + } + return farmland; } } diff --git a/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java b/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java index 5a945e6998..26952bd657 100644 --- a/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java +++ b/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java @@ -1,31 +1,24 @@ package gtPlusPlus.xmod.sol; +import static gregtech.api.enums.Mods.SpiceOfLife; + import java.lang.reflect.Constructor; import net.minecraft.item.Item; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; public class HANDLER_SpiceOfLife { public static final void preInit() { - if (LoadedMods.SpiceOfLife) { + if (SpiceOfLife.isModLoaded()) { // Add a new Lunch Box with a reasonable amount of slots tryRegisterNewLunchBox("foodcrate", 12); } } - public static final void init() { - if (LoadedMods.SpiceOfLife) {} - } - - public static final void postInit() { - if (LoadedMods.SpiceOfLife) {} - } - private static boolean tryRegisterNewLunchBox(String aItemName, int aSlots) { Item aNewBox = getNewLunchBox(aItemName, aSlots); if (aNewBox != null) { diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java index 082486dd62..0bca8535fe 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.thaumcraft; +import static gregtech.api.enums.Mods.Thaumcraft; + import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat; import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectStack; @@ -17,12 +18,8 @@ public class HANDLER_Thaumcraft { public static Item mResearchNotes; public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>(); - public static void preInit() { - if (LoadedMods.Thaumcraft) {} - } - public static void init() { - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { try { mResearchNotes = (Item) ReflectionUtils .getField(ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes") @@ -32,24 +29,4 @@ public class HANDLER_Thaumcraft { } } } - - public static void postInit() { - if (LoadedMods.Thaumcraft) { - // Add Custom Aspects - - // sThaumcraftCompat = (IThaumcraftCompat) - // GT_Utility.callConstructor("gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat", 0, null, GT_Values.D1, - // new Object[0]); - // sThaumcraftCompat = new GTPP_AspectCompat(); - - /* - * if (!sItemsToGetAspects.isEmpty() && false) { for (Pair<ItemStack, GTPP_AspectStack[]> j : - * sItemsToGetAspects) { if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) { - * List<GTPP_AspectStack> list = Arrays.asList(j.getValue()); if - * (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) { - * Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); } else { - * Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); } } } } - */ - } - } } diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java index 4f0c9873a1..feda254313 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thaumcraft.aspect; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; @@ -11,7 +13,6 @@ import net.minecraft.util.ResourceLocation; import gregtech.api.enums.TC_Aspects; import gregtech.common.GT_ThaumcraftCompat; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper; import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper; @@ -72,7 +73,7 @@ public class GTPP_AspectCompat { "Sagrausten", Utils.rgbtoHexValue(125, 125, 125), new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, get(TC_Aspects.RADIO) }, - new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Sagrausten.png"), + new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Sagrausten.png"), false, 1, "Ancient Knowledge"); @@ -81,7 +82,7 @@ public class GTPP_AspectCompat { "Slusium", Utils.rgbtoHexValue(175, 125, 25), new TC_Aspect_Wrapper[] { ASPECT_BALANCE, get(TC_Aspects.NEBRISUM) }, - new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Slusium.png"), + new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Slusium.png"), false, 1, "Warped Thoughts"); @@ -90,7 +91,7 @@ public class GTPP_AspectCompat { "Xenil", Utils.rgbtoHexValue(25, 25, 25), new TC_Aspect_Wrapper[] { get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO) }, - new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xenil.png"), + new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Xenil.png"), false, 1, "A beginning to something new"); @@ -99,7 +100,7 @@ public class GTPP_AspectCompat { "Xablum", Utils.rgbtoHexValue(25, 185, 25), new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, ASPECT_LUST }, - new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xablum.png"), + new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Xablum.png"), false, 1, "Insanity"); @@ -108,7 +109,7 @@ public class GTPP_AspectCompat { "Zetralt", Utils.rgbtoHexValue(225, 225, 225), new TC_Aspect_Wrapper[] { get(TC_Aspects.AURAM), ASPECT_TOXIC }, - new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Zetralt.png"), + new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Zetralt.png"), false, 1, "Control, Respect, Glory"); diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java index c847953cd8..76d1998527 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -12,7 +14,6 @@ import net.minecraft.util.ResourceLocation; import gregtech.api.enums.TC_Aspects; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils; @@ -124,7 +125,7 @@ public class TC_Aspect_Wrapper { color, components, vanilla ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png") - : new ResourceLocation(CORE.MODID, "textures/aspects/" + tag.toLowerCase() + ".png"), + : new ResourceLocation(GTPlusPlus.ID, "textures/aspects/" + tag.toLowerCase() + ".png"), vanilla, blend, aTooltip); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java index 624445a827..460a5e9fbe 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation; -import gtPlusPlus.core.lib.LoadedMods; +import static gregtech.api.enums.Mods.COFHCore; + import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; @@ -9,7 +10,7 @@ import gtPlusPlus.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes; public class HANDLER_TF { public static void preInit() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + if (COFHCore.isModLoaded()) { TF_Fluids.preInit(); TF_Items.preInit(); TF_Blocks.preInit(); @@ -17,7 +18,7 @@ public class HANDLER_TF { } public static void init() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + if (COFHCore.isModLoaded()) { TF_Fluids.init(); TF_Blocks.init(); TF_Items.init(); @@ -25,7 +26,7 @@ public class HANDLER_TF { } public static void postInit() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + if (COFHCore.isModLoaded()) { TF_Fluids.postInit(); TF_Items.postInit(); TF_Blocks.postInit(); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java index bede18377f..d567d7bbc2 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -8,7 +10,10 @@ import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.*; +import net.minecraft.entity.monster.EntityBlaze; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.monster.EntitySnowman; +import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Blocks; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -21,7 +26,6 @@ import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.DamageHelper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { @@ -33,7 +37,7 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { private static boolean effect = true; public TF_Block_Fluid_Cryotheum() { - super(CORE.MODID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); + super(GTPlusPlus.ID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); this.setQuantaPerBlock(5); this.setTickRate(15); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java index 7800892f72..5bbf0ea3ab 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; @@ -10,7 +12,6 @@ import net.minecraft.world.World; import cofh.core.fluid.BlockFluidCoFHBase; import cofh.core.util.CoreUtils; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { @@ -20,7 +21,7 @@ public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { private static boolean effect = true; public TF_Block_Fluid_Ender() { - super(CORE.MODID, TF_Fluids.fluidEnder, materialFluidEnder, "ender"); + super(GTPlusPlus.ID, TF_Fluids.fluidEnder, materialFluidEnder, "ender"); setQuantaPerBlock(4); setTickRate(20); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java index 649149e186..af6b74c216 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -18,7 +20,6 @@ import cofh.core.fluid.BlockFluidInteractive; import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { @@ -30,7 +31,7 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { private static boolean enableSourceFall = true; public TF_Block_Fluid_Pyrotheum() { - super(CORE.MODID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); + super(GTPlusPlus.ID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); this.setQuantaPerBlock(5); this.setTickRate(10); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java index f554c82619..35819c1f1b 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java @@ -1,16 +1,10 @@ package gtPlusPlus.xmod.thermalfoundation.fluid; -import net.minecraft.block.BlockDispenser; -import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import cofh.core.util.fluid.DispenserEmptyBucketHandler; -import cofh.core.util.fluid.DispenserFilledBucketHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; public class TF_Fluids { @@ -19,42 +13,38 @@ public class TF_Fluids { public static Fluid fluidEnder; public static void preInit() { - if (!LoadedMods.ThermalFoundation) { - Logger.INFO("Adding in our own versions of Thermal Foundation Fluids - Non-GT"); - final Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); - final Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); - final Fluid ender = FluidRegistry.getFluid("ender"); - - if (pyrotheum == null) { - Logger.INFO("Registering Blazing Pyrotheum as it does not exist."); - fluidPyrotheum = new Fluid("pyrotheum").setLuminosity(15).setDensity(2000).setViscosity(1200) - .setTemperature(4000).setRarity(EnumRarity.rare); - registerFluid(fluidPyrotheum, "pyrotheum"); - } else { - Logger.INFO("Registering Blazing Pyrotheum as it is an already existing Fluid."); - fluidPyrotheum = pyrotheum; - } - if (cryotheum == null) { - Logger.INFO("Registering Gelid Cryotheum as it does not exist."); - fluidCryotheum = new Fluid("cryotheum").setLuminosity(0).setDensity(4000).setViscosity(3000) - .setTemperature(50).setRarity(EnumRarity.rare); - registerFluid(fluidCryotheum, "cryotheum"); - } else { - Logger.INFO("Registering Gelid Cryotheum as it is an already existing Fluid."); - fluidCryotheum = cryotheum; - } + Logger.INFO("Adding in our own versions of Thermal Foundation Fluids - Non-GT"); + final Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); + final Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); + final Fluid ender = FluidRegistry.getFluid("ender"); + + if (pyrotheum == null) { + Logger.INFO("Registering Blazing Pyrotheum as it does not exist."); + fluidPyrotheum = new Fluid("pyrotheum").setLuminosity(15).setDensity(2000).setViscosity(1200) + .setTemperature(4000).setRarity(EnumRarity.rare); + registerFluid(fluidPyrotheum, "pyrotheum"); + } else { + Logger.INFO("Registering Blazing Pyrotheum as it is an already existing Fluid."); + fluidPyrotheum = pyrotheum; + } + if (cryotheum == null) { + Logger.INFO("Registering Gelid Cryotheum as it does not exist."); + fluidCryotheum = new Fluid("cryotheum").setLuminosity(0).setDensity(4000).setViscosity(3000) + .setTemperature(50).setRarity(EnumRarity.rare); + registerFluid(fluidCryotheum, "cryotheum"); + } else { + Logger.INFO("Registering Gelid Cryotheum as it is an already existing Fluid."); + fluidCryotheum = cryotheum; + } - if (ender == null) { - Logger.INFO("Registering Resonant Ender as it does not exist."); - fluidEnder = new Fluid("ender").setLuminosity(3).setDensity(4000).setViscosity(3000).setTemperature(300) - .setRarity(EnumRarity.uncommon); - registerFluid(fluidEnder, "ender"); - } else { - Logger.INFO("Registering Resonant Ender as it is an already existing Fluid."); - fluidEnder = ender; - } + if (ender == null) { + Logger.INFO("Registering Resonant Ender as it does not exist."); + fluidEnder = new Fluid("ender").setLuminosity(3).setDensity(4000).setViscosity(3000).setTemperature(300) + .setRarity(EnumRarity.uncommon); + registerFluid(fluidEnder, "ender"); } else { - Logger.INFO("Thermal Foundation is already loaded, no need to add our own Cryotheum/Pyrotheum."); + Logger.INFO("Registering Resonant Ender as it is an already existing Fluid."); + fluidEnder = ender; } } @@ -67,9 +57,4 @@ public class TF_Fluids { FluidRegistry.registerFluid(paramFluid); } } - - public static void registerDispenserHandlers() { - BlockDispenser.dispenseBehaviorRegistry.putObject(TF_Items.itemBucket, new DispenserFilledBucketHandler()); - BlockDispenser.dispenseBehaviorRegistry.putObject(Items.bucket, new DispenserEmptyBucketHandler()); - } } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java index cd25d068bb..bddde1de38 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.tinkers; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Field; import net.minecraft.block.Block; @@ -8,7 +10,6 @@ import net.minecraftforge.fluids.FluidRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; import gtPlusPlus.xmod.tinkers.util.TinkersDryingRecipe; @@ -18,16 +19,8 @@ public class HANDLER_Tinkers { public static AutoMap<BaseTinkersMaterial> mTinkerMaterials = new AutoMap<BaseTinkersMaterial>(); - public static final void preInit() { - if (LoadedMods.TiCon) {} - } - - public static final void init() { - if (LoadedMods.TiCon) {} - } - public static final void postInit() { - if (LoadedMods.TiCon) { + if (TinkerConstruct.isModLoaded()) { Fluid pyrotheumFluid = FluidRegistry.getFluid("pyrotheum"); if (pyrotheumFluid != null) { diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index 922b330443..06f7ad47f5 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.tinkers.material; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt; import java.util.HashMap; @@ -170,7 +171,7 @@ public class BaseTinkersMaterial { if (generate) { Logger.INFO("[TiCon] Sending IMC: addMaterial - " + mLocalName + "."); - FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); + FMLInterModComms.sendMessage(TinkerConstruct.ID, "addMaterial", tag); ItemStack itemstack = mMaterial.getIngot(1); tag = new NBTTagCompound(); @@ -181,7 +182,7 @@ public class BaseTinkersMaterial { tag.setInteger("Value", 2); // What is value for? Logger.INFO("[TiCon] Sending IMC: addPartBuilderMaterial - " + mLocalName + "."); - FMLInterModComms.sendMessage("TConstruct", "addPartBuilderMaterial", tag); + FMLInterModComms.sendMessage(TinkerConstruct.ID, "addPartBuilderMaterial", tag); tag = new NBTTagCompound(); tag.setInteger("MaterialId", id); @@ -191,7 +192,7 @@ public class BaseTinkersMaterial { tag.setTag("Item", item); Logger.INFO("[TiCon] Sending IMC: addMaterialItem - " + mLocalName + "."); - FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + FMLInterModComms.sendMessage(TinkerConstruct.ID, "addMaterialItem", tag); } } } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java index 020fee505d..ef3a0f9cd0 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.tinkers.util; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Field; import java.util.List; @@ -10,7 +12,6 @@ import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -55,7 +56,7 @@ public class TinkersDryingRecipe { Field aInput; Field aOutput; Class aTinkerClass = ReflectionUtils.getClass("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe"); // o.getClass(); - if (aTinkerClass == null || !LoadedMods.TiCon) { + if (aTinkerClass == null || TinkerConstruct.isModLoaded()) { Logger.INFO( "Error generating Drying Recipe, could not find class. Exists? " + ReflectionUtils .doesClassExist("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe")); diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java index b37aad3aaf..6024e5192d 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.tinkers.util; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -20,7 +22,6 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.Materials; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -69,29 +70,29 @@ public class TinkersUtils { * @param aSwitch - The Registry to return */ private static void setTiConDataInstance() { - if (!LoadedMods.TiCon) { + if (!TinkerConstruct.isModLoaded()) { return; - } else { - if (mSmelteryInstance == null) { - if (mClass_Smeltery != null) { - try { - mSmelteryInstance = ReflectionUtils.getField(mClass_Smeltery, "instance").get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} - } + } + + if (mSmelteryInstance == null) { + if (mClass_Smeltery != null) { + try { + mSmelteryInstance = ReflectionUtils.getField(mClass_Smeltery, "instance").get(null); + } catch (IllegalArgumentException | IllegalAccessException e) {} } - if (mTinkersRegistryInstance == null) { - if (mClass_TConstructRegistry != null) { - try { - mTinkersRegistryInstance = ReflectionUtils.getField(mClass_TConstructRegistry, "instance") - .get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} - } + } + if (mTinkersRegistryInstance == null) { + if (mClass_TConstructRegistry != null) { + try { + mTinkersRegistryInstance = ReflectionUtils.getField(mClass_TConstructRegistry, "instance") + .get(null); + } catch (IllegalArgumentException | IllegalAccessException e) {} } } } public static final boolean isTiConFirstInOD() { - if (LoadedMods.TiCon) { + if (TinkerConstruct.isModLoaded()) { try { return (boolean) ReflectionUtils.getField(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst") .get(null); diff --git a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java index 78a1bcba91..b5ee266143 100644 --- a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java +++ b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.witchery; +import static gregtech.api.enums.Mods.Witchery; + import java.lang.reflect.Field; import java.util.ArrayList; @@ -11,7 +13,6 @@ import net.minecraftforge.oredict.OreDictionary; import com.mojang.authlib.GameProfile; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -23,7 +24,7 @@ public class WitchUtils { static { Field a1 = null, a2 = null; GameProfile b1 = null, b2 = null; - if (LoadedMods.Witchery) { + if (Witchery.isModLoaded()) { try { a1 = getField("com.emoniph.witchery.entity.ai.EntityAIDigBlocks", "NORMAL_MINER_PROFILE"); a2 = getField("com.emoniph.witchery.entity.ai.EntityAIDigBlocks", "KOBOLDITE_MINER_PROFILE"); @@ -38,7 +39,7 @@ public class WitchUtils { // com.emoniph.witchery.entity.ai.EntityAIDigBlocks.onHarvestDrops(EntityPlayer, HarvestDropsEvent) public static void onHarvestDrops(final EntityPlayer harvester, final BlockEvent.HarvestDropsEvent event) { - if (LoadedMods.Witchery) { + if (Witchery.isModLoaded()) { if (harvester != null && !harvester.worldObj.isRemote && !event.isCanceled() |