diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/goodgenerator/blocks/tileEntity | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/goodgenerator/blocks/tileEntity')
| -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 |
28 files changed, 842 insertions, 855 deletions
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(ForgeDirecti |
