diff options
Diffstat (limited to 'src/main/java/goodgenerator/blocks')
| -rw-r--r-- | src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java | 32 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/Casing.java) | 24 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java) | 4 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/Frame.java) | 6 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java) | 54 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java) | 10 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java) | 24 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronAccelerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java) | 12 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronSensor.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java) | 28 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEYOTTAHatch.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java) | 26 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java) | 86 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java) | 63 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java) | 2 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatch.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java) | 2 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java) | 2 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java) | 110 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java) | 89 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java) | 92 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java) | 78 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java) | 33 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java) | 33 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java) | 33 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java) | 45 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java) | 45 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java) | 114 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java) | 123 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java) | 148 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java) | 38 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java) | 103 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java) | 86 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java) | 145 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputerPP.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java) | 19 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java) | 98 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTETooltipMultiBlockBaseEM.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java) | 20 |
34 files changed, 907 insertions, 920 deletions
diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java index de8cca2b43..909a1272da 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java +++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java @@ -4,7 +4,7 @@ import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.common.registry.GameRegistry; -import goodgenerator.crossmod.nei.NEI_Config; +import goodgenerator.crossmod.nei.NEIConfig; public class FluidsBuilder { @@ -36,7 +36,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedNaquadahGas"); tmp2.setBlockName("lightlyCrackedNaquadahGas"); GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahGas"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahGas_Moderately() { @@ -47,7 +47,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedNaquadahGas"); tmp2.setBlockName("moderatelyCrackedNaquadahGas"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahGas"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahGas_Heavily() { @@ -58,7 +58,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedNaquadahGas"); tmp2.setBlockName("heavilyCrackedNaquadahGas"); GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahGas"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedLightNaquadahFuel_Lightly() { @@ -69,7 +69,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedLightNaquadahFuel"); tmp2.setBlockName("lightlyCrackedLightNaquadahFuel"); GameRegistry.registerBlock(tmp2, "lightlyCrackedLightNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedLightNaquadahFuel_Moderately() { @@ -80,7 +80,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedLightNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedLightNaquadahFuel_Heavily() { @@ -91,7 +91,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedLightNaquadahFuel"); tmp2.setBlockName("heavilyCrackedLightNaquadahFuel"); GameRegistry.registerBlock(tmp2, "heavilyCrackedLightNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedHeavyNaquadahFuel_Lightly() { @@ -102,7 +102,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel"); GameRegistry.registerBlock(tmp2, "lightlyCrackedHeavyNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedHeavyNaquadahFuel_Moderately() { @@ -113,7 +113,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedHeavyNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedHeavyNaquadahFuel_Heavily() { @@ -124,7 +124,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel"); GameRegistry.registerBlock(tmp2, "heavilyCrackedHeavyNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahAsphalt_Lightly() { @@ -137,7 +137,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedNaquadahAsphalt"); tmp2.setBlockName("lightlyCrackedNaquadahAsphalt"); GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahAsphalt"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahAsphalt_Moderately() { @@ -150,7 +150,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt"); tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahAsphalt"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahAsphalt_Heavily() { @@ -163,7 +163,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedNaquadahAsphalt"); tmp2.setBlockName("heavilyCrackedNaquadahAsphalt"); GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahAsphalt"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void combustionPromotor() { @@ -174,7 +174,7 @@ public class FluidsBuilder { tmp2.SetTexture("combustionPromotor"); tmp2.setBlockName("combustionPromotor"); GameRegistry.registerBlock(tmp2, "combustionPromotor"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void coalTar() { @@ -186,7 +186,7 @@ public class FluidsBuilder { tmp2.SetTexture("coalTar"); tmp2.setBlockTextureName("coalTar"); GameRegistry.registerBlock(tmp2, "coalTar"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void supercriticalSteam() { @@ -198,6 +198,6 @@ public class FluidsBuilder { tmp2.SetTexture("supercriticalSteam"); tmp2.setBlockTextureName("supercriticalSteam"); GameRegistry.registerBlock(tmp2, "supercriticalSteam"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java index c10b0f7184..4f784b5501 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java @@ -17,9 +17,9 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.main.GoodGenerator; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; -public class Casing extends Block { +public class BlockCasing extends Block { @SideOnly(Side.CLIENT) protected IIcon[] texture; @@ -27,17 +27,17 @@ public class Casing extends Block { String[] textureNames; protected String name; - public Casing(String name) { + public BlockCasing(String name) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture) { + public BlockCasing(String name, String[] texture) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); @@ -45,10 +45,10 @@ public class Casing extends Block { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture, Material material) { + public BlockCasing(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); @@ -56,7 +56,7 @@ public class Casing extends Block { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } @Override @@ -90,15 +90,15 @@ public class Casing extends Block { @Override public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aMetaData)) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aMetaData)) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java index 0a0169d0b4..03b7f61557 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java @@ -11,14 +11,14 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ComplexTextureCasing extends Casing { +public class BlockComplexTextureCasing extends BlockCasing { @SideOnly(Side.CLIENT) protected IIcon[] texture1, texture2; String[] textureSide; String[] textureTopAndDown; - public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) { + public BlockComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) { super(name); this.textureSide = textureSide; this.textureTopAndDown = textureTopAndDown; diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java index b4acb03518..b29ef7f2f2 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java @@ -6,9 +6,9 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class Frame extends Casing { +public class BlockFrame extends BlockCasing { - public Frame(String name, String[] texture) { + public BlockFrame(String name, String[] texture) { super(name, texture, Material.iron); } @@ -20,7 +20,7 @@ public class Frame extends Casing { @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) { - if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) return false; + if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof BlockFrame) return false; return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide); } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java index dcd2bdd801..9bf51b7377 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java @@ -20,16 +20,16 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import goodgenerator.blocks.tileEntity.EssentiaHatch; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME; +import goodgenerator.blocks.tileEntity.MTEEssentiaHatch; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatch; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatchME; import goodgenerator.main.GoodGenerator; -import gregtech.api.GregTech_API; -import gregtech.api.util.GT_Utility; +import gregtech.api.GregTechAPI; +import gregtech.api.util.GTUtility; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; -public class TEBlock extends BlockContainer { +public class BlockTEContainer extends BlockContainer { @SideOnly(Side.CLIENT) protected IIcon[] texture; @@ -38,7 +38,7 @@ public class TEBlock extends BlockContainer { protected String name; protected int index; - public TEBlock(String name, String[] texture, CreativeTabs Tab) { + public BlockTEContainer(String name, String[] texture, CreativeTabs Tab) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); @@ -46,10 +46,10 @@ public class TEBlock extends BlockContainer { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, int index) { + public BlockTEContainer(String name, String[] texture, int index) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); @@ -58,10 +58,10 @@ public class TEBlock extends BlockContainer { this.setHarvestLevel("wrench", 2); this.index = index; this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, Material material) { + public BlockTEContainer(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); @@ -69,7 +69,7 @@ public class TEBlock extends BlockContainer { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } public int getIndex() { @@ -107,15 +107,15 @@ public class TEBlock extends BlockContainer { @Override public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aMetaData)) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aMetaData)) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } aWorld.removeTileEntity(aX, aY, aZ); } @@ -144,11 +144,11 @@ public class TEBlock extends BlockContainer { public TileEntity createTileEntity(World world, int meta) { switch (index) { case 1: - return new EssentiaHatch(); + return new MTEEssentiaHatch(); case 2: - return new EssentiaOutputHatch(); + return new MTEEssentiaOutputHatch(); case 3: - return new EssentiaOutputHatch_ME(); + return new MTEEssentiaOutputHatchME(); default: return null; } @@ -162,7 +162,7 @@ public class TEBlock extends BlockContainer { } else { TileEntity tile = world.getTileEntity(x, y, z); if (index == 1) { - if (tile instanceof EssentiaHatch) { + if (tile instanceof MTEEssentiaHatch) { ItemStack tItemStack = player.getHeldItem(); if (tItemStack != null) { Item tItem = tItemStack.getItem(); @@ -172,26 +172,26 @@ public class TEBlock extends BlockContainer { .size() > 0) { Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) .getAspects()[0]; - ((EssentiaHatch) tile).setLockedAspect(tLocked); - GT_Utility.sendChatToPlayer( + ((MTEEssentiaHatch) tile).setLockedAspect(tLocked); + GTUtility.sendChatToPlayer( player, String.format( StatCollector.translateToLocal("essentiahatch.chat.0"), tLocked.getLocalizedDescription())); } } else { - ((EssentiaHatch) tile).setLockedAspect(null); - GT_Utility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1")); + ((MTEEssentiaHatch) tile).setLockedAspect(null); + GTUtility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1")); } world.markBlockForUpdate(x, y, z); return true; } else return false; } else if (index == 2) { - if (tile instanceof EssentiaOutputHatch && player.isSneaking()) { + if (tile instanceof MTEEssentiaOutputHatch && player.isSneaking()) { ItemStack tItemStack = player.getHeldItem(); if (tItemStack == null) { - ((EssentiaOutputHatch) tile).clear(); - GT_Utility + ((MTEEssentiaOutputHatch) tile).clear(); + GTUtility .sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0")); } return true; diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java index 986ab4e0c8..6b6de38161 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java @@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; +import goodgenerator.blocks.tileEntity.base.MTELargeTurbineBase; import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.main.GoodGenerator; import gregtech.api.enums.Textures; @@ -14,7 +14,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -public class TurbineCasing extends Casing implements ITextureBlock { +public class BlockTurbineCasing extends BlockCasing implements ITextureBlock { public static IIconContainer[][] turbineShape = new IIconContainer[3][9]; public IIconContainer base; @@ -24,7 +24,7 @@ public class TurbineCasing extends Casing implements ITextureBlock { turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j); } - public TurbineCasing(String name, String texture) { + public BlockTurbineCasing(String name, String texture) { super(name, new String[] { GoodGenerator.MOD_ID + ":" + texture }); base = new Textures.BlockIcons.CustomIcon("icons/" + texture); } @@ -33,9 +33,9 @@ public class TurbineCasing extends Casing implements ITextureBlock { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; - if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == side) { + if (tTile.getMetaTileEntity() instanceof MTELargeTurbineBase && tTile.getFrontFacing() == side) { if (tTile.isActive()) return 1; - return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; + return ((MTELargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; } return 0; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java index 5ed8a07ebe..c1294f2a91 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java @@ -7,35 +7,35 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.ItemList; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; +import gregtech.api.metatileentity.implementations.MTEBasicGenerator; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; -public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { +public class MTEDieselGenerator extends MTEBasicGenerator { public int mEfficiency; - public DieselGenerator(int aID, String aName, String aNameRegional, int aTier) { + public MTEDieselGenerator(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, aNameRegional, aTier, new String[] { "Requires liquid Fuel", - "Causes " + (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1)) + "Causes " + (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1)) + " Pollution per second" }); mEfficiency = 100 - aTier * 10; } - public DieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEDieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); mEfficiency = 100 - aTier * 10; } @@ -47,7 +47,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new DieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEDieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -67,7 +67,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public int getFuelValue(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return 0; + if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0; long rValue = super.getFuelValue(aStack); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3L); @@ -81,7 +81,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aTick % 100 == 0 && mFluid != null && mFluid.amount > this.getCapacity()) { - GT_Log.err.println( + GTLog.err.println( "Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName() + " Coords: " + aBaseMetaTileEntity.getXCoord() @@ -208,6 +208,6 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public int getPollution() { - return (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - mTier * 0.1)); + return (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - mTier * 0.1)); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronAccelerator.java index 730374db66..a9c70d9284 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronAccelerator.java @@ -1,19 +1,19 @@ package goodgenerator.blocks.tileEntity.GTMetaTileEntity; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; -public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { +public class MTENeutronAccelerator extends MTEHatchEnergy { - public NeutronAccelerator(int aID, String aName, String aNameRegional, int aTier) { + public MTENeutronAccelerator(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public NeutronAccelerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTENeutronAccelerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -23,7 +23,7 @@ public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new NeutronAccelerator(mName, mTier, this.getDescription(), mTextures); + return new MTENeutronAccelerator(mName, mTier, this.getDescription(), mTextures); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronSensor.java index 10a6814ddb..5513fcd7c6 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronSensor.java @@ -18,18 +18,18 @@ import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget; import crazypants.enderio.Log; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.common.gui.modularui.widget.CoverCycleButtonWidget; -public class NeutronSensor extends GT_MetaTileEntity_Hatch { +public class MTENeutronSensor extends MTEHatch { private static final IIconContainer textureFont = new Textures.BlockIcons.CustomIcon("icons/NeutronSensorFont"); private static final IIconContainer textureFont_Glow = new Textures.BlockIcons.CustomIcon( @@ -39,11 +39,11 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { protected boolean inverted = false; boolean isOn = false; - public NeutronSensor(int aID, String aName, String aNameRegional, int aTier) { + public MTENeutronSensor(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 0, "Detect Neutron Kinetic Energy."); } - public NeutronSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTENeutronSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -172,7 +172,7 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -219,7 +219,7 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new NeutronSensor(mName, mTier, mDescriptionArray, mTextures); + return new MTENeutronSensor(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -236,14 +236,14 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - final String INVERTED = GT_Utility.trans("INVERTED", "Inverted"); - final String NORMAL = GT_Utility.trans("NORMAL", "Normal"); + final String INVERTED = GTUtility.trans("INVERTED", "Inverted"); + final String NORMAL = GTUtility.trans("NORMAL", "Normal"); builder.widget( new CoverCycleButtonWidget().setToggle(() -> inverted, (val) -> inverted = val) .setTextureGetter( - (state) -> state == 1 ? GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON - : GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + (state) -> state == 1 ? GTUITextures.OVERLAY_BUTTON_REDSTONE_ON + : GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF) .addTooltip(0, NORMAL) .addTooltip(1, INVERTED) .setPos(10, 8)) @@ -260,7 +260,7 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { .setTextColor(Color.WHITE.dark(1)) .setTextAlignment(Alignment.CenterLeft) .setFocusOnGuiOpen(true) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) + .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) .setPos(10, 28) .setSize(77, 12)) .widget( diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEYOTTAHatch.java index 52c7522c10..51dbc7f199 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEYOTTAHatch.java @@ -32,7 +32,7 @@ import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; -import goodgenerator.blocks.tileEntity.YottaFluidTank; +import goodgenerator.blocks.tileEntity.MTEYottaFluidTank; import goodgenerator.loader.Loaders; import goodgenerator.util.StackUtils; import gregtech.api.enums.Textures; @@ -40,16 +40,16 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; -public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyable, IActionHost, ICellContainer, +public class MTEYOTTAHatch extends MTEHatch implements IGridProxyable, IActionHost, ICellContainer, IMEInventory<IAEFluidStack>, IMEInventoryHandler<IAEFluidStack> { private static final IIconContainer textureFont = new Textures.BlockIcons.CustomIcon("icons/YOTTAHatch"); - private YottaFluidTank host; + private MTEYottaFluidTank host; private AENetworkProxy gridProxy = null; private int priority; private byte tickRate = 20; @@ -61,7 +61,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl private static final BigInteger MAX_LONG_BIGINT = BigInteger.valueOf(Long.MAX_VALUE); - public YOTTAHatch(int aID, String aName, String aNameRegional, int aTier) { + public MTEYOTTAHatch(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -72,11 +72,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl "Use screwdriver to set storage priority", "Use soldering iron to set read/write mode" }); } - public YOTTAHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEYOTTAHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } - public void setTank(YottaFluidTank te) { + public void setTank(MTEYottaFluidTank te) { this.host = te; } @@ -109,7 +109,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl ItemStack toolStack) { if (aPlayer.isSneaking()) this.priority -= 10; else this.priority += 10; - GT_Utility + GTUtility .sendChatToPlayer(aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.0"), this.priority)); } @@ -117,7 +117,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ, ItemStack toolStack) { this.readMode = AEModes[(readMode.ordinal() + 1) % 4]; - GT_Utility + GTUtility .sendChatToPlayer(aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.1"), this.readMode)); return true; } @@ -236,7 +236,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl || !host.getBaseMetaTileEntity() .isActive()) return 0; - if (host.mStorage.compareTo(YottaFluidTank.MAX_INT_BIGINT) >= 0) { + if (host.mStorage.compareTo(MTEYottaFluidTank.MAX_INT_BIGINT) >= 0) { return Integer.MAX_VALUE; } else return host.mStorage.intValue(); } @@ -308,7 +308,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl return null; if (host.mFluid == null || host.mFluid.getFluid() != resource.getFluid()) return null; int ready; - if (host.mStorageCurrent.compareTo(YottaFluidTank.MAX_INT_BIGINT) >= 0) { + if (host.mStorageCurrent.compareTo(MTEYottaFluidTank.MAX_INT_BIGINT) >= 0) { ready = Integer.MAX_VALUE; } else ready = host.mStorageCurrent.intValue(); ready = Math.min(ready, resource.amount); @@ -384,7 +384,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new YOTTAHatch(mName, mTier, mDescriptionArray, mTextures); + return new MTEYOTTAHatch(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java index 190b572046..6110cf6eeb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java @@ -2,7 +2,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.HatchElement.*; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.stream.Collectors; @@ -27,33 +27,33 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; import goodgenerator.loader.Loaders; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_StructureUtility; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTStructureUtility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; -public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<ComponentAssemblyLine> +public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTEComponentAssemblyLine> implements ISurvivalConstructable { private int casingTier; private float speedBonus; protected static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<ComponentAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition - .<ComponentAssemblyLine>builder() + private static final IStructureDefinition<MTEComponentAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition + .<MTEComponentAssemblyLine>builder() .addShape( STRUCTURE_PIECE_MAIN, new String[][] { @@ -131,12 +131,12 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 14), ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 15), ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0))) - .addElement('H', ofBlock(GregTech_API.sBlockCasings8, 7)) - .addElement('C', ofBlock(GregTech_API.sBlockCasings2, 5)) - .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 9)) - .addElement('G', ofBlock(GregTech_API.sBlockCasings9, 0)) - .addElement('E', ofBlock(GregTech_API.sBlockCasings9, 1)) - .addElement('F', ofBlock(GregTech_API.sBlockCasings4, 1)) + .addElement('H', ofBlock(GregTechAPI.sBlockCasings8, 7)) + .addElement('C', ofBlock(GregTechAPI.sBlockCasings2, 5)) + .addElement('D', ofBlock(GregTechAPI.sBlockCasings2, 9)) + .addElement('G', ofBlock(GregTechAPI.sBlockCasings9, 0)) + .addElement('E', ofBlock(GregTechAPI.sBlockCasings9, 1)) + .addElement('F', ofBlock(GregTechAPI.sBlockCasings4, 1)) .addElement( 'B', ofBlocksTiered( @@ -149,54 +149,54 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB t -> t.casingTier)) .addElement( 'J', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(InputBus) .dot(1) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'N', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(InputBus) .dot(1) .casingIndex(183) - .buildAndChain(GT_StructureUtility.ofFrame(Materials.TungstenSteel))) + .buildAndChain(GTStructureUtility.ofFrame(Materials.TungstenSteel))) .addElement( 'K', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(OutputBus) .dot(2) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'L', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(Energy, ExoticEnergy) .dot(3) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'I', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(Maintenance) .dot(4) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'M', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(InputHatch) .dot(5) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement('n', GT_StructureUtility.ofFrame(Materials.TungstenSteel)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) + .addElement('n', GTStructureUtility.ofFrame(Materials.TungstenSteel)) .build(); - public ComponentAssemblyLine(int aID, String aName, String aNameRegional) { + public MTEComponentAssemblyLine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public ComponentAssemblyLine(String aName) { + public MTEComponentAssemblyLine(String aName) { super(aName); } @@ -206,13 +206,13 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB } @Override - public IStructureDefinition<ComponentAssemblyLine> getStructureDefinition() { + public IStructureDefinition<MTEComponentAssemblyLine> getStructureDefinition() { return STRUCTURE_DEFINITION; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("High-Capacity Component Assembler") .addInfo("Controller block for the Component Assembly Line.") .addInfo("Assembles basic components (motors, pumps, etc.) in large batches.") @@ -257,7 +257,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new ComponentAssemblyLine(mName); + return new MTEComponentAssemblyLine(mName); } /** @@ -269,7 +269,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB String[] ret = new String[origin.length + 1]; System.arraycopy(origin, 0, ret, 0, origin.length); ret[origin.length] = StatCollector.translateToLocal("scanner.info.CASS.tier") - + (casingTier >= 0 ? GT_Values.VN[casingTier + 1] : "None!"); + + (casingTier >= 0 ? GTValues.VN[casingTier + 1] : "None!"); return ret; } @@ -311,7 +311,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (recipe.mSpecialValue > casingTier + 1) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); } @@ -320,7 +320,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @Nonnull @Override - protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) { speedBonus = (float) (1 / Math.pow(2, casingTier + 1 - recipe.mSpecialValue)); return super.createOverclockCalculator(recipe).setSpeedBoost(speedBonus); } @@ -349,7 +349,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { inputSeparation = !inputSeparation; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } @@ -360,9 +360,9 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { - GT_Utility.sendChatToPlayer(aPlayer, "Batch recipes."); + GTUtility.sendChatToPlayer(aPlayer, "Batch recipes."); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Don't batch recipes."); + GTUtility.sendChatToPlayer(aPlayer, "Don't batch recipes."); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java index bfa726952b..be0fe5b4ce 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java @@ -3,8 +3,8 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.*; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.*; +import static gregtech.api.util.GTUtility.filterValidMTEs; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -12,48 +12,46 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; -public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTECoolantTower extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - protected IStructureDefinition<CoolantTower> multiDefinition = null; + protected IStructureDefinition<MTECoolantTower> multiDefinition = null; private static final int CASING_INDEX = 1539; - public CoolantTower(int aID, String aName, String aNameRegional) { + public MTECoolantTower(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public CoolantTower(String name) { + public MTECoolantTower(String name) { super(name); } @Override - public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { + public IStructureDefinition<? extends TTMultiblockBase> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<CoolantTower>builder() + multiDefinition = StructureDefinition.<MTECoolantTower>builder() .addShape( mName, transpose( @@ -84,14 +82,17 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM "HB BH", "HB BH", " HB BH ", " HBBBBBH ", " HHHHH " }, { " CCCCC ", " C C ", " C C ", "C C", "C C", "C C", "C C", "C C", " C C ", " C C ", " CCCCC " }, })) - .addElement('B', ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8)) + .addElement('B', ofBlockAnyMeta(GregTechAPI.sBlockConcretes, 8)) .addElement('C', ofFrame(Materials.TungstenCarbide)) .addElement( 'H', - buildHatchAdder(CoolantTower.class).atLeast(GT_HatchElement.InputHatch, GT_HatchElement.OutputHatch) + buildHatchAdder(MTECoolantTower.class) + .atLeast( + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.OutputHatch) .casingIndex(CASING_INDEX) .dot(1) - .buildAndChain(ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8))) + .buildAndChain(ofBlockAnyMeta(GregTechAPI.sBlockConcretes, 8))) .build(); } return multiDefinition; @@ -103,8 +104,8 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Coolant Tower") .addInfo("Controller block for the Coolant Tower.") .addInfo("Turn Steam back to Distilled Water.") @@ -129,7 +130,7 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new CoolantTower(mName); + return new MTECoolantTower(mName); } @Override @@ -147,17 +148,17 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM this.mMaxProgresstime = 20; int steam = 0; - for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) { + for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) { steam += maybeDrainHatch(tHatch); } - addOutput(GT_ModHandler.getDistilledWater(steam / 160)); + addOutput(GTModHandler.getDistilledWater(steam / 160)); return CheckRecipeResultRegistry.SUCCESSFUL; } - private int maybeDrainHatch(GT_MetaTileEntity_Hatch_Input tHatch) { - if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) { + private int maybeDrainHatch(MTEHatchInput tHatch) { + if (tHatch instanceof MTEHatchMultiInput) { int drained = 0; - for (FluidStack maybeSteam : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) { + for (FluidStack maybeSteam : ((MTEHatchMultiInput) tHatch).getStoredFluid()) { drained += maybeDrainSteam(tHatch, maybeSteam); } return drained; @@ -165,9 +166,9 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return maybeDrainSteam(tHatch, tHatch.getFillableStack()); } - private int maybeDrainSteam(GT_MetaTileEntity_Hatch_Input tHatch, FluidStack maybeSteam) { + private int maybeDrainSteam(MTEHatchInput tHatch, FluidStack maybeSteam) { if (maybeSteam == null) return 0; - if (!GT_Utility.areFluidsEqual(maybeSteam, GT_ModHandler.getSteam(1))) return 0; + if (!GTUtility.areFluidsEqual(maybeSteam, GTModHandler.getSteam(1))) return 0; FluidStack defoSteam = tHatch.drain(ForgeDirection.UNKNOWN, maybeSteam, true); return defoSteam.amount; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java index f9eab80f03..d8680f5efd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java @@ -17,7 +17,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -public class EssentiaHatch extends TileEntity implements IAspectContainer, IEssentiaTransport { +public class MTEEssentiaHatch extends TileEntity implements IAspectContainer, IEssentiaTransport { private Aspect mLocked; private AspectList current = new AspectList(); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatch.java index 93cec4672c..23a0a7f093 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatch.java @@ -12,7 +12,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -public class EssentiaOutputHatch extends TileThaumcraft implements IAspectContainer, IEssentiaTransport { +public class MTEEssentiaOutputHatch extends TileThaumcraft implements IAspectContainer, IEssentiaTransport { public static final int CAPACITY = 256; protected AspectList mAspects = new AspectList(); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java index b576b44e7f..4e8bba61ec 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java @@ -21,7 +21,7 @@ import thaumcraft.api.aspects.AspectList; import thaumicenergistics.api.grid.IEssentiaGrid; import thaumicenergistics.api.grid.IMEEssentiaMonitor; -public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActionHost, IGridProxyable { +public class MTEEssentiaOutputHatchME extends MTEEssentiaOutputHatch implements IActionHost, IGridProxyable { private AENetworkProxy gridProxy = null; private IMEEssentiaMonitor monitor = null; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java index 3589acba60..c37a2026d4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java @@ -2,9 +2,9 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collections; @@ -30,54 +30,53 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import goodgenerator.api.recipe.ExtremeHeatExchangerRecipe; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IHatchElement; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.multitileentity.multiblock.casing.Glasses; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.IGT_HatchAdder; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.api.util.IGTHatchAdder; +import gregtech.api.util.MultiblockTooltipBuilder; -public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTEExtremeHeatExchanger extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - protected IStructureDefinition<ExtremeHeatExchanger> multiDefinition = null; + protected IStructureDefinition<MTEExtremeHeatExchanger> multiDefinition = null; public static double penalty_per_config = 0.015d; protected int casingAmount = 0; - protected GT_MetaTileEntity_Hatch_Input mHotFluidHatch; - protected GT_MetaTileEntity_Hatch_Output mCooledFluidHatch; + protected MTEHatchInput mHotFluidHatch; + protected MTEHatchOutput mCooledFluidHatch; private boolean transformed = false; private String hotName; private ExtremeHeatExchangerRecipe tRunningRecipe; - public ExtremeHeatExchanger(String name) { + public MTEExtremeHeatExchanger(String name) { super(name); } - public ExtremeHeatExchanger(int id, String name, String nameRegional) { + public MTEExtremeHeatExchanger(int id, String name, String nameRegional) { super(id, name, nameRegional); } @Override - public IStructureDefinition<ExtremeHeatExchanger> getStructure_EM() { + public IStructureDefinition<MTEExtremeHeatExchanger> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<ExtremeHeatExchanger>builder() + multiDefinition = StructureDefinition.<MTEExtremeHeatExchanger>builder() .addShape( mName, transpose( @@ -94,33 +93,38 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas .addElement( 'B', ofChain( - buildHatchAdder(ExtremeHeatExchanger.class) - .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.Maintenance) + buildHatchAdder(MTEExtremeHeatExchanger.class) + .atLeast( + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(48) .dot(1) .build(), - onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) + onElementPass(x -> x.casingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0)))) .addElement( 'T', ofChain( - buildHatchAdder(ExtremeHeatExchanger.class) - .atLeast(GT_HatchElement.OutputHatch, GT_HatchElement.Maintenance) + buildHatchAdder(MTEExtremeHeatExchanger.class) + .atLeast( + gregtech.api.enums.HatchElement.OutputHatch, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(48) .dot(2) .build(), - onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) + onElementPass(x -> x.casingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0)))) .addElement('F', EHEHatches.HotInputHatch.newAny(48, 3)) .addElement('E', EHEHatches.ColdOutputHatch.newAny(48, 4)) .addElement( 'C', ofChain( - buildHatchAdder(ExtremeHeatExchanger.class).atLeast(GT_HatchElement.Maintenance) + buildHatchAdder(MTEExtremeHeatExchanger.class) + .atLeast(gregtech.api.enums.HatchElement.Maintenance) .casingIndex(48) .dot(5) .build(), - onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) + onElementPass(x -> x.casingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0)))) .addElement('G', Glasses.chainAllGlasses()) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) + .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 15)) .addElement('W', ofBlock(Loaders.pressureResistantWalls, 0)) .build(); } @@ -131,9 +135,9 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - mHotFluidHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + mHotFluidHatch = (MTEHatchInput) aMetaTileEntity; return true; } return false; @@ -143,9 +147,9 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - mCooledFluidHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchOutput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + mCooledFluidHatch = (MTEHatchOutput) aMetaTileEntity; return true; } return false; @@ -196,8 +200,8 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Heat Exchanger/Plasma Heat Exchanger") .addInfo("Controller block for the Extreme Heat Exchanger.") .addInfo("Accept Hot fluid like lava, hot coolant or plasma.") @@ -264,10 +268,10 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas Fluid tReadySteam = transformed ? tRunningRecipe.getHeatedSteam() : tRunningRecipe.getNormalSteam(); int waterAmount = (int) (this.mEUt / getUnitSteamPower(tReadySteam.getName())) / 160; if (waterAmount < 0) return false; - if (depleteInput(GT_ModHandler.getDistilledWater(waterAmount))) { + if (depleteInput(GTModHandler.getDistilledWater(waterAmount))) { addOutput(new FluidStack(tReadySteam, waterAmount * 160)); } else { - GT_Log.exp.println(this.mName + " had no more Distilled water!"); + GTLog.exp.println(this.mName + " had no more Distilled water!"); mHotFluidHatch.getBaseMetaTileEntity() .doExplosion(V[8]); return false; @@ -301,7 +305,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new ExtremeHeatExchanger(mName); + return new MTEExtremeHeatExchanger(mName); } @Override @@ -315,11 +319,11 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas return new String[] { StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mProgresstime / 20) + + GTUtility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(mMaxProgresstime / 20) + + GTUtility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s", StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " @@ -335,12 +339,12 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas + " %", StatCollector.translateToLocal("scanner.info.XHE.0") + " " + (transformed ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW) - + GT_Utility.formatNumbers(this.mEUt) + + GTUtility.formatNumbers(this.mEUt) + EnumChatFormatting.RESET + " EU/t", StatCollector.translateToLocal("scanner.info.XHE.1") + " " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(tThreshold) + + GTUtility.formatNumbers(tThreshold) + EnumChatFormatting.RESET + " L/s" }; } @@ -377,29 +381,29 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas return survivialBuildPiece(mName, stackSize, 2, 5, 0, elementBudget, env, false, true); } - private enum EHEHatches implements IHatchElement<ExtremeHeatExchanger> { + private enum EHEHatches implements IHatchElement<MTEExtremeHeatExchanger> { - HotInputHatch(ExtremeHeatExchanger::addHotFluidInputToMachineList, GT_MetaTileEntity_Hatch_Input.class) { + HotInputHatch(MTEExtremeHeatExchanger::addHotFluidInputToMachineList, MTEHatchInput.class) { @Override - public long count(ExtremeHeatExchanger t) { + public long count(MTEExtremeHeatExchanger t) { if (t.mHotFluidHatch == null) return 0; return 1; } }, - ColdOutputHatch(ExtremeHeatExchanger::addColdFluidOutputToMachineList, GT_MetaTileEntity_Hatch_Output.class) { + ColdOutputHatch(MTEExtremeHeatExchanger::addColdFluidOutputToMachineList, MTEHatchOutput.class) { @Override - public long count(ExtremeHeatExchanger t) { + public long count(MTEExtremeHeatExchanger t) { if (t.mCooledFluidHatch == null) return 0; return 1; } }; private final List<Class<? extends IMetaTileEntity>> mteClasses; - private final IGT_HatchAdder<ExtremeHeatExchanger> adder; + private final IGTHatchAdder<MTEExtremeHeatExchanger> adder; - EHEHatches(IGT_HatchAdder<ExtremeHeatExchanger> adder, Class<? extends IMetaTileEntity>... mteClasses) { + EHEHatches(IGTHatchAdder<MTEExtremeHeatExchanger> adder, Class<? extends IMetaTileEntity>... mteClasses) { this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses)); this.adder = adder; } @@ -409,7 +413,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas return mteClasses; } - public IGT_HatchAdder<? super ExtremeHeatExchanger> adder() { + public IGTHatchAdder<? super MTEExtremeHeatExchanger> adder() { return adder; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java index 8d1720c8f2..9c25f98d30 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java @@ -5,7 +5,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -16,7 +16,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -28,44 +27,43 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureUtility; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - private IStructureDefinition<FuelRefineFactory> multiDefinition = null; + private IStructureDefinition<MTEFuelRefineFactory> multiDefinition = null; private int Tier = -1; private int[] cnt = new int[] { 0, 0, 0, 0 }; private static final Block[] coils = new Block[] { Loaders.FRF_Coil_1, Loaders.FRF_Coil_2, Loaders.FRF_Coil_3, Loaders.FRF_Coil_4 }; - public FuelRefineFactory(String name) { + public MTEFuelRefineFactory(String name) { super(name); useLongPower = true; } - public FuelRefineFactory(int id, String name, String nameRegional) { + public MTEFuelRefineFactory(int id, String name, String nameRegional) { super(id, name, nameRegional); useLongPower = true; } @@ -81,9 +79,9 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E } @Override - public IStructureDefinition<FuelRefineFactory> getStructure_EM() { + public IStructureDefinition<MTEFuelRefineFactory> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<FuelRefineFactory>builder() + multiDefinition = StructureDefinition.<MTEFuelRefineFactory>builder() .addShape( mName, transpose( @@ -104,13 +102,14 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E { " ", " CCC ", " " } })) .addElement( 'X', - buildHatchAdder(FuelRefineFactory.class) + buildHatchAdder(MTEFuelRefineFactory.class) .atLeast( - GT_HatchElement.Maintenance, - GT_HatchElement.InputHatch, - GT_HatchElement.InputBus, - GT_HatchElement.OutputHatch, - HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) + gregtech.api.enums.HatchElement.Maintenance, + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.InputBus, + gregtech.api.enums.HatchElement.OutputHatch, + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.EnergyMulti + .or(gregtech.api.enums.HatchElement.Energy)) .casingIndex(179) .dot(1) .buildAndChain(ofBlock(Loaders.FRF_Casings, 0))) @@ -179,8 +178,8 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Naquadah Fuel Refinery") .addInfo("Controller block for the Naquadah Fuel Refinery") .addInfo("But at what cost?") @@ -247,7 +246,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (recipe.mSpecialValue > Tier) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); } @@ -256,7 +255,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { int overclockAmount = Tier - recipe.mSpecialValue; return super.createOverclockCalculator(recipe).limitOverclockCount(overclockAmount); } @@ -277,19 +276,19 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E if (aMetaTileEntity == null) { return false; } else { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + if (aMetaTileEntity instanceof MTEHatch) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { - return this.eEnergyMulti.add((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + return this.mInputHatches.add((MTEHatchInput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchOutput) { + return this.mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchInputBus) { + return this.mInputBusses.add((MTEHatchInputBus) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchEnergy) { + return this.mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchEnergyMulti) { + return this.eEnergyMulti.add((MTEHatchEnergyMulti) aMetaTileEntity); } else { return false; } @@ -299,7 +298,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new FuelRefineFactory(this.mName); + return new MTEFuelRefineFactory(this.mName); } @Override @@ -351,12 +350,12 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder() .addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW) .glow() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder() .addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW) .glow() .build() }; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java index b7ab940b2f..bff8da6fa2 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java @@ -2,7 +2,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -16,57 +16,56 @@ import net.minecraftforge.fluids.FluidRegistry; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import bartworks.system.material.WerkstoffLoader; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.objects.XSTR; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoTunnel; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; -public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTELargeEssentiaGenerator extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - private IStructureDefinition<LargeEssentiaGenerator> multiDefinition = null; + private IStructureDefinition<MTELargeEssentiaGenerator> multiDefinition = null; protected int mStableValue = 0; protected int mTierLimit = -1; protected long mLeftEnergy; private int mUpgrade = 1; final XSTR R = new XSTR(); - protected ArrayList<EssentiaHatch> mEssentiaHatch = new ArrayList<>(); + protected ArrayList<MTEEssentiaHatch> mEssentiaHatch = new ArrayList<>(); - public LargeEssentiaGenerator(String name) { + public MTELargeEssentiaGenerator(String name) { super(name); } - public LargeEssentiaGenerator(int id, String name, String nameRegional) { + public MTELargeEssentiaGenerator(int id, String name, String nameRegional) { super(id, name, nameRegional); } @@ -91,8 +90,8 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } private boolean checkNoLaser() { - for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : eDynamoMulti) { - if (tHatch instanceof GT_MetaTileEntity_Hatch_DynamoTunnel) { + for (MTEHatchDynamoMulti tHatch : eDynamoMulti) { + if (tHatch instanceof MTEHatchDynamoTunnel) { return false; } } @@ -100,13 +99,13 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } public boolean checkHatchTier() { - for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) { + for (MTEHatchInput tHatch : mInputHatches) { if (tHatch.mTier > mTierLimit) return false; } - for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { + for (MTEHatchDynamo tHatch : mDynamoHatches) { if (tHatch.mTier > mTierLimit) return false; } - for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : eDynamoMulti) { + for (MTEHatchDynamoMulti tHatch : eDynamoMulti) { if (tHatch.mTier > mTierLimit) return false; } return true; @@ -129,7 +128,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } public boolean updateEssentiaHatchState() { - for (EssentiaHatch hatch : mEssentiaHatch) { + for (MTEEssentiaHatch hatch : mEssentiaHatch) { hatch.mState = mUpgrade; } return true; @@ -148,7 +147,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB if ((mUpgrade & (1 << tMeta)) == 0 && tMeta != 0) { tCurrentItem.stackSize--; mUpgrade = mUpgrade | (1 << tMeta); - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, tCurrentItem.getDisplayName() + StatCollector.translateToLocal("largeessentiagenerator.chat")); } @@ -161,9 +160,9 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } @Override - public IStructureDefinition<LargeEssentiaGenerator> getStructure_EM() { + public IStructureDefinition<MTELargeEssentiaGenerator> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<LargeEssentiaGenerator>builder() + multiDefinition = StructureDefinition.<MTELargeEssentiaGenerator>builder() .addShape( mName, transpose( @@ -193,18 +192,19 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB .addElement( 'X', ofChain( - buildHatchAdder(LargeEssentiaGenerator.class) + buildHatchAdder(MTELargeEssentiaGenerator.class) .atLeast( - HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), - GT_HatchElement.Maintenance, - GT_HatchElement.InputHatch) + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.DynamoMulti + .or(gregtech.api.enums.HatchElement.Dynamo), + gregtech.api.enums.HatchElement.Maintenance, + gregtech.api.enums.HatchElement.InputHatch) .casingIndex(1536) .dot(1) .build(), ofBlock(Loaders.magicCasing, 0), ofSpecificTileAdder( - LargeEssentiaGenerator::addEssentiaHatch, - EssentiaHatch.class, + MTELargeEssentiaGenerator::addEssentiaHatch, + MTEEssentiaHatch.class, Loaders.magicCasing, 0))) .build(); @@ -212,7 +212,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB return multiDefinition; } - public final boolean addEssentiaHatch(EssentiaHatch aTileEntity) { + public final boolean addEssentiaHatch(MTEEssentiaHatch aTileEntity) { return this.mEssentiaHatch.add(aTileEntity); } @@ -226,10 +226,10 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public int getVoltageLimit() { long voltage = 0; - for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { + for (MTEHatch tHatch : this.eDynamoMulti) { voltage += tHatch.maxEUOutput(); } - for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { + for (MTEHatch tHatch : this.mDynamoHatches) { voltage += tHatch.maxEUOutput(); } if (voltage > Integer.MAX_VALUE) voltage = Integer.MAX_VALUE; @@ -238,10 +238,10 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public int getAmpLimit() { long amp = 0; - for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { + for (MTEHatch tHatch : this.eDynamoMulti) { amp += tHatch.maxAmperesOut(); } - for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { + for (MTEHatch tHatch : this.mDynamoHatches) { amp += tHatch.maxAmperesOut(); } if (amp > Integer.MAX_VALUE) amp = Integer.MAX_VALUE; @@ -402,7 +402,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB ceoOutput = 3.0D; } else if (depleteInput(Materials.Naquadah.getMolten(ceoInput))) { ceoOutput = 4.0D; - } else if (depleteInput(MyMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { + } else if (depleteInput(GGMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { ceoOutput = 16.0D; } return (long) (baseValue * ceoOutput); @@ -410,7 +410,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public long electricEssentia(Aspect aspect) { long baseValue = LargeEssentiaEnergyData.getAspectFuelValue(aspect); - double ceoOutput = Math.pow(3.0, GT_Utility.getTier(getVoltageLimit())); + double ceoOutput = Math.pow(3.0, GTUtility.getTier(getVoltageLimit())); return (long) (baseValue * ceoOutput); } @@ -418,7 +418,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB long EUt = mLeftEnergy; long EUVoltage = voltageLimit, EUAmp = 1; - for (EssentiaHatch hatch : this.mEssentiaHatch) { + for (MTEEssentiaHatch hatch : this.mEssentiaHatch) { AspectList aspects = hatch.getAspects(); for (Aspect aspect : aspects.aspects.keySet()) { if (!isValidEssentia(aspect)) continue; @@ -459,12 +459,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeEssentiaGenerator(this.mName); + return new MTELargeEssentiaGenerator(this.mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Essentia Generator") .addInfo("Controller block for the Large Essentia Generator") .addInfo("Maybe some Thaumaturges are upset by it. . .") @@ -489,12 +489,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536), - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder() .addIcon(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW) .glow() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536), - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) }; + new GTRenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536) }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java index 82838322ce..40f01fbde4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java @@ -3,7 +3,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Mods.ThaumicBases; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Map; @@ -19,38 +19,37 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.objects.XSTR; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.visnet.VisNetHandler; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; -public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTELargeEssentiaSmeltery extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon( @@ -80,16 +79,16 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa protected int nodePurificationEfficiency = 0; protected int nodeIncrease = 0; - private IStructureDefinition<LargeEssentiaSmeltery> multiDefinition = null; - private ArrayList<EssentiaOutputHatch> mEssentiaOutputHatches = new ArrayList<>(); + private IStructureDefinition<MTELargeEssentiaSmeltery> multiDefinition = null; + private ArrayList<MTEEssentiaOutputHatch> mEssentiaOutputHatches = new ArrayList<>(); private int pTier = 0; private XSTR xstr = new XSTR(); - public LargeEssentiaSmeltery(String name) { + public MTELargeEssentiaSmeltery(String name) { super(name); } - public LargeEssentiaSmeltery(int aID, String aName, String aNameRegional) { + public MTELargeEssentiaSmeltery(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @@ -140,9 +139,9 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa } @Override - public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { + public IStructureDefinition<? extends TTMultiblockBase> getStructure_EM() { if (this.multiDefinition == null) { - this.multiDefinition = StructureDefinition.<LargeEssentiaSmeltery>builder() + this.multiDefinition = StructureDefinition.<MTELargeEssentiaSmeltery>builder() .addShape( "first", transpose(new String[][] { { " A " }, { " AAA " }, { "AA~AA" }, { " AAA " }, { " A " } })) @@ -168,30 +167,30 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa .addElement( 'A', ofChain( - buildHatchAdder(LargeEssentiaSmeltery.class) + buildHatchAdder(MTELargeEssentiaSmeltery.class) .atLeast( - GT_HatchElement.Maintenance, - GT_HatchElement.Energy, - GT_HatchElement.InputBus, - GT_HatchElement.InputHatch) + gregtech.api.enums.HatchElement.Maintenance, + gregtech.api.enums.HatchElement.Energy, + gregtech.api.enums.HatchElement.InputBus, + gregtech.api.enums.HatchElement.InputHatch) .casingIndex(CASING_INDEX) .dot(1) .build(), ofSpecificTileAdder( - LargeEssentiaSmeltery::addEssentiaOutputHatchToMachineList, - EssentiaOutputHatch.class, + MTELargeEssentiaSmeltery::addEssentiaOutputHatchToMachineList, + MTEEssentiaOutputHatch.class, Loaders.essentiaOutputHatch, 0), - onElementPass(LargeEssentiaSmeltery::onCasingFound, ofBlock(Loaders.magicCasing, 0)))) - .addElement('B', GT_HatchElement.Muffler.newAny(CASING_INDEX, 2)) + onElementPass(MTELargeEssentiaSmeltery::onCasingFound, ofBlock(Loaders.magicCasing, 0)))) + .addElement('B', gregtech.api.enums.HatchElement.Muffler.newAny(CASING_INDEX, 2)) .build(); } return this.multiDefinition; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Essentia Smeltery") .addInfo("Controller block for the Large Essentia Smeltery") .addInfo("Necessary evil.") @@ -273,22 +272,22 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) { return false; - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - if (((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).mTier < 3) return false; - ((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { - ((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.eEnergyMulti.add(((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity)); + } else if (aMetaTileEntity instanceof MTEHatchEnergy) { + if (((MTEHatchEnergy) aMetaTileEntity).mTier < 3) return false; + ((MTEHatchEnergy) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchEnergyMulti) { + ((MTEHatchEnergyMulti) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.eEnergyMulti.add(((MTEHatchEnergyMulti) aMetaTileEntity)); } else { return false; } } } - private boolean addEssentiaOutputHatchToMachineList(EssentiaOutputHatch aTileEntity) { - if (aTileEntity instanceof EssentiaOutputHatch) { - return this.mEssentiaOutputHatches.add((EssentiaOutputHatch) aTileEntity); + private boolean addEssentiaOutputHatchToMachineList(MTEEssentiaOutputHatch aTileEntity) { + if (aTileEntity instanceof MTEEssentiaOutputHatch) { + return this.mEssentiaOutputHatches.add((MTEEssentiaOutputHatch) aTileEntity); } return false; } @@ -397,7 +396,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa } private void fillEssentiaOutputHatch() { - for (EssentiaOutputHatch outputHatch : this.mEssentiaOutputHatches) { + for (MTEEssentiaOutputHatch outputHatch : this.mEssentiaOutputHatches) { for (Map.Entry<Aspect, Integer> entry : this.mOutputAspects.copy().aspects.entrySet()) { Aspect aspect = entry.getKey(); int amount = entry.getValue(); @@ -511,8 +510,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa if (xstr.nextInt(100) < Math.max(100 - this.nodePurificationEfficiency, 0)) { final World WORLD = this.getBaseMetaTileEntity() .getWorld(); - GT_MetaTileEntity_Hatch_Muffler mufflerHatch = this.mMufflerHatches - .get(xstr.nextInt(this.mMufflerHatches.size())); + MTEHatchMuffler mufflerHatch = this.mMufflerHatches.get(xstr.nextInt(this.mMufflerHatches.size())); int x = mufflerHatch.getBaseMetaTileEntity() .getXCoord(); int y = mufflerHatch.getBaseMetaTileEntity() @@ -571,7 +569,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new LargeEssentiaSmeltery(this.mName); + return new MTELargeEssentiaSmeltery(this.mName); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java index cad1cb001c..536ec4b39c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java @@ -8,21 +8,20 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class LargeFusionComputer1 extends LargeFusionComputer { +public class MTELargeFusionComputer1 extends MTELargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder() @@ -35,33 +34,33 @@ public class LargeFusionComputer1 extends LargeFusionComputer { .glow() .build()); - public LargeFusionComputer1(int id, String name, String nameRegional) { + public MTELargeFusionComputer1(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer1(String name) { + public MTELargeFusionComputer1(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-I Prototype.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -86,7 +85,7 @@ public class LargeFusionComputer1 extends LargeFusionComputer { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -105,7 +104,7 @@ public class LargeFusionComputer1 extends LargeFusionComputer { @Override public Block getCasingBlock() { - return GregTech_API.sBlockCasings1; + return GregTechAPI.sBlockCasings1; } @Override @@ -165,6 +164,6 @@ public class LargeFusionComputer1 extends LargeFusionComputer { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer1(mName); + return new MTELargeFusionComputer1(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java index 7a72e7842f..e8840d6446 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java @@ -8,21 +8,20 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class LargeFusionComputer2 extends LargeFusionComputer { +public class MTELargeFusionComputer2 extends MTELargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder() @@ -35,33 +34,33 @@ public class LargeFusionComputer2 extends LargeFusionComputer { .glow() .build()); - public LargeFusionComputer2(int id, String name, String nameRegional) { + public MTELargeFusionComputer2(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer2(String name) { + public MTELargeFusionComputer2(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-II.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -87,7 +86,7 @@ public class LargeFusionComputer2 extends LargeFusionComputer { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -106,7 +105,7 @@ public class LargeFusionComputer2 extends LargeFusionComputer { @Override public Block getCasingBlock() { - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; } @Override @@ -166,6 +165,6 @@ public class LargeFusionComputer2 extends LargeFusionComputer { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer2(mName); + return new MTELargeFusionComputer2(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java index 4a4f9832d0..94d98c3484 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java @@ -8,21 +8,20 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class LargeFusionComputer3 extends LargeFusionComputer { +public class MTELargeFusionComputer3 extends MTELargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder() @@ -35,33 +34,33 @@ public class LargeFusionComputer3 extends LargeFusionComputer { .glow() .build()); - public LargeFusionComputer3(int id, String name, String nameRegional) { + public MTELargeFusionComputer3(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer3(String name) { + public MTELargeFusionComputer3(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-III.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -88,7 +87,7 @@ public class LargeFusionComputer3 extends LargeFusionComputer { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -107,7 +106,7 @@ public class LargeFusionComputer3 extends LargeFusionComputer { @Override public Block getCasingBlock() { - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; } @Override @@ -167,6 +166,6 @@ public class LargeFusionComputer3 extends LargeFusionComputer { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer3(mName); + return new MTELargeFusionComputer3(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java index 96a9662475..c10747cad0 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java @@ -8,10 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputerPP; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputerPP; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import gregtech.api.enums.Materials; @@ -20,45 +18,46 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class LargeFusionComputer4 extends LargeFusionComputerPP { +public class MTELargeFusionComputer4 extends MTELargeFusionComputerPP { - public LargeFusionComputer4(int id, String name, String nameRegional) { + public MTELargeFusionComputer4(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer4(String name) { + public MTELargeFusionComputer4(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Galaxy Collapse.") .addInfo("Controller block for the Compact Fusion Reactor MK-IV Prototype.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -87,7 +86,7 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -179,22 +178,22 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public boolean turnCasingActive(boolean status) { if (this.mEnergyHatches != null) { - for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (MTEHatchEnergy hatch : this.mEnergyHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } if (this.eEnergyMulti != null) { - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) { + for (MTEHatchEnergyMulti hatch : this.eEnergyMulti) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } if (this.mOutputHatches != null) { - for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (MTEHatchOutput hatch : this.mOutputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } if (this.mInputHatches != null) { - for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + for (MTEHatchInput hatch : this.mInputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } @@ -222,6 +221,6 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer4(mName); + return new MTELargeFusionComputer4(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java index aa4766a01a..8ed9e27f13 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java @@ -8,10 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputerPP; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputerPP; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import gregtech.api.enums.Materials; @@ -20,45 +18,46 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class LargeFusionComputer5 extends LargeFusionComputerPP { +public class MTELargeFusionComputer5 extends MTELargeFusionComputerPP { - public LargeFusionComputer5(int id, String name, String nameRegional) { + public MTELargeFusionComputer5(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer5(String name) { + public MTELargeFusionComputer5(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Galaxy Collapse.") .addInfo("Controller block for the Compact Fusion Reactor MK-V.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -88,7 +87,7 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -183,22 +182,22 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public boolean turnCasingActive(boolean status) { if (this.mEnergyHatches != null) { - for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (MTEHatchEnergy hatch : this.mEnergyHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.eEnergyMulti != null) { - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) { + for (MTEHatchEnergyMulti hatch : this.eEnergyMulti) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.mOutputHatches != null) { - for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (MTEHatchOutput hatch : this.mOutputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.mInputHatches != null) { - for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + for (MTEHatchInput hatch : this.mInputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } @@ -226,6 +225,6 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer5(mName); + return new MTELargeFusionComputer5(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java index 19b04637fe..aac9386ecc 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java @@ -1,9 +1,9 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.main.GG_Config_Loader.*; +import static goodgenerator.main.GGConfigLoader.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -18,46 +18,44 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.util.Pair; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import bartworks.util.Pair; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; -import goodgenerator.items.MyMaterial; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; +import goodgenerator.items.GGMaterial; import goodgenerator.loader.Loaders; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti; -public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTEMultiNqGenerator extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - protected IStructureDefinition<MultiNqGenerator> multiDefinition = null; + protected IStructureDefinition<MTEMultiNqGenerator> multiDefinition = null; protected long leftEnergy = 0; protected long trueOutput = 0; protected int trueEff = 0; @@ -72,7 +70,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM static { excitedLiquid = Arrays.asList( new Pair<>(MaterialsUEVplus.Space.getMolten(20L), ExcitedLiquidCoe[0]), - new Pair<>(MyMaterial.atomicSeparationCatalyst.getMolten(20), ExcitedLiquidCoe[1]), + new Pair<>(GGMaterial.atomicSeparationCatalyst.getMolten(20), ExcitedLiquidCoe[1]), new Pair<>(Materials.Naquadah.getMolten(20L), ExcitedLiquidCoe[2]), new Pair<>(Materials.Uranium235.getMolten(180L), ExcitedLiquidCoe[3]), new Pair<>(Materials.Caesium.getMolten(180L), ExcitedLiquidCoe[4])); @@ -101,19 +99,19 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (aMetaTileEntity == null) { return false; } else { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + if (aMetaTileEntity instanceof MTEHatch) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + return this.mInputHatches.add((MTEHatchInput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchOutput) { + return this.mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchDynamo) { + return this.mDynamoHatches.add((MTEHatchDynamo) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchMaintenance) { + return this.mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchDynamoMulti) { + return this.eDynamoMulti.add((MTEHatchDynamoMulti) aMetaTileEntity); } else { return false; } @@ -122,9 +120,9 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public IStructureDefinition<MultiNqGenerator> getStructure_EM() { + public IStructureDefinition<MTEMultiNqGenerator> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<MultiNqGenerator>builder() + multiDefinition = StructureDefinition.<MTEMultiNqGenerator>builder() .addShape( mName, transpose( @@ -140,30 +138,31 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .addElement( 'X', ofChain( - buildHatchAdder(MultiNqGenerator.class) + buildHatchAdder(MTEMultiNqGenerator.class) .atLeast( - HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), - GT_HatchElement.InputHatch, - GT_HatchElement.OutputHatch, - GT_HatchElement.Maintenance) + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.DynamoMulti + .or(gregtech.api.enums.HatchElement.Dynamo), + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.OutputHatch, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(44) .dot(1) .build(), - ofBlock(GregTech_API.sBlockCasings3, 12))) - .addElement('A', ofBlock(GregTech_API.sBlockCasings3, 12)) + ofBlock(GregTechAPI.sBlockCasings3, 12))) + .addElement('A', ofBlock(GregTechAPI.sBlockCasings3, 12)) .addElement('N', ofBlock(Loaders.radiationProtectionSteelFrame, 0)) .addElement('C', ofBlock(Loaders.MAR_Casing, 0)) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) + .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 15)) .build(); } return multiDefinition; } - public MultiNqGenerator(String name) { + public MTEMultiNqGenerator(String name) { super(name); } - public MultiNqGenerator(int id, String name, String nameRegional) { + public MTEMultiNqGenerator(int id, String name, String nameRegional) { super(id, name, nameRegional); } @@ -215,7 +214,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM ArrayList<FluidStack> tFluids = getStoredFluids(); for (int i = 0; i < tFluids.size() - 1; i++) { for (int j = i + 1; j < tFluids.size(); j++) { - if (GT_Utility.areFluidsEqual(tFluids.get(i), tFluids.get(j))) { + if (GTUtility.areFluidsEqual(tFluids.get(i), tFluids.get(j))) { if ((tFluids.get(i)).amount >= (tFluids.get(j)).amount) { tFluids.remove(j--); } else { @@ -226,7 +225,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } } - GT_Recipe tRecipe = GoodGeneratorRecipeMaps.naquadahReactorFuels + GTRecipe tRecipe = GoodGeneratorRecipeMaps.naquadahReactorFuels .findRecipe(this.getBaseMetaTileEntity(), true, 1 << 30, tFluids.toArray(new FluidStack[0])); if (tRecipe != null) { Pair<FluidStack, Integer> excitedInfo = getExcited(tFluids.toArray(new FluidStack[0]), false); @@ -280,7 +279,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public String[] getInfoData() { String[] info = super.getInfoData(); info[4] = "Probably makes: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(Math.abs(this.trueOutput)) + + GTUtility.formatNumbers(Math.abs(this.trueOutput)) + EnumChatFormatting.RESET + " EU/t"; info[6] = "Problems: " + EnumChatFormatting.RED @@ -338,11 +337,11 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } public void addAutoEnergy(long outputPower) { - if (this.eDynamoMulti.size() > 0) for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { + if (this.eDynamoMulti.size() > 0) for (MTEHatch tHatch : this.eDynamoMulti) { long voltage = tHatch.maxEUOutput(); long power = voltage * tHatch.maxAmperesOut(); long outputAmperes; - if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); + if (outputPower > power) doExplosion(8 * GTUtility.getTier(power)); if (outputPower >= voltage) { leftEnergy += outputPower; outputAmperes = leftEnergy / voltage; @@ -352,11 +351,11 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM addEnergyOutput_EM(outputPower, 1); } } - if (this.mDynamoHatches.size() > 0) for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { + if (this.mDynamoHatches.size() > 0) for (MTEHatch tHatch : this.mDynamoHatches) { long voltage = tHatch.maxEUOutput(); long power = voltage * tHatch.maxAmperesOut(); long outputAmperes; - if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); + if (outputPower > power) doExplosion(8 * GTUtility.getTier(power)); if (outputPower >= voltage) { leftEnergy += outputPower; outputAmperes = leftEnergy / voltage; @@ -396,12 +395,12 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new MultiNqGenerator(this.mName); + return new MTEMultiNqGenerator(this.mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Naquadah Reactor") .addInfo("Controller block for the Naquadah Reactor") .addInfo("Environmentally Friendly!") @@ -449,13 +448,12 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44), - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), - TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), TextureFactory.builder() .addIcon(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW) .glow() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44), - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44) }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java index f3a4fd7d3c..97efc45ba7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java @@ -2,8 +2,8 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofFrame; import java.util.ArrayList; import java.util.Arrays; @@ -31,14 +31,13 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTENeutronAccelerator; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTENeutronSensor; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IHatchElement; @@ -47,28 +46,27 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.multitileentity.multiblock.casing.Glasses; import gregtech.api.objects.XSTR; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.IGT_HatchAdder; - -public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { - - protected static IStructureDefinition<NeutronActivator> multiDefinition = null; - protected final ArrayList<NeutronAccelerator> mNeutronAccelerator = new ArrayList<>(); - protected final ArrayList<NeutronSensor> mNeutronSensor = new ArrayList<>(); +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.IGTHatchAdder; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; + +public class MTENeutronActivator extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { + + protected static IStructureDefinition<MTENeutronActivator> multiDefinition = null; + protected final ArrayList<MTENeutronAccelerator> mNeutronAccelerator = new ArrayList<>(); + protected final ArrayList<MTENeutronSensor> mNeutronSensor = new ArrayList<>(); protected int casingAmount = 0; protected int height = 0; protected int eV = 0, mCeil = 0, mFloor = 0; - private GT_Recipe lastRecipe; + private GTRecipe lastRecipe; protected static final NumberFormatMUI numberFormat; static { numberFormat = new NumberFormatMUI(); @@ -89,11 +87,11 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM protected final String NA_MID = mName + "mid"; protected final String NA_TOP = mName + "top"; - public NeutronActivator(String name) { + public MTENeutronActivator(String name) { super(name); } - public NeutronActivator(int id, String name, String nameRegional) { + public MTENeutronActivator(int id, String name, String nameRegional) { super(id, name, nameRegional); } @@ -103,8 +101,8 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setDuration((int) Math.ceil(recipe.mDuration * Math.pow(0.9f, height - 4))) .setDurationUnderOneTickSupplier(() -> recipe.mDuration * Math.pow(0.9f, height - 4)); } @@ -141,9 +139,9 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM float aX, float aY, float aZ) { batchMode = !batchMode; if (batchMode) { - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); } else { - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); } return true; } @@ -181,8 +179,8 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return GoodGeneratorRecipeMaps.neutronActivatorRecipes; } - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Neutron Activator") .addInfo("Controller block for the Neutron Activator") .addInfo("Superluminal-velocity Motion.") @@ -220,39 +218,42 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public IStructureDefinition<NeutronActivator> getStructure_EM() { + public IStructureDefinition<MTENeutronActivator> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<NeutronActivator>builder() + multiDefinition = StructureDefinition.<MTENeutronActivator>builder() .addShape(NA_TOP, transpose(new String[][] { { "CCCCC", "CDDDC", "CDDDC", "CDDDC", "CCCCC" } })) .addShape(NA_MID, transpose(new String[][] { { "F F", " GGG ", " GPG ", " GGG ", "F F" } })) .addShape(NA_BOTTOM, transpose(new String[][] { { "XX~XX", "XDDDX", "XDDDX", "XDDDX", "XXXXX" } })) .addElement( 'C', ofChain( - buildHatchAdder(NeutronActivator.class) - .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.InputBus, GT_HatchElement.Maintenance) + buildHatchAdder(MTENeutronActivator.class) + .atLeast( + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.InputBus, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(49) .dot(1) .build(), - onElementPass(NeutronActivator::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 6)) + onElementPass(MTENeutronActivator::onCasingFound, ofBlock(GregTechAPI.sBlockCasings4, 1)))) + .addElement('D', ofBlock(GregTechAPI.sBlockCasings2, 6)) .addElement('F', ofFrame(Materials.Steel)) .addElement('G', Glasses.chainAllGlasses()) .addElement('P', ofBlock(Loaders.speedingPipe, 0)) .addElement( 'X', ofChain( - buildHatchAdder(NeutronActivator.class) + buildHatchAdder(MTENeutronActivator.class) .atLeast( - GT_HatchElement.OutputHatch, - GT_HatchElement.OutputBus, - GT_HatchElement.Maintenance, + gregtech.api.enums.HatchElement.OutputHatch, + gregtech.api.enums.HatchElement.OutputBus, + gregtech.api.enums.HatchElement.Maintenance, NeutronHatchElement.NeutronAccelerator, NeutronHatchElement.NeutronSensor) .casingIndex(49) .dot(2) .build(), - onElementPass(NeutronActivator::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)))) + onElementPass(MTENeutronActivator::onCasingFound, ofBlock(GregTechAPI.sBlockCasings4, 1)))) .build(); } return multiDefinition; @@ -282,12 +283,12 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof NeutronAccelerator) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mNeutronAccelerator.add((NeutronAccelerator) aMetaTileEntity); - } else if (aMetaTileEntity instanceof NeutronSensor) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mNeutronSensor.add((NeutronSensor) aMetaTileEntity); + if (aMetaTileEntity instanceof MTENeutronAccelerator) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mNeutronAccelerator.add((MTENeutronAccelerator) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTENeutronSensor) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mNeutronSensor.add((MTENeutronSensor) aMetaTileEntity); } } return false; @@ -323,7 +324,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new NeutronActivator(this.mName); + return new MTENeutronActivator(this.mName); } @Override @@ -335,7 +336,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM tryUseModerator(); } - for (NeutronAccelerator tHatch : mNeutronAccelerator) { + for (MTENeutronAccelerator tHatch : mNeutronAccelerator) { if (tHatch.getBaseMetaTileEntity() .isActive() && this.getRepairStatus() == this.getIdealStatus()) { anyWorking = true; @@ -355,7 +356,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (this.eV < 0) this.eV = 0; if (this.eV > maxNeutronKineticEnergy()) doExplosion(4 * 32); - for (NeutronSensor tHatch : mNeutronSensor) { + for (MTENeutronSensor tHatch : mNeutronSensor) { tHatch.updateRedstoneOutput(this.eV); } @@ -371,7 +372,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM for (ItemStack input : getStoredInputs()) { if (input.isItemEqual(Materials.Graphite.getDust(1)) || input.isItemEqual(Materials.Beryllium.getDust(1))) { int consume = Math.min(this.eV / 10000000, input.stackSize); - depleteInput(GT_Utility.copyAmount(consume, input)); + depleteInput(GTUtility.copyAmount(consume, input)); this.eV -= 10000000 * consume; } } @@ -398,7 +399,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public String[] getInfoData() { int currentNKEInput = 0; boolean anyWorking = false; - for (NeutronAccelerator tHatch : mNeutronAccelerator) { + for (MTENeutronAccelerator tHatch : mNeutronAccelerator) { if (tHatch.getBaseMetaTileEntity() .isActive()) { currentNKEInput += (R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) * 10 @@ -416,12 +417,12 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM + EnumChatFormatting.RESET + " s", "Current Neutron Kinetic Energy Input: " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(currentNKEInput) + + GTUtility.formatNumbers(currentNKEInput) + EnumChatFormatting.RESET + "eV", StatCollector.translateToLocal("scanner.info.NA") + " " + EnumChatFormatting.LIGHT_PURPLE - + GT_Utility.formatNumbers(getCurrentNeutronKineticEnergy()) + + GTUtility.formatNumbers(getCurrentNeutronKineticEnergy()) + EnumChatFormatting.RESET + "eV" }; } @@ -477,28 +478,28 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .widget(new FakeSyncWidget.IntegerSyncer(() -> eV, val -> eV = val)); } - private enum NeutronHatchElement implements IHatchElement<NeutronActivator> { + private enum NeutronHatchElement implements IHatchElement<MTENeutronActivator> { - NeutronSensor(NeutronActivator::addAcceleratorAndSensor, NeutronSensor.class) { + NeutronSensor(MTENeutronActivator::addAcceleratorAndSensor, MTENeutronSensor.class) { @Override - public long count(NeutronActivator t) { + public long count(MTENeutronActivator t) { return t.mNeutronSensor.size(); } }, - NeutronAccelerator(NeutronActivator::addAcceleratorAndSensor, NeutronAccelerator.class) { + NeutronAccelerator(MTENeutronActivator::addAcceleratorAndSensor, MTENeutronAccelerator.class) { @Override - public long count(NeutronActivator t) { + public long count(MTENeutronActivator t) { return t.mNeutronAccelerator.size(); } }; private final List<Class<? extends IMetaTileEntity>> mteClasses; - private final IGT_HatchAdder<NeutronActivator> adder; + private final IGTHatchAdder<MTENeutronActivator> adder; @SafeVarargs - NeutronHatchElement(IGT_HatchAdder<NeutronActivator> adder, Class<? extends IMetaTileEntity>... mteClasses) { + NeutronHatchElement(IGTHatchAdder<MTENeutronActivator> adder, Class<? extends IMetaTileEntity>... mteClasses) { this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses)); this.adder = adder; } @@ -508,7 +509,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return mteClasses; } - public IGT_HatchAdder<? super NeutronActivator> adder() { + public IGTHatchAdder<? super MTENeutronActivator> adder() { return adder; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java index 3d8c0df58c..840688dff7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java @@ -1,12 +1,12 @@ package goodgenerator.blocks.tileEntity; -import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTieredMixed; +import static bartworks.util.BWUtil.ofGlassTieredMixed; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.HatchElement.*; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.ofFrame; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.Arrays; import java.util.Collection; @@ -29,7 +29,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.tuple.Pair; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.google.common.collect.ImmutableList; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -42,14 +41,14 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.client.GUI.GG_UITextures; +import goodgenerator.client.GUI.GGUITextures; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -57,30 +56,31 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.GregTechTileClientEvents; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_HatchElementBuilder; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.HatchElementBuilder; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gregtech.common.tileentities.machines.IDualInputHatch; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<PreciseAssembler> +public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreciseAssembler> implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK"); @@ -90,7 +90,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( "iconsets/OVERLAY_QCHEST_GLOW"); - protected IStructureDefinition<PreciseAssembler> multiDefinition = null; + protected IStructureDefinition<MTEPreciseAssembler> multiDefinition = null; protected int casingAmount; protected int casingTier; protected int machineTier; @@ -98,18 +98,18 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB protected int energyHatchTier; private static final int CASING_INDEX = 1541; - public PreciseAssembler(String name) { + public MTEPreciseAssembler(String name) { super(name); } - public PreciseAssembler(int id, String name, String nameRegional) { + public MTEPreciseAssembler(int id, String name, String nameRegional) { super(id, name, nameRegional); } @Override - public IStructureDefinition<PreciseAssembler> getStructureDefinition() { + public IStructureDefinition<MTEPreciseAssembler> getStructureDefinition() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<PreciseAssembler>builder() + multiDefinition = StructureDefinition.<MTEPreciseAssembler>builder() .addShape( mName, transpose( @@ -122,7 +122,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB 'C', withChannel( "unit casing", - GT_HatchElementBuilder.<PreciseAssembler>builder() + HatchElementBuilder.<MTEPreciseAssembler>builder() .atLeast( InputBus, InputHatch, @@ -131,7 +131,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB Maintenance, Muffler, ExoticEnergy.or(Energy)) - .adder(PreciseAssembler::addToPAssList) + .adder(MTEPreciseAssembler::addToPAssList) .casingIndex(CASING_INDEX) .dot(1) .buildAndChain( @@ -147,8 +147,8 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB Pair.of(Loaders.preciseUnitCasing, 2), Pair.of(Loaders.preciseUnitCasing, 3)), -3, - PreciseAssembler::setCasingTier, - PreciseAssembler::getCasingTier))))) + MTEPreciseAssembler::setCasingTier, + MTEPreciseAssembler::getCasingTier))))) .addElement('F', ofFrame(Materials.TungstenSteel)) .addElement('G', withChannel("glass", ofGlassTieredMixed((byte) 4, (byte) 127, 2))) .addElement( @@ -156,14 +156,14 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB withChannel( "machine casing", StructureUtility.ofBlocksTiered( - (block, meta) -> block == GregTech_API.sBlockCasings1 ? meta : -2, + (block, meta) -> block == GregTechAPI.sBlockCasings1 ? meta : -2, IntStream.range(0, 10) .mapToObj( - meta -> org.apache.commons.lang3.tuple.Pair.of(GregTech_API.sBlockCasings1, meta)) + meta -> org.apache.commons.lang3.tuple.Pair.of(GregTechAPI.sBlockCasings1, meta)) .collect(Collectors.toList()), -1, - PreciseAssembler::setMachineTier, - PreciseAssembler::getMachineTier))) + MTEPreciseAssembler::setMachineTier, + MTEPreciseAssembler::getMachineTier))) .build(); } return multiDefinition; @@ -177,32 +177,32 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + return mInputHatches.add((MTEHatchInput) aMetaTileEntity); } if (aMetaTileEntity instanceof IDualInputHatch) { return mDualInputHatches.add((IDualInputHatch) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - return mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInputBus) { + return mInputBusses.add((MTEHatchInputBus) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchOutput) { + return mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - return mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchOutputBus) { + return mOutputBusses.add((MTEHatchOutputBus) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - return mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchEnergy) { + return mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - return mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMaintenance) { + return mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - return mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMuffler) { + return mMufflerHatches.add((MTEHatchMuffler) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { - return mExoticEnergyHatches.add((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchEnergyMulti) { + return mExoticEnergyHatches.add((MTEHatchEnergyMulti) aMetaTileEntity); } return false; } @@ -232,7 +232,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (getBaseMetaTileEntity().isServerSide()) { this.mode = (this.mode + 1) % 2; - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("preciseassembler.chat." + this.mode)); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("preciseassembler.chat." + this.mode)); } super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } @@ -243,7 +243,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB @Nonnull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (mode == 0) { if (recipe.mSpecialValue > (casingTier + 1)) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); @@ -257,7 +257,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB @Nonnull @Override - protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) { return super.createOverclockCalculator(recipe).setSpeedBoost(mode == 0 ? 1 : 0.5F); } }.setMaxParallelSupplier(() -> mode == 0 ? 1 : (int) Math.pow(2, 4 + (casingTier + 1))); @@ -278,8 +278,8 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB public long getMachineVoltageLimit() { if (machineTier < 0) return 0; - if (machineTier >= 9) return GT_Values.V[energyHatchTier]; - else return GT_Values.V[Math.min(machineTier, energyHatchTier)]; + if (machineTier >= 9) return GTValues.V[energyHatchTier]; + else return GTValues.V[Math.min(machineTier, energyHatchTier)]; } @Override @@ -326,8 +326,8 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Precise Assembler/Assembler") .addInfo("Controller block for the Precise Assembler") .addInfo("The error is no more than 7nm.") @@ -382,15 +382,15 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new PreciseAssembler(this.mName); + return new MTEPreciseAssembler(this.mName); } private int checkEnergyHatchTier() { int tier = 0; - for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) { tier = Math.max(tHatch.mTier, tier); } - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mExoticEnergyHatches)) { + for (MTEHatch tHatch : filterValidMTEs(mExoticEnergyHatches)) { tier = Math.max(tHatch.mTier, tier); } return tier; @@ -418,28 +418,28 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB hatch.updateTexture(texture); } } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mInputHatches)) { + for (MTEHatch hatch : filterValidMTEs(mInputHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mInputBusses)) { + for (MTEHatch hatch : filterValidMTEs(mInputBusses)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mOutputHatches)) { + for (MTEHatch hatch : filterValidMTEs(mOutputHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mOutputBusses)) { + for (MTEHatch hatch : filterValidMTEs(mOutputBusses)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatch hatch : filterValidMTEs(mEnergyHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mMaintenanceHatches)) { + for (MTEHatch hatch : filterValidMTEs(mMaintenanceHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatch hatch : filterValidMTEs(mMufflerHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mExoticEnergyHatches)) { + for (MTEHatch hatch : filterValidMTEs(mExoticEnergyHatches)) { hatch.updateTexture(texture); } } @@ -481,9 +481,9 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB builder.widget( new CycleButtonWidget().setToggle(() -> mode == 1, val -> mode = val ? 1 : 0) .setTextureGetter( - state -> state == 1 ? GG_UITextures.OVERLAY_BUTTON_ASSEMBLER_MODE - : GG_UITextures.OVERLAY_BUTTON_PRECISE_MODE) - .setBackground(GT_UITextures.BUTTON_STANDARD) + state -> state == 1 ? GGUITextures.OVERLAY_BUTTON_ASSEMBLER_MODE + : GGUITextures.OVERLAY_BUTTON_PRECISE_MODE) + .setBackground(GTUITextures.BUTTON_STANDARD) .setPos(80, 91) .setSize(16, 16) .dynamicTooltip( diff --git a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java index f04cf2eecb..a78046909a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java @@ -1,6 +1,6 @@ package goodgenerator.blocks.tileEntity; -import static gregtech.api.util.GT_Utility.trans; +import static gregtech.api.util.GTUtility.trans; import java.util.ArrayList; @@ -12,7 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; +import goodgenerator.blocks.tileEntity.base.MTELargeTurbineBase; import goodgenerator.loader.Loaders; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -21,11 +21,11 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBase { +public class MTESupercriticalFluidTurbine extends MTELargeTurbineBase { private boolean looseFit = false; @@ -33,11 +33,11 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas private static final IIconContainer turbineOff = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_15"); private static final IIconContainer turbineEmpty = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_25"); - public SupercriticalFluidTurbine(int aID, String aName, String aNameRegional) { + public MTESupercriticalFluidTurbine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public SupercriticalFluidTurbine(String aName) { + public MTESupercriticalFluidTurbine(String aName) { super(aName); } @@ -59,8 +59,8 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas int tEU = 0; int totalFlow = 0; // Byproducts are based on actual flow int flow = 0; - int remainingFlow = GT_Utility.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow. - // Variable required outside of loop for + int remainingFlow = GTUtility.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow. + // Variable required outside of loop for // multi-hatch scenarios. this.realOptFlow = aOptFlow; @@ -74,23 +74,23 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas this.storedFluid += aFluidStack.amount; remainingFlow -= flow; totalFlow += flow; - } else if (GT_ModHandler.isAnySteam(aFluidStack)) { + } else if (GTModHandler.isAnySteam(aFluidStack)) { depleteInput(new FluidStack(aFluidStack, aFluidStack.amount)); } } if (totalFlow <= 0) return 0; tEU = totalFlow; - addOutput(GT_ModHandler.getSteam(totalFlow * 100)); + addOutput(GTModHandler.getSteam(totalFlow * 100)); if (totalFlow == aOptFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); + tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L); } else { float efficiency = 1.0f - Math.abs((totalFlow - aOptFlow) / (float) aOptFlow); tEU *= efficiency; - tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L)); + tEU = Math.max(1, GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L)); } if (tEU > maxPower) { - tEU = GT_Utility.safeInt(maxPower); + tEU = GTUtility.safeInt(maxPower); } return tEU * 100; @@ -100,7 +100,7 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (side == getBaseMetaTileEntity().getFrontFacing()) { looseFit ^= true; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, looseFit ? trans("500", "Fitting: Loose - More Flow") : trans("501", "Fitting: Tight - More Efficiency")); @@ -147,8 +147,8 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Supercritical Steam Turbine") .addInfo("Controller block for Supercritical Fluid Turbine") .addInfo("Needs a Turbine, place inside controller") @@ -171,7 +171,7 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new SupercriticalFluidTurbine(mName); + return new MTESupercriticalFluidTurbine(mName); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java index 88f1edaacc..5d20427756 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java @@ -16,39 +16,38 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.TickTime; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.maps.FuelBackend; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti; -public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTEUniversalChemicalFuelEngine extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { protected final double DIESEL_EFFICIENCY_COEFFICIENT = 0.04D; @@ -61,14 +60,14 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB private int heatingTicks; private boolean isStoppingSafe; - private IStructureDefinition<UniversalChemicalFuelEngine> multiDefinition = null; + private IStructureDefinition<MTEUniversalChemicalFuelEngine> multiDefinition = null; - public UniversalChemicalFuelEngine(String name) { + public MTEUniversalChemicalFuelEngine(String name) { super(name); super.useLongPower = true; } - public UniversalChemicalFuelEngine(int id, String name, String nameRegional) { + public MTEUniversalChemicalFuelEngine(int id, String name, String nameRegional) { super(id, name, nameRegional); super.useLongPower = true; } @@ -78,9 +77,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMaintenance) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity); } } return false; @@ -91,9 +90,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMuffler) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMufflerHatches.add((MTEHatchMuffler) aMetaTileEntity); } } return false; @@ -104,9 +103,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((MTEHatchInput) aMetaTileEntity); } } return false; @@ -117,21 +116,21 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchDynamo) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mDynamoHatches.add((MTEHatchDynamo) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchDynamoMulti) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.eDynamoMulti.add((MTEHatchDynamoMulti) aMetaTileEntity); } } return false; } @Override - public IStructureDefinition<UniversalChemicalFuelEngine> getStructure_EM() { + public IStructureDefinition<MTEUniversalChemicalFuelEngine> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<UniversalChemicalFuelEngine>builder() + multiDefinition = StructureDefinition.<MTEUniversalChemicalFuelEngine>builder() .addShape( mName, transpose( @@ -140,15 +139,15 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB { "TTTTT", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "TTTTT" }, { "TT~TT", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "TTETT" }, { "TTWTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT" } })) - .addElement('T', ofBlock(GregTech_API.sBlockCasings4, 2)) - .addElement('W', GT_HatchElement.Maintenance.newAny(50, 1)) - .addElement('M', GT_HatchElement.Muffler.newAny(50, 2)) - .addElement('S', GT_HatchElement.InputHatch.newAny(50, 3)) - .addElement('E', GT_HatchElement.Dynamo.newAny(50, 4)) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 14)) + .addElement('T', ofBlock(GregTechAPI.sBlockCasings4, 2)) + .addElement('W', gregtech.api.enums.HatchElement.Maintenance.newAny(50, 1)) + .addElement('M', gregtech.api.enums.HatchElement.Muffler.newAny(50, 2)) + .addElement('S', gregtech.api.enums.HatchElement.InputHatch.newAny(50, 3)) + .addElement('E', gregtech.api.enums.HatchElement.Dynamo.newAny(50, 4)) + .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 14)) .addElement('C', ofBlock(Loaders.titaniumPlatedCylinder, 0)) - .addElement('G', ofBlock(GregTech_API.sBlockCasings2, 4)) - .addElement('I', ofBlock(GregTech_API.sBlockCasings4, 13)) + .addElement('G', ofBlock(GregTechAPI.sBlockCasings2, 4)) + .addElement('I', ofBlock(GregTechAPI.sBlockCasings4, 13)) .build(); } return multiDefinition; @@ -180,8 +179,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Chemical Engine") .addInfo("Controller block for the Chemical Engine") .addInfo("BURNING BURNING BURNING") @@ -237,7 +236,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB protected CheckRecipeResult processFuel(ArrayList<FluidStack> tFluids, RecipeMap<FuelBackend> recipeMap, long PromoterAmount, double efficiencyCoefficient, double FuelsValueBonus) { - for (GT_Recipe recipe : recipeMap.getAllRecipes()) { + for (GTRecipe recipe : recipeMap.getAllRecipes()) { FluidStack tFuel = findFuel(recipe); if (tFuel == null) continue; long FuelAmount = findLiquidAmount(tFuel, tFluids); @@ -282,15 +281,15 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB public String[] getInfoData() { String[] info = super.getInfoData(); info[4] = "Probably makes: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(this.getPowerFlow()) + + GTUtility.formatNumbers(this.getPowerFlow()) + EnumChatFormatting.RESET + " EU/t"; info[6] = "Problems: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(this.getIdealStatus() - this.getRepairStatus()) + + GTUtility.formatNumbers(this.getIdealStatus() - this.getRepairStatus()) + EnumChatFormatting.RESET + " Efficiency: " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(tEff / 100D) + + GTUtility.formatNumbers(tEff / 100D) + EnumChatFormatting.RESET + " %"; return info; @@ -299,7 +298,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB void addAutoEnergy() { long exEU = this.getPowerFlow() * tEff / 10000; if (!mDynamoHatches.isEmpty()) { - GT_MetaTileEntity_Hatch_Dynamo tHatch = mDynamoHatches.get(0); + MTEHatchDynamo tHatch = mDynamoHatches.get(0); if (tHatch.maxEUOutput() * tHatch.maxAmperesOut() >= exEU) { tHatch.setEUVar( Math.min( @@ -311,7 +310,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB } } if (!eDynamoMulti.isEmpty()) { - GT_MetaTileEntity_Hatch_DynamoMulti tHatch = eDynamoMulti.get(0); + MTEHatchDynamoMulti tHatch = eDynamoMulti.get(0); if (tHatch.maxEUOutput() * tHatch.maxAmperesOut() >= exEU) { tHatch.setEUVar( Math.min( @@ -328,9 +327,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return FluidRegistry.getFluidStack("combustionpromotor", 1); } - public FluidStack findFuel(GT_Recipe aFuel) { + public FluidStack findFuel(GTRecipe aFuel) { if (aFuel.mInputs != null && aFuel.mInputs.length > 0) - return GT_Utility.getFluidForFilledItem(aFuel.mInputs[0], true); + return GTUtility.getFluidForFilledItem(aFuel.mInputs[0], true); else return aFuel.mFluidInputs[0]; } @@ -379,7 +378,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new UniversalChemicalFuelEngine(this.mName); + return new MTEUniversalChemicalFuelEngine(this.mName); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java index b2635d9c2b..1d8620ad4d 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java @@ -3,7 +3,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; -import static gregtech.api.util.GT_StructureUtility.*; +import static gregtech.api.util.GTStructureUtility.*; import static net.minecraft.util.StatCollector.translateToLocal; import java.math.BigInteger; @@ -24,13 +24,6 @@ import net.minecraftforge.fluids.FluidTankInfo; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.thing.gui.TecTechUITextures; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -46,28 +39,33 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.YOTTAHatch; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; -import goodgenerator.client.GUI.GG_UITextures; +import bartworks.API.BorosilicateGlass; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTEYOTTAHatch; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; +import goodgenerator.client.GUI.GGUITextures; import goodgenerator.loader.Loaders; import goodgenerator.util.CharExchanger; import goodgenerator.util.DescTextLocalization; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.TecTech; +import tectech.thing.gui.TecTechUITextures; +import tectech.thing.metaTileEntity.multi.base.INameFunction; +import tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import tectech.thing.metaTileEntity.multi.base.LedStatus; +import tectech.thing.metaTileEntity.multi.base.Parameters; -public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTEYottaFluidTank extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK"); private static final IIconContainer textureFontOn_Glow = new Textures.BlockIcons.CustomIcon( @@ -76,8 +74,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( "iconsets/OVERLAY_QCHEST_GLOW"); - protected IStructureDefinition<YottaFluidTank> multiDefinition = null; - protected final ArrayList<YOTTAHatch> mYottaHatch = new ArrayList<>(); + protected IStructureDefinition<MTEYottaFluidTank> multiDefinition = null; + protected final ArrayList<MTEYOTTAHatch> mYottaHatch = new ArrayList<>(); private static final BigInteger ONE_HUNDRED = BigInteger.valueOf(100); @@ -111,10 +109,10 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM protected Parameters.Group.ParameterIn tickRateSettings; /** Name of the tick rate setting */ - private static final INameFunction<YottaFluidTank> TICK_RATE_SETTING_NAME = (base, + private static final INameFunction<MTEYottaFluidTank> TICK_RATE_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.YottaFluidTank.cfgi.0"); /** Status of the tick rate setting */ - private static final IStatusFunction<YottaFluidTank> TICK_RATE_STATUS = (base, p) -> LedStatus + private static final IStatusFunction<MTEYottaFluidTank> TICK_RATE_STATUS = (base, p) -> LedStatus .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 100, 100); @Override @@ -123,11 +121,11 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .makeInParameter(1, 20, TICK_RATE_SETTING_NAME, TICK_RATE_STATUS); } - public YottaFluidTank(int id, String name, String nameRegional) { + public MTEYottaFluidTank(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public YottaFluidTank(String name) { + public MTEYottaFluidTank(String name) { super(name); } @@ -295,9 +293,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public IStructureDefinition<YottaFluidTank> getStructure_EM() { + public IStructureDefinition<MTEYottaFluidTank> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<YottaFluidTank>builder() + multiDefinition = StructureDefinition.<MTEYottaFluidTank>builder() .addShape( YOTTANK_BOTTOM, transpose( @@ -318,26 +316,26 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM (byte) 0, (byte) 1, Byte.MAX_VALUE, - YottaFluidTank::setMeta, + MTEYottaFluidTank::setMeta, te -> (byte) te.getMeta()))) .addElement('R', ofChain(cells(10))) .addElement('F', ofFrame(Materials.Steel)) .addElement( 'I', - buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.InputHatch) + buildHatchAdder(MTEYottaFluidTank.class).atLeast(gregtech.api.enums.HatchElement.InputHatch) .casingIndex(1537) .dot(1) .buildAndChain(Loaders.yottaFluidTankCasing, 0)) .addElement( 'M', - buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.Maintenance) + buildHatchAdder(MTEYottaFluidTank.class).atLeast(gregtech.api.enums.HatchElement.Maintenance) .casingIndex(1537) .dot(2) .buildAndChain(Loaders.yottaFluidTankCasing, 0)) .addElement( 'O', - buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.OutputHatch) - .adder(YottaFluidTank::addOutput) + buildHatchAdder(MTEYottaFluidTank.class).atLeast(gregtech.api.enums.HatchElement.OutputHatch) + .adder(MTEYottaFluidTank::addOutput) .casingIndex(1537) .dot(1) .buildAndChain(Loaders.yottaFluidTankCasing, 0)) @@ -346,8 +344,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return multiDefinition; } - public List<IStructureElement<YottaFluidTank>> cells(int num) { - List<IStructureElement<YottaFluidTank>> out = new ArrayList<>(); + public List<IStructureElement<MTEYottaFluidTank>> cells(int num) { + List<IStructureElement<MTEYottaFluidTank>> out = new ArrayList<>(); for (int i = 0; i < num; ++i) { int finalI = i; out.add(onElementPass(x -> { @@ -366,15 +364,15 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (aMetaTileEntity == null) { return false; } else { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } else if (aMetaTileEntity instanceof YOTTAHatch) { + if (aMetaTileEntity instanceof MTEHatchOutput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEYOTTAHatch) { // only one yothatch allowed if (!this.mYottaHatch.isEmpty()) return false; - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - ((YOTTAHatch) aMetaTileEntity).setTank(this); - return this.mYottaHatch.add((YOTTAHatch) aMetaTileEntity); + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + ((MTEYOTTAHatch) aMetaTileEntity).setTank(this); + return this.mYottaHatch.add((MTEYOTTAHatch) aMetaTileEntity); } } } @@ -417,8 +415,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fluid Tank") .addInfo("Controller block for the YOTTank.") .addInfo("The max output speed is decided by the amount of stored liquid and the output hatch's capacity.") @@ -514,7 +512,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM final int originalOutputAmount = outputAmount; - for (final GT_MetaTileEntity_Hatch outputHatch : mOutputHatches) { + for (final MTEHatch outputHatch : mOutputHatches) { final FluidStack fluidInHatch = outputHatch.mFluid; final int remainingHatchSpace; @@ -605,7 +603,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new YottaFluidTank(this.mName); + return new MTEYottaFluidTank(this.mName); } @Override @@ -715,7 +713,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .setBackground(() -> { List<UITexture> ret = new ArrayList<>(); ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - ret.add(isFluidLocked ? GG_UITextures.OVERLAY_BUTTON_LOCK_ON : GG_UITextures.OVERLAY_BUTTON_LOCK_OFF); + ret.add(isFluidLocked ? GGUITextures.OVERLAY_BUTTON_LOCK_ON : GGUITextures.OVERLAY_BUTTON_LOCK_OFF); return ret.toArray(new IDrawable[0]); }) .setPos(174, doesBindPlayerInventory() ? 116 : 140) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java index 5c31d55b16..b14395dc20 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java @@ -2,10 +2,10 @@ package goodgenerator.blocks.tileEntity.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.filterByMTETier; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.filterByMTETier; +import static gregtech.api.util.GTStructureUtility.ofFrame; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.List; @@ -24,7 +24,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -38,8 +37,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_HatchElement; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; @@ -48,12 +46,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_ChunkManager; -import gregtech.api.objects.GT_ItemStack; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTChunkManager; +import gregtech.api.objects.GTItemStack; import gregtech.api.objects.overclockdescriber.FusionOverclockDescriber; import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.recipe.RecipeMap; @@ -61,28 +59,29 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_HatchElementBuilder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_ParallelHelper; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.HatchElementBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.api.util.ParallelHelper; import gregtech.common.tileentities.machines.IDualInputHatch; -import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_Hatch_DroneDownLink; +import gregtech.common.tileentities.machines.multi.drone.MTEHatchDroneDownLink; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public abstract class MTELargeFusionComputer extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable, IOverclockDescriptionProvider { public static final String MAIN_NAME = "largeFusion"; public static final int M = 1_000_000; private boolean isLoadedChunk; - public GT_Recipe mLastRecipe; + public GTRecipe mLastRecipe; public int para; protected OverclockDescriber overclockDescriber; - private static final ClassValue<IStructureDefinition<LargeFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<LargeFusionComputer>>() { + private static final ClassValue<IStructureDefinition<MTELargeFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<MTELargeFusionComputer>>() { @Override - protected IStructureDefinition<LargeFusionComputer> computeValue(Class<?> type) { - return StructureDefinition.<LargeFusionComputer>builder() + protected IStructureDefinition<MTELargeFusionComputer> computeValue(Class<?> type) { + return StructureDefinition.<MTELargeFusionComputer>builder() .addShape(MAIN_NAME, transpose(new String[][] { L0, L1, L2, L3, L2, L1, L0 })) .addElement('H', lazy(x -> ofBlock(x.getCoilBlock(), x.getCoilMeta()))) .addElement('C', lazy(x -> ofBlock(x.getCasingBlock(), x.getCasingMeta()))) @@ -90,11 +89,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .addElement( 'I', lazy( - x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() + x -> HatchElementBuilder.<MTELargeFusionComputer>builder() .atLeast( - GT_HatchElement.InputHatch.or(GT_HatchElement.InputBus), - GT_HatchElement.OutputHatch) - .adder(LargeFusionComputer::addFluidIO) + gregtech.api.enums.HatchElement.InputHatch.or(gregtech.api.enums.HatchElement.InputBus), + gregtech.api.enums.HatchElement.OutputHatch) + .adder(MTELargeFusionComputer::addFluidIO) .casingIndex(x.textureIndex()) .dot(1) .hatchItemFilterAnd(x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) @@ -102,9 +101,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .addElement( 'E', lazy( - x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() - .anyOf(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) - .adder(LargeFusionComputer::addEnergyInjector) + x -> HatchElementBuilder.<MTELargeFusionComputer>builder() + .anyOf( + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.EnergyMulti + .or(gregtech.api.enums.HatchElement.Energy)) + .adder(MTELargeFusionComputer::addEnergyInjector) .casingIndex(x.textureIndex()) .hatchItemFilterAnd(x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) .dot(2) @@ -113,7 +114,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .addElement( 'D', lazy( - x -> buildHatchAdder(LargeFusionComputer.class).adder(LargeFusionComputer::addDroneHatch) + x -> buildHatchAdder(MTELargeFusionComputer.class).adder(MTELargeFusionComputer::addDroneHatch) .hatchId(9401) .casingIndex(x.textureIndex()) .dot(3) @@ -137,13 +138,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .build())); } - public LargeFusionComputer(String name) { + public MTELargeFusionComputer(String name) { super(name); useLongPower = true; this.overclockDescriber = createOverclockDescriber(); } - public LargeFusionComputer(int id, String name, String nameRegional) { + public MTELargeFusionComputer(int id, String name, String nameRegional) { super(id, name, nameRegional); useLongPower = true; this.overclockDescriber = createOverclockDescriber(); @@ -199,7 +200,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public abstract ITexture getTextureOverlay(); @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return side != getBaseMetaTileEntity().getFrontFacing(); } @@ -236,38 +237,38 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide() && !aBaseMetaTileEntity.isAllowedToWork()) { // if machine has stopped, stop chunkloading - GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); + GTChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); this.isLoadedChunk = false; } else if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && !this.isLoadedChunk) { // load a 3x3 area when machine is running - GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); + GTChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); int offX = aBaseMetaTileEntity.getFrontFacing().offsetX; int offZ = aBaseMetaTileEntity.getFrontFacing().offsetZ; - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() - 1 + offZ)); this.isLoadedChunk = true; @@ -298,8 +299,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti } long energyLimit = getSingleHatchPower(); - List<GT_MetaTileEntity_Hatch> hatches = getExoticAndNormalEnergyHatchList(); - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(hatches)) { + List<MTEHatch> hatches = getExoticAndNormalEnergyHatchList(); + for (MTEHatch hatch : filterValidMTEs(hatches)) { long consumableEnergy = Math.min(hatch.getEUVar(), energyLimit); long receivedEnergy = Math .min(consumableEnergy, maxEUStore() - aBaseMetaTileEntity.getStoredEU()); @@ -365,27 +366,27 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti * @return The power one hatch can deliver to the reactor */ protected long getSingleHatchPower() { - return GT_Values.V[tier()] * getMaxPara() * extraPara(100) / 32; + return GTValues.V[tier()] * getMaxPara() * extraPara(100) / 32; } public boolean turnCasingActive(boolean status) { if (this.mEnergyHatches != null) { - for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (MTEHatchEnergy hatch : this.mEnergyHatches) { hatch.updateTexture(status ? 52 : 53); } } if (this.eEnergyMulti != null) { - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) { + for (MTEHatchEnergyMulti hatch : this.eEnergyMulti) { hatch.updateTexture(status ? 52 : 53); } } if (this.mOutputHatches != null) { - for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (MTEHatchOutput hatch : this.mOutputHatches) { hatch.updateTexture(status ? 52 : 53); } } if (this.mInputHatches != null) { - for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + for (MTEHatchInput hatch : this.mInputHatches) { hatch.updateTexture(status ? 52 : 53); } } @@ -437,25 +438,25 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @NotNull @Override - protected GT_ParallelHelper createParallelHelper(@NotNull GT_Recipe recipe) { + protected ParallelHelper createParallelHelper(@NotNull GTRecipe recipe) { // When the fusion first loads and is still processing, it does the recipe check without consuming. return super.createParallelHelper(recipe).setConsumption(!mRunningOnLoad); } @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return overclockDescriber.createCalculator(super.createOverclockCalculator(recipe), recipe); } @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (!mRunningOnLoad) { if (recipe.mSpecialValue > maxEUStore()) { return CheckRecipeResultRegistry.insufficientStartupPower(recipe.mSpecialValue); } - if (recipe.mEUt > GT_Values.V[tier()]) { + if (recipe.mEUt > GTValues.V[tier()]) { return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt); } } @@ -482,13 +483,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @Override protected void setProcessingLogicPower(ProcessingLogic logic) { - logic.setAvailableVoltage(GT_Values.V[tier()]); - logic.setAvailableAmperage(getSingleHatchPower() * 32 / GT_Values.V[tier()]); + logic.setAvailableVoltage(GTValues.V[tier()]); + logic.setAvailableAmperage(getSingleHatchPower() * 32 / GTValues.V[tier()]); } @Override public void onRemoval() { - if (this.isLoadedChunk) GT_ChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity()); + if (this.isLoadedChunk) GTChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity()); super.onRemoval(); } @@ -503,11 +504,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti private boolean addEnergyInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy tHatch) { + if (aMetaTileEntity instanceof MTEHatchEnergy tHatch) { if (tHatch.getTierForStructure() < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mEnergyHatches.add(tHatch); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti tHatch) { + } else if (aMetaTileEntity instanceof MTEHatchEnergyMulti tHatch) { if (tHatch.getTierForStructure() < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); return eEnergyMulti.add(tHatch); @@ -518,16 +519,16 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti private boolean addFluidIO(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch hatch) { + if (aMetaTileEntity instanceof MTEHatch hatch) { hatch.updateTexture(aBaseCasingIndex); hatch.updateCraftingIcon(this.getMachineCraftingIcon()); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tInput) { + if (aMetaTileEntity instanceof MTEHatchInput tInput) { if (tInput.getTierForStructure() < hatchTier()) return false; tInput.mRecipeMap = getRecipeMap(); return mInputHatches.add(tInput); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tOutput) { + if (aMetaTileEntity instanceof MTEHatchOutput tOutput) { if (tOutput.getTierForStructure() < hatchTier()) return false; return mOutputHatches.add(tOutput); } @@ -542,13 +543,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (aBaseMetaTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DroneDownLink tHatch)) return false; + if (!(aMetaTileEntity instanceof MTEHatchDroneDownLink tHatch)) return false; tHatch.updateTexture(aBaseCasingIndex); return addToMachineList(aBaseMetaTileEntity, aBaseCasingIndex); } @Override - public IStructureDefinition<LargeFusionComputer> getStructure_EM() { + public IStructureDefinition<MTELargeFusionComputer> getStructure_EM() { return STRUCTURE_DEFINITION.get(getClass()); } @@ -589,25 +590,25 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti return new String[] { EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier, StatCollector.translateToLocal("scanner.info.UX.0") + ": " + EnumChatFormatting.LIGHT_PURPLE - + GT_Utility.formatNumbers(this.para) + + GTUtility.formatNumbers(this.para) + EnumChatFormatting.RESET, StatCollector.translateToLocal("GT5U.fusion.req") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(-lEUt) + + GTUtility.formatNumbers(-lEUt) + EnumChatFormatting.RESET + "EU/t", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(baseMetaTileEntity != null ? baseMetaTileEntity.getStoredEU() : 0) + + GTUtility.formatNumbers(baseMetaTileEntity != null ? baseMetaTileEntity.getStoredEU() : 0) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEUStore()) + + GTUtility.formatNumbers(maxEUStore()) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.fusion.plasma") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(plasmaOut) + + GTUtility.formatNumbers(plasmaOut) + EnumChatFormatting.RESET + "L/t" }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputerPP.java index 7d87e6fdd1..7089616911 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputerPP.java @@ -2,30 +2,29 @@ package goodgenerator.blocks.tileEntity.base; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; - import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.util.AdvancedFusionOverclockDescriber; +import tectech.thing.metaTileEntity.multi.base.INameFunction; +import tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import tectech.thing.metaTileEntity.multi.base.LedStatus; +import tectech.thing.metaTileEntity.multi.base.Parameters; -public abstract class LargeFusionComputerPP extends LargeFusionComputer { +public abstract class MTELargeFusionComputerPP extends MTELargeFusionComputer { protected Parameters.Group.ParameterIn batchSetting; /** Name of the batch setting */ - private static final INameFunction<LargeFusionComputerPP> BATCH_SETTING_NAME = (base, + private static final INameFunction<MTELargeFusionComputerPP> BATCH_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.LargeFusionComputerPP.cfgi.0"); // Batch size /** Status of the batch setting */ - private static final IStatusFunction<LargeFusionComputerPP> BATCH_STATUS = (base, p) -> LedStatus + private static final IStatusFunction<MTELargeFusionComputerPP> BATCH_STATUS = (base, p) -> LedStatus .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 32, 128); - public LargeFusionComputerPP(String name) { + public MTELargeFusionComputerPP(String name) { super(name); } - public LargeFusionComputerPP(int id, String name, String nameRegional) { + public MTELargeFusionComputerPP(int id, String name, String nameRegional) { super(id, name, nameRegional); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java index 3df71aa25a..1c298d2b9a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java @@ -5,9 +5,9 @@ package goodgenerator.blocks.tileEntity.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; -import static gregtech.api.util.GT_StructureUtility.*; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.*; +import static gregtech.api.util.GTStructureUtility.*; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; @@ -28,24 +28,24 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.api.util.GTUtility; +import gregtech.common.items.MetaGeneratedTool01; -public abstract class GT_MetaTileEntity_LargeTurbineBase extends - GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbineBase> implements ISurvivalConstructable { +public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTELargeTurbineBase> + implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>>() { + private static final ClassValue<IStructureDefinition<MTELargeTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<MTELargeTurbineBase>>() { @Override - protected IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase> computeValue(Class<?> type) { - return StructureDefinition.<GT_MetaTileEntity_LargeTurbineBase>builder() + protected IStructureDefinition<MTELargeTurbineBase> computeValue(Class<?> type) { + return StructureDefinition.<MTELargeTurbineBase>builder() .addShape( STRUCTURE_PIECE_MAIN, transpose( @@ -59,18 +59,16 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends .addElement( 'h', lazy( - t -> buildHatchAdder(GT_MetaTileEntity_LargeTurbineBase.class) + t -> buildHatchAdder(MTELargeTurbineBase.class) .atLeast(Maintenance, InputHatch, OutputHatch, OutputBus, InputBus, Muffler) .casingIndex(t.getCasingTextureIndex()) .dot(2) .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) - .addElement( - 'x', - (IStructureElementCheckOnly<GT_MetaTileEntity_LargeTurbineBase>) (aContext, aWorld, aX, aY, aZ) -> { - TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); - return !(tTile instanceof IGregTechTileEntity) || !(((IGregTechTileEntity) tTile) - .getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase); - }) + .addElement('x', (IStructureElementCheckOnly<MTELargeTurbineBase>) (aContext, aWorld, aX, aY, aZ) -> { + TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); + return !(tTile instanceof IGregTechTileEntity) + || !(((IGregTechTileEntity) tTile).getMetaTileEntity() instanceof MTELargeTurbineBase); + }) .build(); } }; @@ -83,11 +81,11 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends protected boolean looseFit = false; protected long maxPower = 0; - public GT_MetaTileEntity_LargeTurbineBase(int aID, String aName, String aNameRegional) { + public MTELargeTurbineBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MetaTileEntity_LargeTurbineBase(String aName) { + public MTELargeTurbineBase(String aName) { super(aName); } @@ -97,7 +95,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends } @Override - public IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase> getStructureDefinition() { + public IStructureDefinition<MTELargeTurbineBase> getStructureDefinition() { return STRUCTURE_DEFINITION.get(getClass()); } @@ -139,10 +137,9 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends @Override public @NotNull CheckRecipeResult checkProcessing() { ItemStack controllerSlot = getControllerSlot(); - if ((counter & 7) == 0 - && (controllerSlot == null || !(controllerSlot.getItem() instanceof GT_MetaGenerated_Tool) - || controllerSlot.getItemDamage() < 170 - || controllerSlot.getItemDamage() > 179)) { + if ((counter & 7) == 0 && (controllerSlot == null || !(controllerSlot.getItem() instanceof MetaGeneratedTool) + || controllerSlot.getItemDamage() < 170 + || controllerSlot.getItemDamage() > 179)) { stopMachine(); return CheckRecipeResultRegistry.NO_TURBINE_FOUND; } @@ -155,15 +152,14 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends || this.getBaseMetaTileEntity() .hasInventoryBeenModified()) { counter = 0; - baseEff = GT_Utility.safeInt( - (long) ((5F - + ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot)) + baseEff = GTUtility.safeInt( + (long) ((5F + ((MetaGeneratedTool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot)) * 1000F)); - optFlow = GT_Utility.safeInt( + optFlow = GTUtility.safeInt( (long) Math.max( Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolStats(controllerSlot) - .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mToolSpeed + ((MetaGeneratedTool) controllerSlot.getItem()).getToolStats(controllerSlot) + .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mToolSpeed * 50)); if (optFlow <= 0 || baseEff <= 0) { stopMachine(); // in case the turbine got removed @@ -181,7 +177,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the difference in // power level (per tick) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100)); + int maxChangeAllowed = Math.max(10, GTUtility.safeInt((long) Math.abs(difference) / 100)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed change int change = maxChangeAllowed * (difference > 0 ? 1 : -1); // Make the change positive or negative. @@ -210,10 +206,10 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends @Override public int getMaxEfficiency(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) { + if (GTUtility.isStackInvalid(aStack)) { return 0; } - if (aStack.getItem() instanceof GT_MetaGenerated_Tool_01) { + if (aStack.getItem() instanceof MetaGeneratedTool01) { return 10000; } return 0; @@ -226,7 +222,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends public long getMaximumOutput() { long aTotal = 0; - for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) { long aVoltage = aDynamo.maxEUOutput(); aTotal = aDynamo.maxAmperesOut() * aVoltage; break; @@ -237,7 +233,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends @Override public String[] getInfoData() { int mPollutionReduction = 0; - for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) { mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction); } @@ -253,15 +249,15 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends + EnumChatFormatting.RESET; int tDura = 0; - if (mInventory[1] != null && mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) { - tDura = GT_Utility.safeInt( - (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1]) - * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1])) + 1)); + if (mInventory[1] != null && mInventory[1].getItem() instanceof MetaGeneratedTool01) { + tDura = GTUtility.safeInt( + (long) (100.0f / MetaGeneratedTool.getToolMaxDamage(mInventory[1]) + * (MetaGeneratedTool.getToolDamage(mInventory[1])) + 1)); } long storedEnergy = 0; long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() @@ -271,7 +267,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(mEUt) + + GTUtility.formatNumbers(mEUt) + EnumChatFormatting.RESET + " EU/t", /* 1 */ tMaintainance, /* 2 */ @@ -282,16 +278,16 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends + "%", /* 2 */ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) + + GTUtility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " + /* 3 */ EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) + + GTUtility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(GT_Utility.safeInt((long) realOptFlow)) + + GTUtility.formatNumbers(GTUtility.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/t" + /* 4 */ EnumChatFormatting.YELLOW @@ -301,7 +297,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends + ")", /* 5 */ StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + EnumChatFormatting.GOLD - + GT_Utility.formatNumbers(storedFluid) + + GTUtility.formatNumbers(storedFluid) + EnumChatFormatting.RESET + "L", /* 6 */ StatCollector.translateToLocal( @@ -317,7 +313,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends .contains("Steam")) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.safeInt((long) realOptFlow) + + GTUtility.safeInt((long) realOptFlow) + EnumChatFormatting.RESET + " L/t"; return ret; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTETooltipMultiBlockBaseEM.java index 010dc1db88..90d0cc5395 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTETooltipMultiBlockBaseEM.java @@ -7,27 +7,25 @@ import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; - import gregtech.api.interfaces.ISecondaryDescribable; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; -public abstract class GT_MetaTileEntity_TooltipMultiBlockBase_EM extends GT_MetaTileEntity_MultiblockBase_EM - implements ISecondaryDescribable { +public abstract class MTETooltipMultiBlockBaseEM extends TTMultiblockBase implements ISecondaryDescribable { - private static final Map<Integer, GT_Multiblock_Tooltip_Builder> tooltips = new ConcurrentHashMap<>(); + private static final Map<Integer, MultiblockTooltipBuilder> tooltips = new ConcurrentHashMap<>(); - protected GT_MetaTileEntity_TooltipMultiBlockBase_EM(int aID, String aName, String aNameRegional) { + protected MTETooltipMultiBlockBaseEM(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - protected GT_MetaTileEntity_TooltipMultiBlockBase_EM(String aName) { + protected MTETooltipMultiBlockBaseEM(String aName) { super(aName); } - protected GT_Multiblock_Tooltip_Builder getTooltip() { + protected MultiblockTooltipBuilder getTooltip() { int tId = getBaseMetaTileEntity().getMetaTileID(); - GT_Multiblock_Tooltip_Builder tooltip = tooltips.get(tId); + MultiblockTooltipBuilder tooltip = tooltips.get(tId); if (tooltip == null) { tooltip = createTooltip(); tooltips.put(tId, tooltip); @@ -35,7 +33,7 @@ public abstract class GT_MetaTileEntity_TooltipMultiBlockBase_EM extends GT_Meta return tooltip; } - protected abstract GT_Multiblock_Tooltip_Builder createTooltip(); + protected abstract MultiblockTooltipBuilder createTooltip(); @Override public String[] getDescription() { |
