diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-09 01:08:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-09 01:08:26 +0200 |
| commit | 26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch) | |
| tree | 0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/core | |
| parent | c33b3ba66194c7441fbd437530d21a51aa4395d5 (diff) | |
| download | GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.gz GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.bz2 GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.zip | |
clean up GT++ code (#589)
* yeet big reactor support
* yeet IC2 classic support
* yeet pneumaticraft support
* yeet More Planets support
* yeet Immersive Engineering support
* yeet Psychedilicraft support
* yeet Beyond Reality Core support
* sort mods to see what must be purged
* yeet simply jetpacks
* yeet RFTools
* yeet xReliquary
* yeet RedTech
* yeet Mekanism
* yeet GrowthCraft
* yeet ihl
* leftover cleaning
* yeet thermal fondation support
* yeet compact windmills support
* spotless
* remove constants from LoadedMods (part 1 / 2)
* spotless
* remove constants from LoadedMods (part 2 / 2)
* use mod id enum instead of strings + optimize imports
* Loaded.isModLoaded -> enum
* restore RA init
* missing !
* start organizing recipes stuff
* fix crash on world load in dev
* remove unused class
* remove HazmatUtils.java
* move all the removals
* remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack)
* move some pyrolyse oven recipes to its own file
* sa
* bump GT version
* bump GT5U version
* spotless apply
* use Everglades entry from the mod enum
---------
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
211 files changed, 1474 insertions, 2417 deletions
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; |