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/gregtech/api/metatileentity/implementations | |
| 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/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicBatteryBuffer.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java) | 69 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java) | 53 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHull.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull.java) | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHullNonElectric.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull_NonElectric.java) | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java) | 162 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java) | 36 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineSteel.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java) | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java) | 93 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBasicTank.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java) | 39 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java) | 66 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTECable.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java) | 120 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTECubicMultiBlockBase.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java) | 40 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java) | 52 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_FilterBase.java) | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java) | 128 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEFrame.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java) | 12 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java) | 26 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDataAccess.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java) | 27 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDynamo.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Dynamo.java) | 15 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchEnergy.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java) | 20 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInput.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java) | 42 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java) | 59 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMagnet.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MagHatch.java) | 19 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java) | 98 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMuffler.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java) | 26 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMultiInput.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java) | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java) | 96 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutputBus.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java) | 45 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEHatchQuadrupleHumongous.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java) | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEItem.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java) | 75 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java) | 424 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTESpecialFilter.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTETieredMachineBlock.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java) | 30 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTETooltipMultiBlockBase.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TooltipMultiBlockBase.java) | 23 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTETransformer.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java) | 61 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEWetTransformer.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java) | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessDynamo.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java) | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessEnergy.java (renamed from src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java) | 13 |
39 files changed, 1018 insertions, 1097 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicBatteryBuffer.java index cff63caeb5..7ca8cce273 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicBatteryBuffer.java @@ -1,6 +1,6 @@ package gregtech.api.metatileentity.implementations; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import java.util.List; @@ -20,14 +20,14 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; import com.gtnewhorizons.modularui.common.widget.SlotGroup; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import ic2.api.item.IElectricItem; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -38,8 +38,7 @@ import mcp.mobius.waila.api.IWailaDataAccessor; * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple * Machine */ -public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_TieredMachineBlock - implements IAddUIWidgets { +public class MTEBasicBatteryBuffer extends MTETieredMachineBlock implements IAddUIWidgets { public boolean mCharge = false, mDecharge = false; public int mBatteryCount = 0, mChargeableCount = 0; @@ -47,18 +46,18 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier private long mStored = 0; private long mMax = 0; - public GT_MetaTileEntity_BasicBatteryBuffer(int aID, String aName, String aNameRegional, int aTier, - String aDescription, int aSlotCount) { + public MTEBasicBatteryBuffer(int aID, String aName, String aNameRegional, int aTier, String aDescription, + int aSlotCount) { super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); } - public GT_MetaTileEntity_BasicBatteryBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, + public MTEBasicBatteryBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } - public GT_MetaTileEntity_BasicBatteryBuffer(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures, int aSlotCount) { + public MTEBasicBatteryBuffer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, + int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } @@ -91,7 +90,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BasicBatteryBuffer(mName, mTier, mDescriptionArray, mTextures, mInventory.length); + return new MTEBasicBatteryBuffer(mName, mTier, mDescriptionArray, mTextures, mInventory.length); } @Override @@ -216,7 +215,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -227,8 +226,8 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3; mBatteryCount = 0; mChargeableCount = 0; - for (ItemStack tStack : mInventory) if (GT_ModHandler.isElectricItem(tStack, mTier)) { - if (GT_ModHandler.isChargerItem(tStack)) mBatteryCount++; + for (ItemStack tStack : mInventory) if (GTModHandler.isElectricItem(tStack, mTier)) { + if (GTModHandler.isChargerItem(tStack)) mBatteryCount++; mChargeableCount++; } } @@ -238,7 +237,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { - if (GT_ModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName() + if (GTModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName() .startsWith("gt.metaitem.01.")) { String name = aStack.getUnlocalizedName(); if (name.equals("gt.metaitem.01.32510") || name.equals("gt.metaitem.01.32511") @@ -255,10 +254,10 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { - if (!GT_Utility.isStackValid(aStack)) { + if (!GTUtility.isStackValid(aStack)) { return false; } - return mInventory[aIndex] == null && GT_ModHandler.isElectricItem(aStack, this.mTier); + return mInventory[aIndex] == null && GTModHandler.isElectricItem(aStack, this.mTier); } @Override @@ -274,16 +273,16 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier long tStep = 0; if (mInventory != null) { for (ItemStack aStack : mInventory) { - if (GT_ModHandler.isElectricItem(aStack)) { + if (GTModHandler.isElectricItem(aStack)) { - if (aStack.getItem() instanceof GT_MetaBase_Item) { - Long[] stats = ((GT_MetaBase_Item) aStack.getItem()).getElectricStats(aStack); + if (aStack.getItem() instanceof MetaBaseItem) { + Long[] stats = ((MetaBaseItem) aStack.getItem()).getElectricStats(aStack); if (stats != null) { if (stats[0] > Long.MAX_VALUE / 2) { scaleOverflow = true; } tScale = tScale + stats[0]; - tStep = ((GT_MetaBase_Item) aStack.getItem()).getRealCharge(aStack); + tStep = ((MetaBaseItem) aStack.getItem()).getRealCharge(aStack); if (tStep > Long.MAX_VALUE / 2) { storedOverflow = true; } @@ -310,15 +309,15 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier updateStorageInfo(); return new String[] { EnumChatFormatting.BLUE + getLocalName() + EnumChatFormatting.RESET, "Stored Items:", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mStored) + EnumChatFormatting.GREEN + GTUtility.formatNumbers(mStored) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(mMax) + + GTUtility.formatNumbers(mMax) + EnumChatFormatting.RESET + " EU", - "Average input:", GT_Utility.formatNumbers(getBaseMetaTileEntity().getAverageElectricInput()) + " EU/t", - "Average output:", GT_Utility.formatNumbers(getBaseMetaTileEntity().getAverageElectricOutput()) + " EU/t" }; + "Average input:", GTUtility.formatNumbers(getBaseMetaTileEntity().getAverageElectricInput()) + " EU/t", + "Average output:", GTUtility.formatNumbers(getBaseMetaTileEntity().getAverageElectricOutput()) + " EU/t" }; } private void updateStorageInfo() { @@ -337,22 +336,22 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier currenttip.add( StatCollector.translateToLocalFormatted( "GT5U.waila.energy.stored", - GT_Utility.formatNumbers(tag.getLong("mStored")), - GT_Utility.formatNumbers(tag.getLong("mMax")))); + GTUtility.formatNumbers(tag.getLong("mStored")), + GTUtility.formatNumbers(tag.getLong("mMax")))); long avgIn = tag.getLong("AvgIn"); long avgOut = tag.getLong("AvgOut"); currenttip.add( StatCollector.translateToLocalFormatted( "GT5U.waila.energy.avg_in_with_amperage", - GT_Utility.formatNumbers(avgIn), - GT_Utility.getAmperageForTier(avgIn, (byte) getInputTier()), - GT_Utility.getColoredTierNameFromTier((byte) getInputTier()))); + GTUtility.formatNumbers(avgIn), + GTUtility.getAmperageForTier(avgIn, (byte) getInputTier()), + GTUtility.getColoredTierNameFromTier((byte) getInputTier()))); currenttip.add( StatCollector.translateToLocalFormatted( "GT5U.waila.energy.avg_out_with_amperage", - GT_Utility.formatNumbers(avgOut), - GT_Utility.getAmperageForTier(avgOut, (byte) getOutputTier()), - GT_Utility.getColoredTierNameFromTier((byte) getOutputTier()))); + GTUtility.formatNumbers(avgOut), + GTUtility.getAmperageForTier(avgOut, (byte) getOutputTier()), + GTUtility.getColoredTierNameFromTier((byte) getOutputTier()))); super.getWailaBody(itemStack, currenttip, accessor, config); } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java index 7a968afc4b..ac923bc699 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java @@ -1,6 +1,6 @@ package gregtech.api.metatileentity.implementations; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,36 +12,35 @@ import net.minecraftforge.fluids.IFluidHandler; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.RecipeMapWorkable; import gregtech.api.objects.ItemData; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.maps.FuelBackend; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Pollution; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.common.Pollution; -public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity_BasicTank - implements RecipeMapWorkable { +public abstract class MTEBasicGenerator extends MTEBasicTank implements RecipeMapWorkable { - public GT_MetaTileEntity_BasicGenerator(int aID, String aName, String aNameRegional, int aTier, String aDescription, + public MTEBasicGenerator(int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures); } - public GT_MetaTileEntity_BasicGenerator(int aID, String aName, String aNameRegional, int aTier, - String[] aDescription, ITexture... aTextures) { + public MTEBasicGenerator(int aID, String aName, String aNameRegional, int aTier, String[] aDescription, + ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures); } - public GT_MetaTileEntity_BasicGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEBasicGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } - public GT_MetaTileEntity_BasicGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBasicGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @@ -81,7 +80,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -219,7 +218,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) { // divided by two because this is called every 10 ticks, not 20 - GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2); + Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2); mFluid.amount -= tFluidAmountToUse * tConsumed; } } @@ -227,7 +226,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity if (mInventory[getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU()) - && ((GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) != null) + && ((GTUtility.getFluidForFilledItem(mInventory[getInputSlot()], true) != null) || solidFuelOverride(mInventory[getInputSlot()]))) { long tFuelValue = getFuelValue(mInventory[getInputSlot()]); if (tFuelValue <= 0) tFuelValue = getFuelValue(mInventory[getInputSlot()], true); @@ -238,7 +237,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true); aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); // divided by two because this is called every 10 ticks, not 20 - GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2); + Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2); } } } @@ -255,11 +254,11 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity */ public boolean solidFuelOverride(ItemStack stack) { // this could be used for a coal generator for example aswell... - ItemData association = GT_OreDictUnificator.getAssociation(stack); + ItemData association = GTOreDictUnificator.getAssociation(stack); // if it is a gregtech Item, make sure its not a VOLUMETRIC_FLASK or any type of cell, else do vanilla checks if (association != null) { return !OrePrefixes.CELL_TYPES.contains(association.mPrefix) - && !GT_Utility.areStacksEqual(ItemList.VOLUMETRIC_FLASK.get(1L), stack, true); + && !GTUtility.areStacksEqual(ItemList.VOLUMETRIC_FLASK.get(1L), stack, true); } else { return stack != null && // when the stack is null its not a solid stack.getItem() != null && // when the item in the stack is null its not a solid @@ -293,7 +292,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity public long getFuelValue(FluidStack aLiquid, boolean aLong) { RecipeMap<?> tRecipes = getRecipeMap(); if (aLiquid == null || !(tRecipes.getBackend() instanceof FuelBackend tFuels)) return 0; - GT_Recipe tFuel = tFuels.findFuel(aLiquid); + GTRecipe tFuel = tFuels.findFuel(aLiquid); if (tFuel == null) return 0; return (long) tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(aLiquid) / 100; @@ -305,8 +304,8 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity } public long getFuelValue(ItemStack aStack, boolean aLong) { - if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return 0; - GT_Recipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); + if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0; + GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); if (tFuel == null) return 0; long liters = 10L; // 1000mb/100 @@ -314,17 +313,17 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity } public ItemStack getEmptyContainer(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return null; - GT_Recipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); - if (tFuel != null) return GT_Utility.copyOrNull(tFuel.getOutput(0)); - return GT_Utility.getContainerItem(aStack, true); + if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return null; + GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); + if (tFuel != null) return GTUtility.copyOrNull(tFuel.getOutput(0)); + return GTUtility.getContainerItem(aStack, true); } @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && (getFuelValue(aStack, true) > 0 - || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true), true) > 0); + || getFuelValue(GTUtility.getFluidForFilledItem(aStack, true), true) > 0); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHull.java index e5766eee39..35b6003c24 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHull.java @@ -1,6 +1,6 @@ package gregtech.api.metatileentity.implementations; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,31 +11,29 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -public class GT_MetaTileEntity_BasicHull extends GT_MetaTileEntity_BasicTank { +public class MTEBasicHull extends MTEBasicTank { - public GT_MetaTileEntity_BasicHull(int aID, String aName, String aNameRegional, int aTier, String aDescription, + public MTEBasicHull(int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 1, aDescription, aTextures); } - public GT_MetaTileEntity_BasicHull(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, - String aDescription, ITexture... aTextures) { + public MTEBasicHull(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, + ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures); } - public GT_MetaTileEntity_BasicHull(String aName, int aTier, int aInvSlotCount, String aDescription, - ITexture[][][] aTextures) { + public MTEBasicHull(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } - public GT_MetaTileEntity_BasicHull(String aName, int aTier, int aInvSlotCount, String[] aDescription, - ITexture[][][] aTextures) { + public MTEBasicHull(String aName, int aTier, int aInvSlotCount, String[] aDescription, I |
