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/common/covers | |
| 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/common/covers')
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverArm.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Arm.java) | 70 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverChest.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Chest.java) | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverControlsWork.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java) | 56 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverConveyor.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java) | 111 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverCrafting.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Crafting.java) | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverDoesWork.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java) | 56 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverDrain.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Drain.java) | 20 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverEUMeter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java) | 110 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverFacadeAE.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java) | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverFacadeBase.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java) | 64 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverFluidLimiter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverFluidRegulator.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java) | 88 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverFluidStorageMonitor.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java) | 34 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverFluidfilter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java) | 143 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverInfo.java | 26 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverItemFilter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java) | 54 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverItemMeter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java) | 62 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverLens.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Lens.java) | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverLiquidMeter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java) | 48 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverMetricsTransmitter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Metrics_Transmitter.java) | 9 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverNeedMaintainance.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java) | 117 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverPlayerDetector.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java) | 42 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverPump.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Pump.java) | 111 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverRedstoneConductor.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverRedstoneReceiverExternal.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java) | 10 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverRedstoneReceiverInternal.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java) | 10 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverRedstoneSignalizer.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java) | 19 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverRedstoneTransmitterExternal.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java) | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverRedstoneTransmitterInternal.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java) | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverRedstoneWirelessBase.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java) | 94 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverScreen.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Screen.java) | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverShutter.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Shutter.java) | 43 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverSolarPanel.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java) | 20 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverSteamRegulator.java | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverSteamValve.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java) | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/CoverVent.java (renamed from src/main/java/gregtech/common/covers/GT_Cover_Vent.java) | 10 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverBase.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java) | 50 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverExternal.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java) | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverInternal.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java) | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterBase.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java) | 32 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterExternal.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java) | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterInternal.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java) | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverAdvancedWirelessRedstoneBase.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java) | 40 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessDoesWorkDetector.java) | 45 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java) | 26 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverWirelessItemDetector.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java) | 38 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/CoverWirelessMaintenanceDetector.java (renamed from src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java) | 36 |
48 files changed, 915 insertions, 937 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/CoverArm.java index 51f330e8df..fef9ef1327 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java +++ b/src/main/java/gregtech/common/covers/CoverArm.java @@ -12,19 +12,19 @@ import com.gtnewhorizons.modularui.api.NumberFormatMUI; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.gui.modularui.GT_CoverUIBuildContext; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.CoverUIBuildContext; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IMachineProgress; -import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.CoverBehavior; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget; -public class GT_Cover_Arm extends GT_CoverBehavior { +public class CoverArm extends CoverBehavior { public final int mTickRate; // msb converted, 2nd : direction (1=export) @@ -34,7 +34,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { protected static final int SLOT_ID_MIN = 0; protected static final int CONVERTED_BIT = 0x80000000; - public GT_Cover_Arm(int aTickRate, ITexture coverTexture) { + public CoverArm(int aTickRate, ITexture coverTexture) { super(coverTexture); this.mTickRate = aTickRate; } @@ -78,7 +78,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { if (fromSlot > 0 && toSlot > 0) { if (fromTile instanceof IInventory fromInventory && toTile instanceof IInventory toInventory) - GT_Utility.moveFromSlotToSlot( + GTUtility.moveFromSlotToSlot( fromInventory, toInventory, fromSlot - 1, @@ -93,7 +93,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { final ForgeDirection toSide; if ((aCoverVariable & EXPORT_MASK) > 0) toSide = side; else toSide = side.getOpposite(); - GT_Utility.moveOneItemStackIntoSlot( + GTUtility.moveOneItemStackIntoSlot( fromTile, toTile, toSide, @@ -108,7 +108,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { final ForgeDirection toSide; if ((aCoverVariable & EXPORT_MASK) > 0) toSide = side; else toSide = side.getOpposite(); - if (fromTile instanceof IInventory) GT_Utility.moveFromSlotToSide( + if (fromTile instanceof IInventory) GTUtility.moveFromSlotToSide( (IInventory) fromTile, toTile, fromSlot - 1, @@ -129,7 +129,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { fromSide = side.getOpposite(); toSide = side; } - GT_Utility.moveOneItemStack( + GTUtility.moveOneItemStack( fromTile, toTile, fromSide, @@ -149,7 +149,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { int step = 0; - if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { + if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { step += aPlayer.isSneaking() ? 256 : 16; } else { step -= aPlayer.isSneaking() ? 256 : 16; @@ -163,7 +163,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { protected boolean onCoverRightClickImpl(ForgeDirection side, int aCoverID, ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - int step = (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1; + int step = (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1; int tCoverVariable = getNewVar(aCoverVariable.get(), step); sendMessageToPlayer(aPlayer, tCoverVariable); aCoverVariable.set(tCoverVariable); @@ -174,7 +174,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { @SuppressWarnings("deprecation") public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - final int step = (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1; + final int step = (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1; aCoverVariable = getNewVar(aCoverVariable, step); sendMessageToPlayer(aPlayer, aCoverVariable); aTileEntity.setCoverDataAtSide(side, aCoverVariable); @@ -188,11 +188,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior { } private void sendMessageToPlayer(EntityPlayer aPlayer, int var) { - if ((var & EXPORT_MASK) != 0) GT_Utility.sendChatToPlayer( + if ((var & EXPORT_MASK) != 0) GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1)); - else GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1)); + GTUtility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1)); + else GTUtility + .sendChatToPlayer(aPlayer, GTUtility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1)); } private int getNewVar(int var, int step) { @@ -277,7 +277,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { } @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new ArmUIFactory(buildContext).createWindow(); } @@ -298,14 +298,14 @@ public class GT_Cover_Arm extends GT_CoverBehavior { @Override public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) { if (number < 0) { - return toAppendTo.append(GT_Utility.trans("ANY", "Any")); + return toAppendTo.append(GTUtility.trans("ANY", "Any")); } else { return super.format(number, toAppendTo, pos); } } }; - protected ArmUIFactory(GT_CoverUIBuildContext buildContext) { + protected ArmUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -314,8 +314,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior { protected void addUIWidgets(ModularWindow.Builder builder) { maxSlot = getMaxSlot(); builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_Arm.this).addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverArm.this).addFollower( + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> getFlagExport(convert(coverData)) > 0, (coverData, state) -> { if (state) { @@ -326,11 +326,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior { convert(coverData) & ~EXPORT_MASK | CONVERTED_BIT); } }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT) + .addTooltip(GTUtility.trans("006", "Export")) .setPos(spaceX * 0, spaceY * 0)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> getFlagExport(convert(coverData)) == 0, (coverData, state) -> { if (state) { @@ -341,11 +341,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior { convert(coverData) | EXPORT_MASK | CONVERTED_BIT); } }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip(GTUtility.trans("007", "Import")) .setPos(spaceX * 1, spaceY * 0)) .addFollower( - new CoverDataFollower_NumericWidget<>(), + new CoverDataFollowerNumericWidget<>(), coverData -> (double) (getFlagInternalSlot(convert(coverData)) - 1), (coverData, state) -> { final int coverVariable = convert(coverData); @@ -361,7 +361,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { .setPos(spaceX * 0, spaceY * 1 + 2) .setSize(spaceX * 2 + 5, 12)) .addFollower( - new CoverDataFollower_NumericWidget<>(), + new CoverDataFollowerNumericWidget<>(), coverData -> (double) (getFlagAdjacentSlot(convert(coverData)) - 1), (coverData, state) -> { final int coverVariable = convert(coverData); @@ -395,15 +395,15 @@ public class GT_Cover_Arm extends GT_CoverBehavior { .widget( new TextWidget() .setStringSupplier( - () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GT_Utility.trans("006", "Export") - : GT_Utility.trans("007", "Import")) + () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GTUtility.trans("006", "Export") + : GTUtility.trans("007", "Import")) .setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) .widget( - new TextWidget(GT_Utility.trans("254.1", "Internal slot#")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("254.1", "Internal slot#")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1)) .widget( - new TextWidget(GT_Utility.trans("255", "Adjacent slot#")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("255", "Adjacent slot#")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 3, 4 + startY + spaceY * 2)); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Chest.java b/src/main/java/gregtech/common/covers/CoverChest.java index 36e441102b..4afc3b9578 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Chest.java +++ b/src/main/java/gregtech/common/covers/CoverChest.java @@ -20,20 +20,20 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.SlotGroup; import cpw.mods.fml.common.network.ByteBufUtils; -import gregtech.api.gui.modularui.GT_CoverUIBuildContext; +import gregtech.api.gui.modularui.CoverUIBuildContext; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.util.GT_CoverBehaviorBase; +import gregtech.api.util.CoverBehaviorBase; import gregtech.api.util.ISerializableObject; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; import io.netty.buffer.ByteBuf; -public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInventory> { +public class CoverChest extends CoverBehaviorBase<CoverChest.ChestInventory> { private final int slots; private final int stackSizeLimit = 1; - public GT_Cover_Chest(int slots, ITexture coverTexture) { + public CoverChest(int slots, ITexture coverTexture) { super(ChestInventory.class, coverTexture); if (slots <= 0) throw new IllegalArgumentException("slots must be greater than 0"); this.slots = slots; @@ -109,7 +109,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv } @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new ChestUIFactory(buildContext).createWindow(); } @@ -118,7 +118,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv private static final int spaceX = 18; private static final int spaceY = 18; - public ChestUIFactory(GT_CoverUIBuildContext buildContext) { + public ChestUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -149,7 +149,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv CoverDataControllerWidget<ChestInventory> w = new CoverDataControllerWidget<>( this::getCoverData, this::setCoverData, - GT_Cover_Chest.this); + CoverChest.this); ChestInventory d = getCoverData(); LimitingItemStackHandler h; if (d == null) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/CoverControlsWork.java index 2c51cdc355..6c92c61351 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtech/common/covers/CoverControlsWork.java @@ -8,21 +8,21 @@ import net.minecraftforge.fluids.Fluid; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.gui.modularui.GT_CoverUIBuildContext; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.CoverUIBuildContext; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.covers.IControlsWorkCover; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IMachineProgress; -import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.CoverBehavior; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget; -public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControlsWorkCover { +public class CoverControlsWork extends CoverBehavior implements IControlsWorkCover { - public GT_Cover_ControlsWork(ITexture coverTexture) { + public CoverControlsWork(ITexture coverTexture) { super(coverTexture); } @@ -47,7 +47,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls if (player != null) { lastPlayer = null; mPlayerNotified = true; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( player, aTileEntity.getInventoryName() + "at " + String.format( @@ -135,19 +135,19 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls aCoverVariable = 2; } if (aCoverVariable == 0) { - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("003", "Enable with Signal")); + GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("003", "Enable with Signal")); } if (aCoverVariable == 1) { - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("004", "Disable with Signal")); + GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("004", "Disable with Signal")); } if (aCoverVariable == 2) { - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("005", "Disabled")); + GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("005", "Disabled")); } if (aCoverVariable == 3) { - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("505", "Enable with Signal (Safe)")); + GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("505", "Enable with Signal (Safe)")); } if (aCoverVariable == 4) { - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("506", "Disable with Signal (Safe)")); + GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("506", "Disable with Signal (Safe)")); } // TODO: Set lastPlayer return aCoverVariable; @@ -177,7 +177,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls } @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new ControlsWorkUIFactory(buildContext).createWindow(); } @@ -188,7 +188,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls private static final int spaceX = 18; private static final int spaceY = 18; - public ControlsWorkUIFactory(GT_CoverUIBuildContext buildContext) { + public ControlsWorkUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -200,48 +200,48 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( this::getCoverData, this::setCoverData, - GT_Cover_ControlsWork.this, + Cov |
