diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/boilers')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java (renamed from src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java) | 89 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/MTEBoilerBronze.java (renamed from src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java) | 37 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/MTEBoilerLava.java (renamed from src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java) | 60 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java (renamed from src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java) | 34 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java (renamed from src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java) | 12 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSteel.java (renamed from src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java) | 16 |
6 files changed, 121 insertions, 127 deletions
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java index 6964b13165..b49da44e97 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java @@ -21,30 +21,29 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.ProgressBar; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.ParticleFX; import gregtech.api.enums.SoundResource; import gregtech.api.enums.SteamVariant; -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.gui.modularui.GUITextureSet; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.modularui.IGetTitleColor; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.objects.GTItemStack; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; -import gregtech.common.GT_Pollution; +import gregtech.common.Pollution; -public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTank - implements IGetTitleColor, IAddUIWidgets { +public abstract class MTEBoiler extends MTEBasicTank implements IGetTitleColor, IAddUIWidgets { public static final byte SOUND_EVENT_LET_OFF_EXCESS_STEAM = 1; public int mTemperature = 20; @@ -54,21 +53,19 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa public boolean mHadNoWater = false; private int mExcessWater = 0; - public GT_MetaTileEntity_Boiler(int aID, String aName, String aNameRegional, String aDescription, - ITexture... aTextures) { + public MTEBoiler(int aID, String aName, String aNameRegional, String aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures); } - public GT_MetaTileEntity_Boiler(int aID, String aName, String aNameRegional, String[] aDescription, - ITexture... aTextures) { + public MTEBoiler(int aID, String aName, String aNameRegional, String[] aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures); } - public GT_MetaTileEntity_Boiler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEBoiler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } - public GT_MetaTileEntity_Boiler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoiler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @@ -124,7 +121,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa return true; } if (aPlayer != null) { - if (GT_Utility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) { + if (GTUtility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) { fill(Materials.Water.getFluid(1000L * (long) aPlayer.getCurrentEquippedItem().stackSize), true); if (!aPlayer.capabilities.isCreativeMode) { @@ -132,7 +129,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa .func_150996_a(Items.bucket); } } else { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); } } return true; @@ -170,7 +167,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa @Override public boolean isFluidInputAllowed(FluidStack aFluid) { - return GT_ModHandler.isWater(aFluid); + return GTModHandler.isWater(aFluid); } @Override @@ -190,8 +187,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) { - return GregTech_API.getCoverBehaviorNew(aCover.toStack()) + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) { + return GregTechAPI.getCoverBehaviorNew(aCover.toStack()) .isSimpleCover(); } @@ -226,14 +223,14 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa protected void produceSteam(int aAmount) { mExcessWater -= aAmount; if (mExcessWater < 0) { - int tWaterToConsume = -mExcessWater / GT_Values.STEAM_PER_WATER; + int tWaterToConsume = -mExcessWater / GTValues.STEAM_PER_WATER; mFluid.amount -= tWaterToConsume; - mExcessWater += GT_Values.STEAM_PER_WATER * tWaterToConsume; + mExcessWater += GTValues.STEAM_PER_WATER * tWaterToConsume; } - if (GT_ModHandler.isSteam(this.mSteam)) { + if (GTModHandler.isSteam(this.mSteam)) { this.mSteam.amount += aAmount; } else { - this.mSteam = GT_ModHandler.getSteam(aAmount); + this.mSteam = GTModHandler.getSteam(aAmount); } } @@ -262,7 +259,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa private void pollute(long aTick) { if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) { - GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution()); + Pollution.addPollution(getBaseMetaTileEntity(), getPollution()); } } @@ -293,11 +290,11 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa } if (this.mTemperature > 100) { - if ((!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { + if ((!GTModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { this.mHadNoWater = true; } else { if (this.mHadNoWater) { - GT_Log.exp.println("Boiler " + this.mName + " had no Water!"); + GTLog.exp.println("Boiler " + this.mName + " had no Water!"); onDangerousWaterLack(aBaseMetaTileEntity, aTick); return true; } @@ -323,7 +320,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa if (mSteam == null || mSteam.amount == 0) return; final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(side); if (tTileEntity == null) return; - GT_Utility.moveFluid(aBaseMetaTileEntity, tTileEntity, side, Math.max(1, this.mSteam.amount / 2), null); + GTUtility.moveFluid(aBaseMetaTileEntity, tTileEntity, side, Math.max(1, this.mSteam.amount / 2), null); } /** @@ -352,7 +349,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa } protected boolean isAutomatable() { - return GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation; + return GTMod.gregtechproxy.mAllowSmallBoilerAutomation; } @Override @@ -370,8 +367,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { - if (aIndex == GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) { - GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ); + if (aIndex == MTEBoiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) { + GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ); new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD) .setWorld(getBaseMetaTileEntity().getWorld()) @@ -424,12 +421,12 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa protected IDrawable[] getFuelSlotBackground() { return new IDrawable[] { getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_COAL_STEAM.get(getSteamVariant()) }; + GTUITextures.OVERLAY_SLOT_COAL_STEAM.get(getSteamVariant()) }; } protected IDrawable[] getAshSlotBackground() { return new IDrawable[] { getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()) }; + GTUITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()) }; } @Override @@ -446,19 +443,19 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa .widget(createAshSlot()) .widget( new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getSteamCapacity()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) + .setTexture(getProgressbarEmpty(), GTUITextures.PROGRESSBAR_BOILER_STEAM, 10) .setDirection(ProgressBar.Direction.UP) .setPos(70, 25) .setSize(10, 54)) .widget( new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) + .setTexture(getProgressbarEmpty(), GTUITextures.PROGRESSBAR_BOILER_WATER, 10) .setDirection(ProgressBar.Direction.UP) .setPos(83, 25) .setSize(10, 54)) .widget( new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) + .setTexture(getProgressbarEmpty(), GTUITextures.PROGRESSBAR_BOILER_HEAT, 10) .setDirection(ProgressBar.Direction.UP) .setPos(96, 25) .setSize(10, 54)) @@ -477,7 +474,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa } private boolean isItemValidFluidFilledItem(@NotNull ItemStack stack) { - return isFluidInputAllowed(GT_Utility.getFluidForFilledItem(stack, true)); + return isFluidInputAllowed(GTUtility.getFluidForFilledItem(stack, true)); } protected Widget createFuelSlot() { @@ -509,22 +506,22 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa // for GT++ protected IDrawable getOverlaySlotIn() { - return GT_UITextures.OVERLAY_SLOT_IN_STEAM.get(getSteamVariant()); + return GTUITextures.OVERLAY_SLOT_IN_STEAM.get(getSteamVariant()); } protected IDrawable getOverlaySlotOut() { - return GT_UITextures.OVERLAY_SLOT_OUT_STEAM.get(getSteamVariant()); + return GTUITextures.OVERLAY_SLOT_OUT_STEAM.get(getSteamVariant()); } protected IDrawable getOverlaySlotCanister() { - return GT_UITextures.OVERLAY_SLOT_CANISTER_STEAM.get(getSteamVariant()); + return GTUITextures.OVERLAY_SLOT_CANISTER_STEAM.get(getSteamVariant()); } protected UITexture getProgressbarEmpty() { - return GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()); + return GTUITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()); } protected UITexture getProgressbarFuel() { - return GT_UITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant()); + return GTUITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant()); } } diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerBronze.java index 3450d55290..e951656d23 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerBronze.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.ParticleFX; @@ -33,31 +33,31 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; -import gregtech.common.GT_Pollution; +import gregtech.common.Pollution; -public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { +public class MTEBoilerBronze extends MTEBoiler { - public GT_MetaTileEntity_Boiler_Bronze(int aID, String aName, String aNameRegional) { + public MTEBoilerBronze(int aID, String aName, String aNameRegional) { super( aID, aName, aNameRegional, new String[] { "An early way to get Steam Power", "Produces 120L of Steam per second", - "Causes " + GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond + " Pollution per second" }); + "Causes " + GTMod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond + " Pollution per second" }); } - public GT_MetaTileEntity_Boiler_Bronze(int aID, String aName, String aNameRegional, String[] aDescription) { + public MTEBoilerBronze(int aID, String aName, String aNameRegional, String[] aDescription) { super(aID, aName, aNameRegional, aDescription); } - public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEBoilerBronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerBronze(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -89,7 +89,7 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEBoilerBronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } /** @@ -150,13 +150,13 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L) && this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) { - GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution()); + Pollution.addPollution(getBaseMetaTileEntity(), getPollution()); } } @Override protected int getPollution() { - return GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond; + return GTMod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond; } @Override @@ -188,7 +188,7 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { this.mProcessingEnergy += burnTime / 10; boolean isABlock = !Block.getBlockFromItem(fuel.getItem()) .equals(Blocks.air); - combustFuel(burnTime, isABlock).map(dustSize -> GT_OreDictUnificator.get(dustSize, ashMaterial, 1L)) + combustFuel(burnTime, isABlock).map(dustSize -> GTOreDictUnificator.get(dustSize, ashMaterial, 1L)) .ifPresent(ashes -> aBaseMetaTileEntity.addStackToSlot(3, ashes)); }); } @@ -210,18 +210,17 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { } private static boolean couldProduceDarkAshes(ItemStack fuel, String lowerCaseBlockName) { - return GT_Utility.isPartOfMaterials(fuel, Materials.Coal) - || GT_Utility.isPartOfMaterials(fuel, Materials.Lignite) + return GTUtility.isPartOfMaterials(fuel, Materials.Coal) || GTUtility.isPartOfMaterials(fuel, Materials.Lignite) || lowerCaseBlockName.matches("tile\\..+compressedcoal"); } private static boolean couldProduceRegularAshes(ItemStack fuel, String lowerCaseBlockName, int burnTime) { - return GT_Utility.isPartOfMaterials(fuel, Materials.Charcoal) - || GT_Utility.isPartOfMaterials(fuel, Materials.Diamond) + return GTUtility.isPartOfMaterials(fuel, Materials.Charcoal) + || GTUtility.isPartOfMaterials(fuel, Materials.Diamond) || (Stream.of("^tile\\..+charcoal", "^tile\\..+coke", "^tile\\..+railcraft.cube") .anyMatch(lowerCaseBlockName::matches)) || Stream.of("fuelCoke", "fuelCactusCharcoal", "fuelCactusCoke", "fuelSugarCharcoal", "fuelSugarCoke") - .anyMatch(name -> GT_OreDictUnificator.isItemStackInstanceOf(fuel, name)) + .anyMatch(name -> GTOreDictUnificator.isItemStackInstanceOf(fuel, name)) || burnTime >= 2000; } diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerLava.java index d0dfe74b64..ad79f07b0f 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerLava.java @@ -36,22 +36,22 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Dyes; import gregtech.api.enums.ParticleFX; import gregtech.api.enums.SoundResource; import gregtech.api.enums.SteamVariant; -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.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; -public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { +public class MTEBoilerLava extends MTEBoiler { public static final int COOLDOWN_INTERVAL = 20; public static final int ENERGY_PER_LAVA = 1; @@ -60,24 +60,24 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { private final FluidTank lavaTank = new LavaTank(null, getCapacity()); private int mCooledLava = 0; - public GT_MetaTileEntity_Boiler_Lava(int aID, String aName, String aNameRegional) { + public MTEBoilerLava(int aID, String aName, String aNameRegional) { super( aID, aName, aNameRegional, new String[] { "A Boiler running off Lava", "Produces " + PRODUCTION_PER_SECOND + "L of Steam per second", - "Causes " + GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond + " Pollution per second", + "Causes " + GTMod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond + " Pollution per second", "Consumes " + ((double) CONSUMPTION_PER_HEATUP / ENERGY_PER_LAVA) + "L of Lava every " + COOLDOWN_INTERVAL + " ticks when fully heat up" }); } - public GT_MetaTileEntity_Boiler_Lava(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEBoilerLava(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_Boiler_Lava(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerLava(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -138,12 +138,12 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Lava(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEBoilerLava(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override protected int getPollution() { - return GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond; + return GTMod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond; } @Override @@ -177,7 +177,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { public static ItemStack fillIFluidTankFromItemStack(IFluidTank destinationIFluidTank, ItemStack SourceItemStack) { if (destinationIFluidTank == null || SourceItemStack == null) return null; - final FluidStack containedFluidStack = GT_Utility.getFluidForFilledItem(SourceItemStack, true); + final FluidStack containedFluidStack = GTUtility.getFluidForFilledItem(SourceItemStack, true); if (containedFluidStack == null || containedFluidStack.amount == 0) return null; final int fillableAmount = destinationIFluidTank.fill(containedFluidStack, false); @@ -188,7 +188,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { destinationIFluidTank.fill(equippedIFluidContainerItem.drain(SourceItemStack, fillableAmount, true), true); return null; } else { - final ItemStack emptyContainerItemStack = GT_Utility.getContainerForFilledItem(SourceItemStack, false); + final ItemStack emptyContainerItemStack = GTUtility.getContainerForFilledItem(SourceItemStack, false); destinationIFluidTank.fill(containedFluidStack, true); return emptyContainerItemStack; } @@ -199,16 +199,16 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (aBaseMetaTileEntity.isClientSide() || aPlayer == null) return true; final ItemStack equippedItemStack = aPlayer.getCurrentEquippedItem(); - final FluidStack equippedContainerFluidStack = GT_Utility.getFluidForFilledItem(equippedItemStack, true); + final FluidStack equippedContainerFluidStack = GTUtility.getFluidForFilledItem(equippedItemStack, true); final ItemStack returnedItemStack; final IFluidTank tank; - if (GT_ModHandler.isWater(equippedContainerFluidStack)) { + if (GTModHandler.isWater(equippedContainerFluidStack)) { tank = this; - } else if (GT_ModHandler.isLava(equippedContainerFluidStack)) { + } else if (GTModHandler.isLava(equippedContainerFluidStack)) { tank = lavaTank; } else { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } returnedItemStack = fillIFluidTankFromItemStack(tank, equippedItemStack); @@ -283,7 +283,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { - (this.lavaTank.getFluid() != null ? this.lavaTank.getFluid().amount : 0), 1000)), false); - if (!GT_ModHandler.isLava(drainableLavaStack) || drainableLavaStack.amount <= 0) return; + if (!GTModHandler.isLava(drainableLavaStack) || drainableLavaStack.amount <= 0) return; // Performs actual drain up and fill internal tank this.lavaTank.fill(upTank.drain(ForgeDirection.DOWN, drainableLavaStack, true), true); } @@ -362,19 +362,19 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override public boolean isFluidInputAllowed(FluidStack aFluid) { - return GT_ModHandler.isWater(aFluid) || GT_ModHandler.isLava(aFluid); + return GTModHandler.isWater(aFluid) || GTModHandler.isLava(aFluid); } @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (!aBaseMetaTileEntity.isServerSide()) return; - final FluidStack containedFluidStack = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true); - if (GT_ModHandler.isWater(containedFluidStack)) super.onPreTick(aBaseMetaTileEntity, aTick); - if (GT_ModHandler.isLava(containedFluidStack) + final FluidStack containedFluidStack = GTUtility.getFluidForFilledItem(mInventory[getInputSlot()], true); + if (GTModHandler.isWater(containedFluidStack)) super.onPreTick(aBaseMetaTileEntity, aTick); + if (GTModHandler.isLava(containedFluidStack) && lavaTank.fill(containedFluidStack, false) == containedFluidStack.amount && aBaseMetaTileEntity.addStackToSlot( getOutputSlot(), - GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true), + GTUtility.getContainerForFilledItem(mInventory[getInputSlot()], true), 1)) { lavaTank.fill(containedFluidStack, true); aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); @@ -394,11 +394,11 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { - if (aIndex != GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) return; + if (aIndex != MTEBoiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) return; final ForgeDirection rearDirection = getBaseMetaTileEntity().getFrontFacing() .getOpposite(); - GT_Utility.doSoundAtClient( + GTUtility.doSoundAtClient( SoundResource.RANDOM_FIZZ, 2, 1.0F, @@ -436,8 +436,8 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override public int fill(FluidStack aFluid, boolean doFill) { - if (GT_ModHandler.isWater(aFluid)) return super.fill(aFluid, doFill); - if (GT_ModHandler.isLava(aFluid)) return lavaTank.fill(aFluid, doFill); + if (GTModHandler.isWater(aFluid)) return super.fill(aFluid, doFill); + if (GTModHandler.isLava(aFluid)) return lavaTank.fill(aFluid, doFill); return 0; } @@ -451,7 +451,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override protected IDrawable[] getAshSlotBackground() { return new IDrawable[] { getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_BLOCK_STEAM.get(getSteamVariant()) }; + GTUITextures.OVERLAY_SLOT_BLOCK_STEAM.get(getSteamVariant()) }; } @Override @@ -468,7 +468,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override public int fill(FluidStack resource, boolean doFill) { - return GT_ModHandler.isLava(resource) ? super.fill(resource, doFill) : 0; + return GTModHandler.isLava(resource) ? super.fill(resource, doFill) : 0; } } } diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java index b10b44228d..0fc23f59cf 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java @@ -23,17 +23,17 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gregtech.common.config.machinestats.ConfigBronzeSolarBoiler; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { +public class MTEBoilerSolar extends MTEBoiler { public static final String LPS_FMT = "%s L/s"; - private static final String localizedDescFormat = GT_LanguageManager.addStringLocalization( + private static final String localizedDescFormat = GTLanguageManager.addStringLocalization( "gt.blockmachines.boiler.solar.desc.format", "Steam Power by the Sun%n" + "Produces %sL of Steam per second%n" + "Calcifies over time, reducing Steam output to %sL/s%n" @@ -46,15 +46,15 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { protected final int basicTemperatureMod = 5; // Base Celsius gain or loss private int mRunTimeTicks = 0; - public GT_MetaTileEntity_Boiler_Solar(int aID, String aName, String aNameRegional) { + public MTEBoilerSolar(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, new String[0]); } - public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEBoilerSolar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerSolar(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -67,8 +67,8 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return String .format( localizedDescFormat, - GT_Utility.formatNumbers(getMaxOutputPerSecond()), - GT_Utility.formatNumbers(getMinOutputPerSecond())) + GTUtility.formatNumbers(getMaxOutputPerSecond()), + GTUtility.formatNumbers(getMinOutputPerSecond())) .split("\\R"); } @@ -126,7 +126,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { protected void produceSteam(int aAmount) { super.produceSteam(aAmount); // Disable calcification when using distilled water - if (mFluid.isFluidEqual(GT_ModHandler.getWater(1))) { + if (mFluid.isFluidEqual(GTModHandler.getWater(1))) { // produceSteam is getting called every 10 ticks if (mRunTimeTicks >= 0 && mRunTimeTicks < (Integer.MAX_VALUE - 10)) mRunTimeTicks += 10; else mRunTimeTicks = Integer.MAX_VALUE; // Prevent Integer overflow wrap @@ -257,11 +257,11 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { + EnumChatFormatting.YELLOW + LPS_FMT + EnumChatFormatting.RESET, - GT_Utility.formatNumbers(getHeatCapacityPercent()), - GT_Utility.formatNumbers(getHotTimeSeconds()), - GT_Utility.formatNumbers(getMinOutputPerSecond()), - GT_Utility.formatNumbers(getMaxOutputPerSecond()), - GT_Utility.formatNumbers(getProductionPerSecond())) + GTUtility.formatNumbers(getHeatCapacityPercent()), + GTUtility.formatNumbers(getHotTimeSeconds()), + GTUtility.formatNumbers(getMinOutputPerSecond()), + GTUtility.formatNumbers(getMaxOutputPerSecond()), + GTUtility.formatNumbers(getProductionPerSecond())) .split("\\R"); } @@ -275,7 +275,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Solar(mName, mTier, mDescriptionArray, mTextures); + return new MTEBoilerSolar(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java index c537e388d1..b46beca108 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java @@ -9,21 +9,19 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.render.TextureFactory; import gregtech.common.config.machinestats.ConfigSteelSolarBoiler; -public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boiler_Solar { +public class MTEBoilerSolarSteel extends MTEBoilerSolar { - public GT_MetaTileEntity_Boiler_Solar_Steel(int aID, String aName, String aNameRegional) { + public MTEBoilerSolarSteel(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); initBoilerStats(); } - public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { + public MTEBoilerSolarSteel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); initBoilerStats(); } - public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEBoilerSolarSteel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); initBoilerStats(); } @@ -66,6 +64,6 @@ public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boil @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Solar_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEBoilerSolarSteel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } } diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSteel.java index 12374c3313..a557a03d16 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSteel.java @@ -9,29 +9,29 @@ import static gregtech.api.enums.Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_STEELBRICKS_TOP; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.SteamVariant; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.render.TextureFactory; -public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bronze { +public class MTEBoilerSteel extends MTEBoilerBronze { - public GT_MetaTileEntity_Boiler_Steel(int aID, String aName, String aNameRegional) { + public MTEBoilerSteel(int aID, String aName, String aNameRegional) { super( aID, aName, aNameRegional, new String[] { "Faster than the Bronze Boiler", "Produces 300L of Steam per second", - "Causes " + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond + " Pollution per second" }); + "Causes " + GTMod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond + " Pollution per second" }); } - public GT_MetaTileEntity_Boiler_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEBoilerSteel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_Boiler_Steel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerSteel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -68,12 +68,12 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bro @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEBoilerSteel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override protected int getPollution() { - return GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond; + return GTMod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond; } @Override |