From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 9 Apr 2023 01:08:26 +0200 Subject: 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 Co-authored-by: Martin Robertz --- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 6 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 5 +- .../core/block/base/BasicTileBlockWithTooltip.java | 6 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 10 +- .../core/block/base/BlockBaseModular.java | 9 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 6 +- .../core/block/base/MultiTextureBlock.java | 5 +- .../block/general/BlockCompressedObsidian.java | 25 +- .../gtPlusPlus/core/block/general/BlockNet.java | 5 +- .../core/block/general/BlockSuperLight.java | 5 +- .../core/block/general/BlockTankXpConverter.java | 11 +- .../gtPlusPlus/core/block/general/FirePit.java | 7 +- .../core/block/general/FluidTankInfinite.java | 13 +- .../gtPlusPlus/core/block/general/HellFire.java | 15 +- .../gtPlusPlus/core/block/general/LightGlass.java | 7 +- .../core/block/general/MiningExplosives.java | 15 +- .../gtPlusPlus/core/block/general/PlayerDoors.java | 5 +- .../block/general/antigrief/BlockWitherProof.java | 7 +- .../core/block/general/antigrief/TowerDevice.java | 4 +- .../block/general/fluids/BlockFluidSludge.java | 7 +- .../redstone/BlockGenericRedstoneDetector.java | 17 +- .../general/redstone/BlockGenericRedstoneTest.java | 17 +- .../core/block/machine/BlockGtFrameBox.java | 5 +- .../core/block/machine/CircuitProgrammer.java | 15 +- .../core/block/machine/DecayablesChest.java | 11 +- .../java/gtPlusPlus/core/block/machine/EggBox.java | 11 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 11 +- .../core/block/machine/HeliumGenerator.java | 11 +- .../block/machine/Machine_ModularityTable.java | 11 +- .../core/block/machine/Machine_PestKiller.java | 9 +- .../core/block/machine/Machine_PooCollector.java | 11 +- .../core/block/machine/Machine_ProjectTable.java | 23 +- .../core/block/machine/Machine_RoundRobinator.java | 15 +- .../core/block/machine/Machine_TradeTable.java | 11 +- .../core/block/machine/VolumetricFlaskSetter.java | 15 +- .../block/machine/bedrock/Mining_Head_Fake.java | 6 +- .../block/machine/bedrock/Mining_Pipe_Fake.java | 7 +- .../core/chunkloading/GTPP_ChunkManager.java | 5 +- .../core/client/renderer/RenderBatKing.java | 5 +- .../core/client/renderer/RenderDecayChest.java | 4 +- .../core/client/renderer/RenderSickBlaze.java | 5 +- .../client/renderer/RenderStaballoyConstruct.java | 5 +- .../client/renderer/tabula/RenderTabulaBase.java | 5 +- .../java/gtPlusPlus/core/common/CommonProxy.java | 27 +- .../core/common/compat/COMPAT_Baubles.java | 23 +- .../core/common/compat/COMPAT_BigReactors.java | 19 - .../common/compat/COMPAT_CompactWindmills.java | 221 -------- .../core/common/compat/COMPAT_HarvestCraft.java | 14 - .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 10 - .../core/common/compat/COMPAT_MorePlanets.java | 43 -- .../core/common/compat/COMPAT_PneumaticCraft.java | 17 - .../core/common/compat/COMPAT_RFTools.java | 17 - .../core/common/compat/COMPAT_Railcraft.java | 10 - .../core/common/compat/COMPAT_SimplyJetpacks.java | 17 - .../core/common/compat/COMPAT_Thaumcraft.java | 9 +- .../core/common/compat/COMPAT_Witchery.java | 8 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 213 ++++++-- .../core/container/Container_ProjectTable.java | 6 +- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 1 - .../entity/monster/EntityGiantChickenBase.java | 15 +- .../entity/monster/EntityStaballoyConstruct.java | 14 +- .../core/entity/projectile/EntityToxinball.java | 6 +- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 7 +- .../java/gtPlusPlus/core/fluids/FactoryFluid.java | 5 +- .../core/fluids/FluidRegistryHandler.java | 10 +- .../core/fluids/ItemGenericFluidBucket.java | 4 +- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 5 +- .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 5 +- .../gtPlusPlus/core/gui/item/GuiScreenGrindle.java | 5 +- .../gtPlusPlus/core/gui/item/box/LunchBoxGui.java | 5 +- .../gtPlusPlus/core/gui/item/box/MagicBagGui.java | 5 +- .../gtPlusPlus/core/gui/item/box/ToolBoxGui.java | 5 +- .../core/gui/machine/GUI_CircuitProgrammer.java | 5 +- .../core/gui/machine/GUI_DecayablesChest.java | 5 +- .../gtPlusPlus/core/gui/machine/GUI_EggBox.java | 5 +- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 12 +- .../core/gui/machine/GUI_HeliumGenerator.java | 5 +- .../core/gui/machine/GUI_ModularityTable.java | 5 +- .../core/gui/machine/GUI_PestKiller.java | 7 +- .../core/gui/machine/GUI_ProjectTable.java | 5 +- .../core/gui/machine/GUI_RoundRobinator.java | 5 +- .../core/gui/machine/GUI_SuperJukebox.java | 5 +- .../core/gui/machine/GUI_TradeTable.java | 5 +- .../gui/machine/GUI_VolumetricFlaskSetter.java | 5 +- .../core/handler/AchievementHandler.java | 9 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 122 +++-- .../core/handler/COMPAT_IntermodStaging.java | 38 +- .../java/gtPlusPlus/core/handler/MobMentality.java | 4 +- .../gtPlusPlus/core/handler/PacketHandler.java | 5 +- .../core/handler/Recipes/RegistrationHandler.java | 6 +- .../core/handler/events/BlockEventHandler.java | 4 +- .../handler/events/GeneralTooltipEventHandler.java | 6 +- .../core/handler/events/MissingMappingsEvent.java | 10 +- .../core/handler/render/CapeHandler.java | 6 +- .../core/handler/render/FirepitRender.java | 4 +- src/main/java/gtPlusPlus/core/item/ModItems.java | 209 ++++---- .../java/gtPlusPlus/core/item/base/BaseEuItem.java | 24 +- .../core/item/base/BaseItemBackpack.java | 7 +- .../core/item/base/BaseItemColourable.java | 7 +- .../core/item/base/BaseItemComponent.java | 21 +- .../core/item/base/BaseItemDamageable.java | 5 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 8 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 5 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 5 +- .../core/item/base/BaseItemTickable.java | 9 +- .../core/item/base/BaseItemWithCharge.java | 5 +- .../core/item/base/BaseItemWithDamageValue.java | 6 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 11 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 7 +- .../core/item/base/cell/BaseItemCell.java | 11 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 7 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 7 +- .../core/item/base/dusts/BaseItemDustEx.java | 11 +- .../core/item/base/dusts/BaseItemDustUnique.java | 12 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 5 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 5 +- .../core/item/base/foods/BaseItemFood.java | 5 +- .../core/item/base/ingots/BaseItemIngotHot.java | 15 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 5 +- .../core/item/base/misc/BaseItemMisc.java | 9 +- .../core/item/base/misc/BaseItemParticle.java | 5 +- .../core/item/base/ore/BaseOreComponent.java | 29 +- .../core/item/base/plates/BaseItemPlateHeavy.java | 9 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 4 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 5 +- .../core/item/bauble/BatteryPackBaseBauble.java | 5 +- .../core/item/bauble/ElectricBaseBauble.java | 12 +- .../core/item/bauble/FireProtectionBauble.java | 7 +- .../core/item/bauble/HealthBoostBauble.java | 5 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 14 +- .../core/item/chemistry/AgriculturalChem.java | 11 +- .../core/item/chemistry/GenericChem.java | 19 +- .../core/item/chemistry/IonParticles.java | 7 +- .../core/item/chemistry/MilledOreProcessing.java | 13 +- .../core/item/chemistry/StandardBaseParticles.java | 5 +- .../chemistry/general/ItemGenericChemBase.java | 5 +- .../chemistry/general/ItemNuclearChemBase.java | 5 +- .../item/circuit/GTPP_IntegratedCircuit_Item.java | 5 +- .../core/item/crafting/ItemDummyResearch.java | 5 +- .../core/item/food/BaseItemMetaFood.java | 5 +- .../core/item/general/BaseItemGrindle.java | 7 +- .../core/item/general/BedLocator_Base.java | 5 +- .../gtPlusPlus/core/item/general/BufferCore.java | 5 +- .../core/item/general/ItemAirFilter.java | 5 +- .../core/item/general/ItemAreaClear.java | 5 +- .../core/item/general/ItemBasicFirestarter.java | 5 +- .../item/general/ItemBasicScrubberTurbine.java | 5 +- .../core/item/general/ItemBlueprint.java | 5 +- .../core/item/general/ItemCloakingDevice.java | 10 +- .../core/item/general/ItemControlCore.java | 23 +- .../core/item/general/ItemCreativeTab.java | 23 +- .../core/item/general/ItemGenericToken.java | 5 +- .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 5 +- .../core/item/general/ItemHealingDevice.java | 18 +- .../core/item/general/ItemLavaFilter.java | 5 +- .../core/item/general/ItemMagicFeather.java | 15 +- .../core/item/general/ItemSlowBuildingRing.java | 10 +- .../core/item/general/ItemSunnariumBit.java | 5 +- .../core/item/general/RF2EU_Battery.java | 6 +- .../core/item/general/books/ItemBaseBook.java | 4 +- .../item/general/capture/ItemEntityCatcher.java | 10 +- .../item/general/chassis/ItemBoilerChassis.java | 5 +- .../item/general/chassis/ItemDehydratorCoil.java | 11 +- .../general/chassis/ItemDehydratorCoilWire.java | 11 +- .../core/item/general/fuelrods/FuelRod_Base.java | 5 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 26 +- .../item/general/throwables/ItemThrowableBomb.java | 7 +- .../java/gtPlusPlus/core/item/init/ItemsFoods.java | 18 +- .../core/item/materials/DustDecayable.java | 5 +- .../core/item/tool/misc/DebugScanner.java | 5 +- .../core/item/tool/misc/FakeGregtechTool.java | 26 +- .../core/item/tool/misc/GregtechPump.java | 6 +- .../core/item/tool/misc/SandstoneHammer.java | 5 +- .../core/item/tool/misc/box/BaseBoxItem.java | 5 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 10 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 10 +- .../core/item/tool/staballoy/StaballoyAxe.java | 22 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 5 +- .../core/item/tool/staballoy/StaballoySpade.java | 5 +- .../core/item/wearable/armour/ArmourLoader.java | 10 +- .../item/wearable/armour/hazmat/ArmourHazmat.java | 7 +- .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 7 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 28 +- src/main/java/gtPlusPlus/core/lib/LoadedMods.java | 365 -------------- .../java/gtPlusPlus/core/material/Material.java | 4 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 48 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 99 +--- .../gtPlusPlus/core/recipe/RECIPES_General.java | 77 +-- .../core/recipe/RECIPES_LaserEngraver.java | 5 +- .../core/recipe/RECIPES_MachineComponents.java | 1 - .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 78 ++- .../java/gtPlusPlus/core/slots/SlotCrafting.java | 6 +- .../core/slots/SlotCraftingNoCollect.java | 6 +- .../core/slots/SlotModularBaubleUpgrades.java | 3 +- .../java/gtPlusPlus/core/slots/SlotToolBox.java | 7 - .../core/tileentities/ModTileEntities.java | 5 +- .../tileentities/general/TileEntityFishTrap.java | 5 +- .../general/TileEntityInfiniteFluid.java | 7 +- .../general/TileEntityXpConverter.java | 4 +- .../machines/TileEntityPestKiller.java | 5 +- src/main/java/gtPlusPlus/core/util/Utils.java | 3 +- .../gtPlusPlus/core/util/data/LocaleUtils.java | 14 +- .../gtPlusPlus/core/util/data/LoggingUtils.java | 5 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 10 +- .../core/util/minecraft/EntityUtils.java | 48 +- .../core/util/minecraft/HazmatUtils.java | 557 --------------------- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 19 +- .../core/util/minecraft/MaterialUtils.java | 22 +- .../core/util/minecraft/PlayerUtils.java | 7 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 16 +- .../core/world/explosions/MiningExplosion.java | 12 +- 211 files changed, 1474 insertions(+), 2417 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java delete mode 100644 src/main/java/gtPlusPlus/core/lib/LoadedMods.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java (limited to 'src/main/java/gtPlusPlus/core') 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 aTempMap = new HashMap(); - 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 aTempMap = new HashMap(); - 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[] 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[] aTextureData = new CubicObject[] { new CubicObject(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 + ":" + "Ch