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 --- src/main/java/gtPlusPlus/GTplusplus.java | 95 ++-- .../gtPlusPlus/api/interfaces/IGregtechPower.java | 5 +- .../java/gtPlusPlus/api/objects/data/AutoMap.java | 9 +- .../api/objects/data/ReverseAutoMap.java | 5 +- .../gtPlusPlus/api/objects/minecraft/FluidGT6.java | 5 +- .../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 +- .../everglades/GTplusplus_Everglades.java | 24 +- .../everglades/biome/BiomeGenerator_Custom.java | 34 +- .../everglades/block/BlockDarkWorldGround.java | 4 +- .../block/BlockDarkWorldPollutedDirt.java | 4 +- .../block/BlockDarkWorldPortalFrame.java | 5 +- .../everglades/block/DarkWorldContentLoader.java | 7 +- .../everglades/chunk/ChunkProviderModded.java | 12 +- .../everglades/gen/gt/WorldGen_GT_Base.java | 6 +- .../everglades/gen/gt/WorldGen_GT_Ore_Layer.java | 5 +- .../item/ItemEvergladesPortalTrigger.java | 5 +- .../everglades/world/TeleporterDimensionMod.java | 10 +- .../gtPlusPlus/nei/DecayableRecipeHandler.java | 7 +- .../java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 2 +- src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java | 15 +- .../gtPlusPlus/nei/handlers/NeiTextureHandler.java | 7 +- .../gtPlusPlus/plugin/agrichem/BioRecipes.java | 8 +- .../agrichem/item/algae/ItemAgrichemBase.java | 5 +- .../plugin/agrichem/item/algae/ItemAlgaeBase.java | 7 +- .../plugin/villagers/VillagerObject.java | 5 +- .../gtPlusPlus/plugin/waila/Core_WailaPlugin.java | 5 +- .../gtPlusPlus/preloader/Preloader_GT_OreDict.java | 128 +---- .../preloader/asm/Preloader_DummyContainer.java | 9 +- .../ClassTransformer_Forge_ChunkLoading.java | 42 +- .../ClassTransformer_GC_EntityAutoRocket.java | 34 +- .../ClassTransformer_GC_FluidUtil.java | 31 +- .../ClassTransformer_GC_FuelLoader.java | 48 +- .../ClassTransformer_IC2_GetHarvestTool.java | 8 +- .../ClassTransformer_TT_ThaumicRestorer.java | 46 +- .../transformers/ClassTransformer_TiConFluids.java | 12 +- .../Preloader_Transformer_Handler.java | 28 +- .../gtPlusPlus/recipes/CokeAndPyrolyseOven.java | 72 +++ .../java/gtPlusPlus/recipes/RecipeRemovals.java | 132 +++++ .../gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java | 15 - .../xmod/bartcrops/HANDLER_CropsPlusPlus.java | 5 - .../xmod/bartcrops/abstracts/BaseCrop.java | 6 +- .../gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java | 10 +- .../xmod/bop/blocks/base/LeavesBase.java | 5 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 7 +- .../xmod/bop/blocks/base/SaplingBase.java | 5 +- .../java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java | 5 +- .../xmod/computronics/HANDLER_Computronics.java | 68 --- .../xmod/eio/handler/HandlerTooltip_EIO.java | 4 +- .../gtPlusPlus/xmod/eio/material/MaterialEIO.java | 6 +- .../java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 25 +- .../forestry/bees/custom/GTPP_Bee_Definition.java | 14 +- .../xmod/forestry/bees/custom/GTPP_Bees.java | 27 +- .../xmod/forestry/bees/custom/ItemCustomComb.java | 10 +- .../bees/inventory/InventoryDenseBeeHouse.java | 6 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 13 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 11 +- .../xmod/forestry/bees/items/output/GTPP_Comb.java | 9 +- .../xmod/forestry/bees/items/output/GTPP_Drop.java | 5 +- .../forestry/bees/items/output/GTPP_Pollen.java | 5 +- .../forestry/bees/items/output/GTPP_Propolis.java | 4 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 56 +-- .../forestry/bees/registry/GTPP_BeeDefinition.java | 26 +- .../forestry/bees/registry/GTPP_Bee_Mutation.java | 6 +- .../xmod/forestry/bees/registry/GTPP_Bees.java | 15 +- .../bees/registry/GTPP_BranchDefinition.java | 21 +- .../bees/tileentities/TileDenseBeeHouse.java | 11 +- .../xmod/galacticraft/HANDLER_GalactiCraft.java | 31 -- .../galacticraft/handler/HandlerTooltip_GC.java | 5 +- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 333 +----------- .../gregtech/api/enums/GregtechOrePrefixes.java | 32 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 17 +- .../xmod/gregtech/api/gui/GTPP_UITextures.java | 192 +++---- .../gregtech/api/items/Gregtech_Generic_Item.java | 12 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 12 +- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 13 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 8 +- .../gregtech/api/items/tools/GT_MetaGenTool.java | 5 +- .../api/items/types/ToolType_HardHammer.java | 5 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 1 - .../GregtechMetaPipeEntity_Cable.java | 5 +- .../base/GregtechMeta_MultiBlockBase.java | 34 +- .../base/GregtechMeta_SteamMultiBase.java | 11 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 5 +- .../gregtech/api/objects/GregtechItemData.java | 6 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 21 +- .../common/blocks/fluid/GregtechFluidHandler.java | 114 ++--- .../common/blocks/textures/TexturesGtBlock.java | 7 +- .../blocks/textures/TexturesGtCutomCovers.java | 4 +- .../common/blocks/textures/TexturesGtTools.java | 7 +- .../turbine/LargeTurbineTextureHandler.java | 19 +- .../common/computer/GT_ComputerCube_Setup.java | 7 +- .../xmod/gregtech/common/covers/CoverManager.java | 6 +- .../gregtech/common/helpers/ChargingHelper.java | 4 +- .../gregtech/common/helpers/TreeFarmHelper.java | 7 +- .../helpers/autocrafter/AC_Helper_Container.java | 7 +- .../helpers/autocrafter/AC_Helper_Utils.java | 5 +- .../common/helpers/tesseract/TesseractHelper.java | 9 +- .../gregtech/common/items/MetaCustomCoverItem.java | 5 +- .../common/items/covers/MetaItemCoverCasings.java | 7 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 5 +- .../GT_MetaTileEntity_TesseractGenerator.java | 8 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 19 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 3 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 13 +- .../basic/GregtechMetaWirelessCharger.java | 4 +- .../machines/multi/misc/GMTE_AmazonPackager.java | 6 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 6 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 8 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 8 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 6 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 8 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 7 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 8 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 8 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 6 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 8 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 37 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 6 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 8 +- ...aTileEntity_IndustrialMolecularTransformer.java | 6 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 15 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 6 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 8 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 6 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 8 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 15 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 6 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 8 +- .../GregtechMetaTileEntity_SpargeTower.java | 19 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 14 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 8 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 14 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 15 +- .../GregtechMetaTileEntity_SteamMacerator.java | 5 +- .../multi/production/GT4Entity_AutoCrafter.java | 7 +- .../multi/production/GT4Entity_ThermalBoiler.java | 14 +- .../GregtechMTE_ElementalDuplicator.java | 7 +- .../production/GregtechMTE_FrothFlotationCell.java | 6 +- .../production/GregtechMTE_NuclearReactor.java | 12 +- .../GregtechMetaTileEntityGeneratorArray.java | 15 +- .../production/GregtechMetaTileEntityTreeFarm.java | 166 +++--- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 8 +- .../GregtechMetaTileEntity_Cyclotron.java | 14 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 15 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 15 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 6 +- .../GregtechMetaTileEntity_MassFabricator.java | 17 +- ...techMetaTileEntity_QuantumForceTransformer.java | 25 +- .../GregtechMetaTileEntity_Refinery.java | 7 +- ...chMetaTileEntity_BedrockMiningPlatformBase.java | 8 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 22 +- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 27 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 7 +- ...chMetaTileEntity_PowerSubStationController.java | 18 +- .../misc/GT_TileEntity_ComputerCube.java | 15 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 11 +- .../storage/shelving/GT4Entity_Shelf.java | 1 - .../xmod/gregtech/loaders/Gregtech_Blocks.java | 11 +- .../loaders/ProcessingToolHeadChoocher.java | 5 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 207 -------- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 2 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 26 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 32 +- .../recipe/RecipeLoader_MolecularTransformer.java | 30 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 6 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 7 +- .../xmod/gregtech/recipes/RecipesToRemove.java | 49 -- .../registration/gregtech/Gregtech4Content.java | 18 +- .../gregtech/GregtechComponentAssembler.java | 5 +- .../registration/gregtech/GregtechConduits.java | 18 +- .../gregtech/GregtechCustomHatches.java | 11 +- .../gregtech/GregtechEnergyBuffer.java | 7 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 11 +- .../registration/gregtech/GregtechSafeBlock.java | 5 +- .../gregtech/GregtechThaumcraftDevices.java | 5 +- .../gtPlusPlus/xmod/growthcraft/HANDLER_GC.java | 21 - .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 203 -------- .../xmod/growthcraft/fishtrap/Growthcraft_New.java | 83 --- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 83 --- src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 2 - .../tileentity/TileEntityKineticWindGenerator.java | 5 +- .../xmod/ic2/item/CustomKineticRotor.java | 15 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 7 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 5 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 12 +- .../gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java | 393 --------------- .../gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java | 11 +- .../java/gtPlusPlus/xmod/ob/SprinklerHandler.java | 5 +- .../xmod/railcraft/HANDLER_Railcraft.java | 26 +- .../xmod/reliquary/HANDLER_Reliquary.java | 21 - .../xmod/reliquary/item/ReliquaryItems.java | 160 ------ .../xmod/reliquary/util/AlkahestRecipeWrapper.java | 51 -- .../reliquary/util/ReliquaryRecipeHandler.java | 67 --- src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java | 9 +- .../xmod/sc2/modules/ModuleExoticSeeds.java | 51 +- .../gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java | 13 +- .../xmod/thaumcraft/HANDLER_Thaumcraft.java | 29 +- .../xmod/thaumcraft/aspect/GTPP_AspectCompat.java | 13 +- .../objects/wrapper/aspect/TC_Aspect_Wrapper.java | 5 +- .../xmod/thermalfoundation/HANDLER_TF.java | 9 +- .../block/TF_Block_Fluid_Cryotheum.java | 10 +- .../block/TF_Block_Fluid_Ender.java | 5 +- .../block/TF_Block_Fluid_Pyrotheum.java | 5 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 75 ++- .../gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java | 13 +- .../xmod/tinkers/material/BaseTinkersMaterial.java | 7 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 5 +- .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 35 +- .../java/gtPlusPlus/xmod/witchery/WitchUtils.java | 7 +- 419 files changed, 3507 insertions(+), 5320 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 create mode 100644 src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java create mode 100644 src/main/java/gtPlusPlus/recipes/RecipeRemovals.java delete mode 100644 src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java delete mode 100644 src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java delete mode 100644 src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java delete mode 100644 src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java (limited to 'src/main/java/gtPlusPlus') diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 4c52a6f59d..f552ee2850 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -1,5 +1,8 @@ package gtPlusPlus; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Names; +import static gregtech.api.enums.Mods.Thaumcraft; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import java.awt.event.ActionEvent; @@ -50,11 +53,9 @@ import gtPlusPlus.core.handler.events.MissingMappingsEvent; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.general.ItemGiantEgg; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.LocaleUtils; -import gtPlusPlus.core.util.minecraft.HazmatUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.nei.NEI_IMC_Sender; import gtPlusPlus.plugin.manager.Core_Manager; @@ -68,10 +69,29 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; @MCVersion(value = "1.7.10") @Mod( - modid = CORE.MODID, + modid = Names.G_T_PLUS_PLUS, name = CORE.name, version = CORE.VERSION, - dependencies = "required-after:Forge; after:TConstruct; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; required-after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO; after:tectech; after:GTRedtech; after:beyondrealitycore; after:OpenBlocks; after:IC2NuclearControl; after:TGregworks; after:StevesCarts; after:xreliquary; required-after:gtnhlib@[0.0.10,)") + dependencies = "required-after:Forge;" + " after:TConstruct;" + + " after:PlayerAPI;" + + " after:dreamcraft;" + + " after:IC2;" + + " required-after:gregtech;" + + " after:Forestry;" + + " after:MagicBees;" + + " after:CoFHCore;" + + " after:Railcraft;" + + " after:CompactWindmills;" + + " after:ForbiddenMagic;" + + " after:ExtraUtilities;" + + " after:Thaumcraft;" + + " after:EnderIO;" + + " after:tectech;" + + " after:OpenBlocks;" + + " after:IC2NuclearControl;" + + " after:TGregworks;" + + " after:StevesCarts;" + + " required-after:gtnhlib@[0.0.10,);") public class GTplusplus implements ActionListener { public static enum INIT_PHASE { @@ -108,7 +128,7 @@ public class GTplusplus implements ActionListener { public static INIT_PHASE CURRENT_LOAD_PHASE = INIT_PHASE.SUPER; // Mod Instance - @Mod.Instance(CORE.MODID) + @Mod.Instance(Names.G_T_PLUS_PLUS) public static GTplusplus instance; // GT++ Proxy Instances @@ -196,7 +216,6 @@ public class GTplusplus implements ActionListener { public void postInit(final FMLPostInitializationEvent event) { INIT_PHASE.POST_INIT.setPhaseActive(true); proxy.postInit(event); - HazmatUtils.init(); BookHandler.runLater(); Meta_GT_Proxy.postInit(); Core_Manager.postInit(); @@ -237,7 +256,7 @@ public class GTplusplus implements ActionListener { event.registerServerCommand(new CommandMath()); event.registerServerCommand(new CommandEnableDebugWhileRunning()); event.registerServerCommand(new CommandDebugChunks()); - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { event.registerServerCommand(new CommandDumpAspects()); } Core_Manager.serverStart(); @@ -381,56 +400,60 @@ public class GTplusplus implements ActionListener { private static final HashMap sMissingBlockMappings = new HashMap(); private static void processMissingMappings() { - sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(CORE.MODID, "itemCellAmmonium")); - sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(CORE.MODID, "itemCellHydroxide")); + sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(GTPlusPlus.ID, "itemCellAmmonium")); + sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(GTPlusPlus.ID, "itemCellHydroxide")); sMissingItemMappings.put( "miscutils:BerylliumHydroxide", - GameRegistry.findItem(CORE.MODID, "itemCellmiscutils:BerylliumHydroxide")); - sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(CORE.MODID, "itemCellBromine")); - sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(CORE.MODID, "itemCellKrypton")); + GameRegistry.findItem(GTPlusPlus.ID, "itemCellmiscutils:BerylliumHydroxide")); + sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(GTPlusPlus.ID, "itemCellBromine")); + sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(GTPlusPlus.ID, "itemCellKrypton")); sMissingItemMappings.put( "miscutils:itemCellZirconiumTetrafluoride", - GameRegistry.findItem(CORE.MODID, "ZirconiumTetrafluoride")); + GameRegistry.findItem(GTPlusPlus.ID, "ZirconiumTetrafluoride")); sMissingItemMappings - .put("miscutils:Li2BeF4", GameRegistry.findItem(CORE.MODID, "itemCellLithiumTetrafluoroberyllate")); + .put("miscutils:Li2BeF4", GameRegistry.findItem(GTPlusPlus.ID, "itemCellLithiumTetrafluoroberyllate")); // Cryolite - sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(CORE.MODID, "oreCryoliteF")); + sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(GTPlusPlus.ID, "oreCryoliteF")); sMissingItemMappings - .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(CORE.MODID, "itemDustTinyCryoliteF")); + .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyCryoliteF")); sMissingItemMappings - .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(CORE.MODID, "itemDustSmallCryoliteF")); - sMissingItemMappings.put("miscutils:itemDustCryolite", GameRegistry.findItem(CORE.MODID, "itemDustCryoliteF")); - sMissingItemMappings.put("miscutils:dustPureCryolite", GameRegistry.findItem(CORE.MODID, "dustPureCryoliteF")); + .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallCryoliteF")); sMissingItemMappings - .put("miscutils:dustImpureCryolite", GameRegistry.findItem(CORE.MODID, "dustImpureCryoliteF")); - sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(CORE.MODID, "crushedCryoliteF")); + .put("miscutils:itemDustCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustCryoliteF")); + sMissingItemMappings + .put("miscutils:dustPureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureCryoliteF")); + sMissingItemMappings + .put("miscutils:dustImpureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureCryoliteF")); + sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(GTPlusPlus.ID, "crushedCryoliteF")); sMissingItemMappings.put( "miscutils:crushedPurifiedCryolite", - GameRegistry.findItem(CORE.MODID, "crushedPurifiedCryoliteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedCryoliteF")); sMissingItemMappings.put( "miscutils:crushedCentrifugedCryolite", - GameRegistry.findItem(CORE.MODID, "crushedCentrifugedCryoliteF")); - sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(CORE.MODID, "oreCryoliteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedCryoliteF")); + sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(GTPlusPlus.ID, "oreCryoliteF")); // Fluorite - sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(CORE.MODID, "oreFluoriteF")); + sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(GTPlusPlus.ID, "oreFluoriteF")); + sMissingItemMappings + .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyFluoriteF")); + sMissingItemMappings + .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallFluoriteF")); sMissingItemMappings - .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(CORE.MODID, "itemDustTinyFluoriteF")); + .put("miscutils:itemDustFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustFluoriteF")); sMissingItemMappings - .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(CORE.MODID, "itemDustSmallFluoriteF")); - sMissingItemMappings.put("miscutils:itemDustFluorite", GameRegistry.findItem(CORE.MODID, "itemDustFluoriteF")); - sMissingItemMappings.put("miscutils:dustPureFluorite", GameRegistry.findItem(CORE.MODID, "dustPureFluoriteF")); + .put("miscutils:dustPureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureFluoriteF")); sMissingItemMappings - .put("miscutils:dustImpureFluorite", GameRegistry.findItem(CORE.MODID, "dustImpureFluoriteF")); - sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(CORE.MODID, "crushedFluoriteF")); + .put("miscutils:dustImpureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureFluoriteF")); + sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(GTPlusPlus.ID, "crushedFluoriteF")); sMissingItemMappings.put( "miscutils:crushedPurifiedFluorite", - GameRegistry.findItem(CORE.MODID, "crushedPurifiedFluoriteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedFluoriteF")); sMissingItemMappings.put( "miscutils:crushedCentrifugedFluorite", - GameRegistry.findItem(CORE.MODID, "crushedCentrifugedFluoriteF")); - sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(CORE.MODID, "oreFluoriteF")); + GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedFluoriteF")); + sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(GTPlusPlus.ID, "oreFluoriteF")); } @Mod.EventHandler @@ -461,11 +484,11 @@ public class GTplusplus implements ActionListener { private static void remap(Item item, FMLMissingMappingsEvent.MissingMapping mapping) { mapping.remap(item); - Logger.INFO("Remapping item " + mapping.name + " to " + CORE.MODID + ":" + item.getUnlocalizedName()); + Logger.INFO("Remapping item " + mapping.name + " to " + GTPlusPlus.ID + ":" + item.getUnlocalizedName()); } private static void remap(Block block, FMLMissingMappingsEvent.MissingMapping mapping) { mapping.remap(block); - Logger.INFO("Remapping block " + mapping.name + " to " + CORE.MODID + ":" + block.getUnlocalizedName()); + Logger.INFO("Remapping block " + mapping.name + " to " + GTPlusPlus.ID + ":" + block.getUnlocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java index 64c2198662..205ff05dc1 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java @@ -6,7 +6,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import gregtech.api.interfaces.IDescribable; -import gregtech.api.interfaces.tileentity.*; +import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; +import gregtech.api.interfaces.tileentity.IGearEnergyTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; +import gregtech.api.interfaces.tileentity.ITurnable; public abstract interface IGregtechPower extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index 92ba97e722..9e26ea9174 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -1,7 +1,14 @@ package gtPlusPlus.api.objects.data; import java.io.Serializable; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Queue; +import java.util.Set; public class AutoMap implements Iterable, Cloneable, Serializable, Collection, Queue, List { diff --git a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java index 45d8074366..da6fc7d181 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java @@ -1,6 +1,9 @@ package gtPlusPlus.api.objects.data; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; public class ReverseAutoMap extends AutoMap { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index a90d72864c..a90a52e829 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -1,9 +1,10 @@ package gtPlusPlus.api.objects.minecraft; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraftforge.fluids.Fluid; import gregtech.api.GregTech_API; -import gtPlusPlus.core.lib.CORE; public class FluidGT6 extends Fluid implements Runnable { @@ -27,6 +28,6 @@ public class FluidGT6 extends Fluid implements Runnable { @Override public void run() { - this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":" + "fluids/fluid." + this.mTextureName)); + this.setIcons(GregTech_API.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid." + this.mTextureName)); } } diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java index b1f4eab4be..932fe7b48d 100644 --- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -8,8 +10,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import gtPlusPlus.core.lib.CORE; - public class AdvancedBlock extends Block { protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x, @@ -17,7 +17,7 @@ public class AdvancedBlock extends Block { final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) { super(material); this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(x); this.setHardness(blockHardness); // block Hardness this.setResistance(blockResistance); diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 54614d0288..72e3b24124 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; @@ -8,7 +10,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BasicBlock extends BlockContainer { @@ -26,7 +27,7 @@ public class BasicBlock extends BlockContainer { this.setBlockName(Utils.sanitizeString(unlocalizedName)); if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase().contains("ore")) { - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); } this.setCreativeTab(AddToCreativeTab.tabBlock); diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index f332573620..d370940b41 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -183,7 +185,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // DOWN, UP, NORTH, SOUTH, WEST, EAST // Default Path Name, this will make us look inside 'miscutils\textures\blocks' - final String aPrefixTexPath = CORE.MODID + ":"; + final String aPrefixTexPath = GTPlusPlus.ID + ":"; // Default Path Name, this will make us look in the sub-directory for this Tile Entity. final String aTexPathMid = "TileEntities" + CORE.SEPERATOR + getTileEntityNameForTexturePathing() @@ -276,7 +278,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override @SideOnly(Side.CLIENT) public final void registerBlockIcons(final IIconRegister aRegisterer) { - this.blockIcon = aRegisterer.registerIcon(CORE.MODID + ":" + "net"); + this.blockIcon = aRegisterer.registerIcon(GTPlusPlus.ID + ":" + "net"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index edb1ba4dcf..a0cdd88193 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.material.Material; @@ -17,10 +19,10 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Mods; import gtPlusPlus.core.client.renderer.particle.EntityDropParticleFX; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BlockBaseFluid extends BlockFluidClassic { @@ -71,14 +73,14 @@ public class BlockBaseFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iicon) { - this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); - this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); + this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); + this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); // IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0); // IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0); } @Override - @Optional.Method(modid = "CoFHCore") + @Optional.Method(modid = Mods.Names.C_O_F_H_CORE) @SideOnly(Side.CLIENT) public void randomDisplayTick(World arg0, int arg1, int arg2, int arg3, Random arg4) { super.randomDisplayTick(arg0, arg1, arg2, arg3, arg4); diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index a034dada97..f0ecd6def9 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import java.util.HashMap; import java.util.Map; @@ -65,7 +68,7 @@ public class BlockBaseModular extends BasicBlock { final int miningLevel) { super(blockType, unlocalizedName, vanillaMaterial, miningLevel); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); - this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture()); + this.setBlockTextureName(GTPlusPlus.ID + ":" + blockType.getTexture()); this.blockColour = colour; this.thisBlock = blockType; this.thisBlockMaterial = blockMaterialString; @@ -187,7 +190,7 @@ public class BlockBaseModular extends BasicBlock { public void registerBlockIcons(final IIconRegister iIcon) { if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null || this.thisBlock == BlockTypes.ORE) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); } String metType = "9j4852jyo3rjmh3owlhw9oe"; if (this.blockMaterial != null) { @@ -199,7 +202,7 @@ public class BlockBaseModular extends BasicBlock { metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType); int tier = blockMaterial != null ? this.blockMaterial.vTier : 0; String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5"); - this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/" + metType + "/" + aType); + this.blockIcon = iIcon.registerIcon(GregTech.ID + ":" + "materialicons/" + metType + "/" + aType); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 140773f4ea..88ee9a8986 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -143,9 +143,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { /* * @Override * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon = - * iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); //this.base = - * iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + - * "blockOre_Overlay"); } + * iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); //this.base = + * iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(GTPlusPlus.ID + + * ":" + "blockOre_Overlay"); } * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return * this.blockColour; } diff --git a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java index 575c5ca33b..bb6aee18d5 100644 --- a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.block.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class MultiTextureBlock extends Block { @@ -15,7 +16,7 @@ public class MultiTextureBlock extends Block { protected MultiTextureBlock(final String unlocalizedName, final Material material, final SoundType blockSound) { super(material); this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(2.0F); this.setResistance(6.0F); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index a3209d0907..2966404a67 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; public class BlockCompressedObsidian extends BlockObsidian { @@ -48,17 +49,17 @@ public class BlockCompressedObsidian extends BlockObsidian { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iicon) { - this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian1"); - this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian2"); - this.textureArray[2] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian3"); - this.textureArray[3] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian4"); - this.textureArray[4] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian5"); - this.textureArray[5] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian_invert"); - this.textureArray[6] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone1"); - this.textureArray[7] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone2"); - this.textureArray[8] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone3"); - this.textureArray[9] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone4"); - this.textureArray[10] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone5"); + this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian1"); + this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian2"); + this.textureArray[2] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian3"); + this.textureArray[3] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian4"); + this.textureArray[4] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian5"); + this.textureArray[5] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian_invert"); + this.textureArray[6] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone1"); + this.textureArray[7] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone2"); + this.textureArray[8] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone3"); + this.textureArray[9] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone4"); + this.textureArray[10] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone5"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java index 6064190fba..c462021374 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.BlockWeb; @@ -11,7 +13,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; public class BlockNet extends BlockWeb { @@ -26,7 +27,7 @@ public class BlockNet extends BlockWeb { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "net"); + this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "net"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index 975ddd3d0f..fee8176262 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.BlockContainer; @@ -19,7 +21,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; public class BlockSuperLight extends BlockContainer { @@ -47,7 +48,7 @@ public class BlockSuperLight extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlBigBlue"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlBigBlue"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 6a92c92453..61e6b71b57 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.BlockContainer; @@ -17,7 +19,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; -import gtPlusPlus.core.lib.CORE; public class BlockTankXpConverter extends BlockContainer { @@ -56,10 +57,10 @@ public class BlockTankXpConverter extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray"); + this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); + this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); + this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); + this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index 6c93fdf2cf..25210df133 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -1,6 +1,11 @@ package gtPlusPlus.core.block.general; -import static net.minecraftforge.common.util.ForgeDirection.*; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.UP; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import java.util.List; import java.util.Random; diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index 6a01dd623b..6f4b033b4b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +21,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -57,10 +58,12 @@ public class FluidTankInfinite extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture"); - this.textureTop