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/redstone | |
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/redstone')
-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 |
11 files changed, 143 insertions, 144 deletions
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverBase.java index afd0f67b37..68564e33e5 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverBase.java @@ -13,19 +13,19 @@ import com.google.common.io.ByteArrayDataInput; 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.util.GT_Utility; +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; import io.netty.buffer.ByteBuf; -public abstract class GT_Cover_AdvancedRedstoneReceiverBase - extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> { +public abstract class CoverAdvancedRedstoneReceiverBase + extends CoverAdvancedWirelessRedstoneBase<CoverAdvancedRedstoneReceiverBase.ReceiverData> { - public GT_Cover_AdvancedRedstoneReceiverBase(ITexture coverTexture) { + public CoverAdvancedRedstoneReceiverBase(ITexture coverTexture) { super(ReceiverData.class, coverTexture); } @@ -42,13 +42,13 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase // GUI stuff @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new AdvancedRedstoneReceiverBaseUIFactory(buildContext).createWindow(); } private class AdvancedRedstoneReceiverBaseUIFactory extends AdvancedWirelessRedstoneBaseUIFactory { - public AdvancedRedstoneReceiverBaseUIFactory(GT_CoverUIBuildContext buildContext) { + public AdvancedRedstoneReceiverBaseUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -71,7 +71,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase protected void addUIWidgets(ModularWindow.Builder builder) { super.addUIWidgets(builder); builder.widget( - new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)); } @@ -80,53 +80,53 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase protected void addUIForDataController(CoverDataControllerWidget<ReceiverData> controller) { super.addUIForDataController(controller); controller.addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == GateMode.AND, (coverData, state) -> { coverData.mode = GateMode.AND; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_AND) - .addTooltip(GT_Utility.trans("331", "AND Gate")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_AND) + .addTooltip(GTUtility.trans("331", "AND Gate")) .setPos(spaceX * 0, spaceY * 2)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == GateMode.NAND, (coverData, state) -> { coverData.mode = GateMode.NAND; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND) - .addTooltip(GT_Utility.trans("332", "NAND Gate")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_NAND) + .addTooltip(GTUtility.trans("332", "NAND Gate")) .setPos(spaceX * 1, spaceY * 2)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == GateMode.OR, (coverData, state) -> { coverData.mode = GateMode.OR; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR) - .addTooltip(GT_Utility.trans("333", "OR Gate")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_OR) + .addTooltip(GTUtility.trans("333", "OR Gate")) .setPos(spaceX * 2, spaceY * 2)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == GateMode.NOR, (coverData, state) -> { coverData.mode = GateMode.NOR; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR) - .addTooltip(GT_Utility.trans("334", "NOR Gate")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_NOR) + .addTooltip(GTUtility.trans("334", "NOR Gate")) .setPos(spaceX * 3, spaceY * 2)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == GateMode.SINGLE_SOURCE, (coverData, state) -> { coverData.mode = GateMode.SINGLE_SOURCE; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_ANALOG) .addTooltips( Arrays.asList( "ANALOG Mode", @@ -144,7 +144,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase SINGLE_SOURCE } - public static class ReceiverData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData { + public static class ReceiverData extends CoverAdvancedWirelessRedstoneBase.WirelessData { private GateMode mode; diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverExternal.java index a8a30de9b1..5473ab3fec 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverExternal.java @@ -5,9 +5,9 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -public class GT_Cover_AdvancedRedstoneReceiverExternal extends GT_Cover_AdvancedRedstoneReceiverBase { +public class CoverAdvancedRedstoneReceiverExternal extends CoverAdvancedRedstoneReceiverBase { - public GT_Cover_AdvancedRedstoneReceiverExternal(ITexture coverTexture) { + public CoverAdvancedRedstoneReceiverExternal(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverInternal.java index 5553cb7c9c..f22a81bdba 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverInternal.java @@ -6,9 +6,9 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IMachineProgress; -public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_AdvancedRedstoneReceiverBase { +public class CoverAdvancedRedstoneReceiverInternal extends CoverAdvancedRedstoneReceiverBase { - public GT_Cover_AdvancedRedstoneReceiverInternal(ITexture coverTexture) { + public CoverAdvancedRedstoneReceiverInternal(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterBase.java index 3417542bec..cfa5461305 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterBase.java @@ -15,19 +15,19 @@ import com.google.common.io.ByteArrayDataInput; 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.CoverUIBuildContext; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.util.GT_Utility; +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; import io.netty.buffer.ByteBuf; -public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> - extends GT_Cover_AdvancedWirelessRedstoneBase<T> { +public abstract class CoverAdvancedRedstoneTransmitterBase<T extends CoverAdvancedRedstoneTransmitterBase.TransmitterData> + extends CoverAdvancedWirelessRedstoneBase<T> { - public GT_Cover_AdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) { + public CoverAdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) { super(typeToken, coverTexture); } @@ -53,9 +53,9 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove protected T onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable.invert = !aCoverVariable.invert; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal")); + aCoverVariable.invert ? GTUtility.trans("054", "Inverted") : GTUtility.trans("055", "Normal")); return aCoverVariable; } @@ -69,7 +69,7 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove } } - public static class TransmitterData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData { + public static class TransmitterData extends CoverAdvancedWirelessRedstoneBase.WirelessData { protected boolean invert; @@ -128,13 +128,13 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove // GUI stuff @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new AdvancedRedstoneTransmitterBaseUIFactory(buildContext).createWindow(); } protected class AdvancedRedstoneTransmitterBaseUIFactory extends AdvancedWirelessRedstoneBaseUIFactory { - public AdvancedRedstoneTransmitterBaseUIFactory(GT_CoverUIBuildContext buildContext) { + public AdvancedRedstoneTransmitterBaseUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -159,8 +159,8 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove builder.widget(TextWidget.dynamicString(() -> { T coverData = getCoverData(); if (coverData != null) { - return getCoverData().invert ? GT_Utility.trans("INVERTED", "Inverted") - : GT_Utility.trans("NORMAL", "Normal"); + return getCoverData().invert ? GTUtility.trans("INVERTED", "Inverted") + : GTUtility.trans("NORMAL", "Normal"); } else { return ""; } @@ -174,14 +174,14 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove protected void addUIForDataController(CoverDataControllerWidget<T> controller) { super.addUIForDataController(controller); controller.addFollower( - CoverDataFollower_ToggleButtonWidget.ofRedstone(), + CoverDataFollowerToggleButtonWidget.ofRedstone(), coverData -> coverData.invert, (coverData, state) -> { coverData.invert = state; return coverData; }, - widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal")) - .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted")) + widget -> widget.addTooltip(0, GTUtility.trans("NORMAL", "Normal")) + .addTooltip(1, GTUtility.trans("INVERTED", "Inverted")) .setPos(spaceX * 9, spaceY * getButtonRow())); } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterExternal.java index 139ec64843..71003974c5 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterExternal.java @@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -public class GT_Cover_AdvancedRedstoneTransmitterExternal - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { +public class CoverAdvancedRedstoneTransmitterExternal + extends CoverAdvancedRedstoneTransmitterBase<CoverAdvancedRedstoneTransmitterBase.TransmitterData> { - public GT_Cover_AdvancedRedstoneTransmitterExternal(ITexture coverTexture) { + public CoverAdvancedRedstoneTransmitterExternal(ITexture coverTexture) { super(TransmitterData.class, coverTexture); } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterInternal.java index 01a46fcc86..ab368e0c5b 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterInternal.java @@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -public class GT_Cover_AdvancedRedstoneTransmitterInternal - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { +public class CoverAdvancedRedstoneTransmitterInternal + extends CoverAdvancedRedstoneTransmitterBase<CoverAdvancedRedstoneTransmitterBase.TransmitterData> { - public GT_Cover_AdvancedRedstoneTransmitterInternal(ITexture coverTexture) { + public CoverAdvancedRedstoneTransmitterInternal(ITexture coverTexture) { super(TransmitterData.class, coverTexture); } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedWirelessRedstoneBase.java index 6ee9e2480f..963678a24c 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedWirelessRedstoneBase.java @@ -16,27 +16,27 @@ import com.google.common.io.ByteArrayDataInput; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.GregTech_API; -import gregtech.api.gui.modularui.GT_CoverUIBuildContext; +import gregtech.api.GregTechAPI; +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.GT_Utility; +import gregtech.api.util.CoverBehaviorBase; +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; import io.netty.buffer.ByteBuf; -public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData> - extends GT_CoverBehaviorBase<T> { +public abstract class CoverAdvancedWirelessRedstoneBase<T extends CoverAdvancedWirelessRedstoneBase.WirelessData> + extends CoverBehaviorBase<T> { - public GT_Cover_AdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) { + public CoverAdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) { super(typeToken, coverTexture); } - public static Byte getSignalAt(UUID uuid, int frequency, GT_Cover_AdvancedRedstoneReceiverBase.GateMode mode) { - Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid)); + public static Byte getSignalAt(UUID uuid, int frequency, CoverAdvancedRedstoneReceiverBase.GateMode mode) { + Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone.get(String.valueOf(uuid)); if (frequencies == null) return 0; Map<Long, Byte> signals = frequencies.get(frequency); @@ -83,7 +83,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A } public static void removeSignalAt(UUID uuid, int frequency, long hash) { - Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid)); + Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone.get(String.valueOf(uuid)); if (frequencies == null) return; frequencies.computeIfPresent(frequency, (freq, longByteMap) -> { longByteMap.remove(hash); @@ -92,7 +92,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A } public static void setSignalAt(UUID uuid, int frequency, long hash, byte value) { - Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone + Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone .computeIfAbsent(String.valueOf(uuid), k -> new ConcurrentHashMap<>()); Map<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>()); signals.put(hash, value); @@ -143,7 +143,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A @Override public String getDescriptionImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity) { - return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency + return GTUtility.trans("081", "Frequency: ") + aCoverVariable.frequency + ", Transmission: " + (aCoverVariable.uuid == null ? "Public" : "Private"); } @@ -232,7 +232,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A protected static final int spaceX = 18; protected static final int spaceY = 18; - public AdvancedWirelessRedstoneBaseUIFactory(GT_CoverUIBuildContext buildContext) { + public AdvancedWirelessRedstoneBaseUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -248,23 +248,23 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A CoverDataControllerWidget<T> dataController = new CoverDataControllerWidget<>( this::getCoverData, this::setCoverData, - GT_Cover_AdvancedWirelessRedstoneBase.this); + CoverAdvancedWirelessRedstoneBase.this); dataController.setPos(startX, startY); addUIForDataController(dataController); builder.widget(dataController) .widget( - new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 5, 4 + startY + spaceY * getFrequencyRow())) .widget( - new TextWidget(GT_Utility.trans("602", "Use Private Frequency")) + new TextWidget(GTUtility.trans("602", "Use Private Frequency")) .setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * privateExtraColumn, 4 + startY + spaceY * getButtonRow())); } protected void addUIForDataController(CoverDataControllerWidget<T> controller) { controller.addFollower( - new CoverDataFollower_NumericWidget<>(), + new CoverDataFollowerNumericWidget<>(), coverData -> (double) coverData.frequency, (coverData, state) -> { coverData.frequency = state.intValue(); @@ -275,7 +275,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A .setPos(1, 2 + spaceY * getFrequencyRow()) .setSize(spaceX * 5 - 4, 12)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofCheck(), + CoverDataFollowerToggleButtonWidget.ofCheck(), coverData -> coverData.uuid != null, (coverData, state) -> { if (state) { diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessDoesWorkDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java index 724f12b8f8..ed55280b7f 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessDoesWorkDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java @@ -13,22 +13,21 @@ import com.google.common.io.ByteArrayDataInput; 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_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; -import gregtech.common.covers.redstone.GT_Cover_WirelessDoesWorkDetector.ActivityMode; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget; import io.netty.buffer.ByteBuf; -public class GT_Cover_WirelessDoesWorkDetector - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessDoesWorkDetector.ActivityTransmitterData> { +public class CoverWirelessDoesWorkDetector + extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessDoesWorkDetector.ActivityTransmitterData> { - public GT_Cover_WirelessDoesWorkDetector(ITexture coverTexture) { + public CoverWirelessDoesWorkDetector(ITexture coverTexture) { super(ActivityTransmitterData.class, coverTexture); } @@ -105,7 +104,7 @@ public class GT_Cover_WirelessDoesWorkDetector MACHINE_ENABLED, } - public static class ActivityTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData { + public static class ActivityTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData { private ActivityMode mode; @@ -159,13 +158,13 @@ public class GT_Cover_WirelessDoesWorkDetector } @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new WirelessActivityDetectorUIFactory(buildContext).createWindow(); } private class WirelessActivityDetectorUIFactory extends AdvancedRedstoneTransmitterBaseUIFactory { - public WirelessActivityDetectorUIFactory(GT_CoverUIBuildContext buildContext) { + public WirelessActivityDetectorUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -192,11 +191,11 @@ public class GT_Cover_WirelessDoesWorkDetector ActivityMode mode = getCoverData().mode; if (mode == ActivityMode.MACHINE_ENABLED) { - return GT_Utility.trans("271", "Machine enabled"); + return GTUtility.trans("271", "Machine enabled"); } else if (mode == ActivityMode.MACHINE_IDLE) { - return GT_Utility.trans("242", "Machine idle"); + return GTUtility.trans("242", "Machine idle"); } else { - return GT_Utility.trans("241", "Recipe progress"); + return GTUtility.trans("241", "Recipe progress"); } }) @@ -210,34 +209,34 @@ public class GT_Cover_WirelessDoesWorkDetector super.addUIForDataController(controller); controller.addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == ActivityMode.RECIPE_PROGRESS, (coverData, state) -> { coverData.mode = ActivityMode.RECIPE_PROGRESS; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_PROGRESS) - .addTooltip(GT_Utility.trans("241", "Recipe progress")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_PROGRESS) + .addTooltip(GTUtility.trans("241", "Recipe progress")) .setPos(spaceX * 0, spaceY * 2)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == ActivityMode.MACHINE_IDLE, (coverData, state) -> { coverData.mode = ActivityMode.MACHINE_IDLE; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .addTooltip(GT_Utility.trans("242", "Machine idle")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK) + .addTooltip(GTUtility.trans("242", "Machine idle")) .setPos(spaceX * 1, spaceY * 2)) .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == ActivityMode.MACHINE_ENABLED, (coverData, state) -> { coverData.mode = ActivityMode.MACHINE_ENABLED; return coverData; }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON) - .addTooltip(GT_Utility.trans("271", "Machine enabled")) + widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON) + .addTooltip(GTUtility.trans("271", "Machine enabled")) .setPos(spaceX * 2, spaceY * 2)); } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java index 9a9d419be6..cfea9b7b28 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java @@ -16,20 +16,20 @@ import com.google.common.io.ByteArrayDataInput; 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.CoverUIBuildContext; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; -import gregtech.common.covers.GT_Cover_LiquidMeter; +import gregtech.common.covers.CoverLiquidMeter; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget; import io.netty.buffer.ByteBuf; -public class GT_Cover_WirelessFluidDetector - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> { +public class CoverWirelessFluidDetector + extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessFluidDetector.FluidTransmitterData> { - public GT_Cover_WirelessFluidDetector(ITexture coverTexture) { + public CoverWirelessFluidDetector(ITexture coverTexture) { super(FluidTransmitterData.class, coverTexture); } @@ -46,7 +46,7 @@ public class GT_Cover_WirelessFluidDetector @Override public FluidTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInputRedstone, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { - final byte signal = GT_Cover_LiquidMeter + final byte signal = CoverLiquidMeter .computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold); final long hash = hashCoverCoords(aTileEntity, side); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); @@ -66,7 +66,7 @@ public class GT_Cover_WirelessFluidDetector return true; } - public static class FluidTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData { + public static class FluidTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData { /** The special value {@code 0} means threshold check is disabled. */ private int threshold; @@ -123,7 +123,7 @@ public class GT_Cover_WirelessFluidDetector // GUI stuff @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new WirelessFluidDetectorUIFactory(buildContext).createWindow(); } @@ -131,7 +131,7 @@ public class GT_Cover_WirelessFluidDetector private int maxCapacity; - public WirelessFluidDetectorUIFactory(GT_CoverUIBuildContext buildContext) { + public WirelessFluidDetectorUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -150,7 +150,7 @@ public class GT_Cover_WirelessFluidDetector setMaxCapacity(); super.addUIWidgets(builder); builder.widget( - new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)); } @@ -158,7 +158,7 @@ public class GT_Cover_WirelessFluidDetector protected void addUIForDataController(CoverDataControllerWidget<FluidTransmitterData> controller) { super.addUIForDataController(controller); controller.addFollower( - new CoverDataFollower_NumericWidget<>(), + new CoverDataFollowerNumericWidget<>(), coverData -> (double) coverData.threshold, (coverData, state) -> { coverData.threshold = state.intValue(); diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessItemDetector.java index 3cc7f60984..19cefdabcf 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessItemDetector.java @@ -17,23 +17,23 @@ 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.CoverUIBuildContext; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; -import gregtech.common.covers.GT_Cover_ItemMeter; +import gregtech.common.covers.CoverItemMeter; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget; import gregtech.common.gui.modularui.widget.ItemWatcherSlotWidget; -import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase; +import gregtech.common.tileentities.storage.MTEDigitalChestBase; import io.netty.buffer.ByteBuf; -public class GT_Cover_WirelessItemDetector - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessItemDetector.ItemTransmitterData> { +public class CoverWirelessItemDetector + extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessItemDetector.ItemTransmitterData> { - public GT_Cover_WirelessItemDetector(ITexture coverTexture) { + public CoverWirelessItemDetector(ITexture coverTexture) { super(ItemTransmitterData.class, coverTexture); } @@ -50,7 +50,7 @@ public class GT_Cover_WirelessItemDetector @Override public ItemTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInputRedstone, int aCoverID, ItemTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { - byte signal = GT_Cover_ItemMeter.computeSignalBasedOnItems( + byte signal = CoverItemMeter.computeSignalBasedOnItems( aTileEntity, aCoverVariable.invert, aCoverVariable.threshold, @@ -74,7 +74,7 @@ public class GT_Cover_WirelessItemDetector return true; } - public static class ItemTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData { + public static class ItemTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData { /** * The special value {@code -1} means all slots. @@ -143,7 +143,7 @@ public class GT_Cover_WirelessItemDetector // GUI stuff @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new WirelessItemDetectorUIFactory(buildContext).createWindow(); } @@ -159,14 +159,14 @@ public class GT_Cover_WirelessItemDetector @Override public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) { if (number < 0) { - return toAppendTo.append(GT_Utility.trans("ALL", "All")); + return toAppendTo.append(GTUtility.trans("ALL", "All")); } else { return super.format(number, toAppendTo, pos); } } }; - public WirelessItemDetectorUIFactory(GT_CoverUIBuildContext buildContext) { + public WirelessItemDetectorUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -189,10 +189,10 @@ public class GT_Cover_WirelessItemDetector new ItemWatcherSlotWidget().setGetter(this::getTargetItem) .setPos(startX + spaceX * 4 - 1, startY + spaceY * 3)) .widget( - new TextWidget(GT_Utility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)) .widget( - new TextWidget(GT_Utility.trans("254", "Detect Slot #")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("254", "Detect Slot #")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX + spaceX * 5, 4 + startY + spaceY * 3)); } @@ -200,7 +200,7 @@ public class GT_Cover_WirelessItemDetector protected void addUIForDataController(CoverDataControllerWidget<ItemTransmitterData> controller) { super.addUIForDataController(controller); controller.addFollower( - new CoverDataFollower_NumericWidget<>(), + new CoverDataFollowerNumericWidget<>(), coverData -> (double) coverData.threshold, (coverData, state) -> { coverData.threshold = state.intValue(); @@ -212,7 +212,7 @@ public class GT_Cover_WirelessItemDetector .setPos(1, 2 + spaceY * 2) .setSize(spaceX * 5 - 4, 12)) .addFollower( - new CoverDataFollower_NumericWidget<>(), + new CoverDataFollowerNumericWidget<>(), coverData -> (double) coverData.slot, (coverData, state) -> { coverData.slot = state.intValue(); @@ -229,7 +229,7 @@ public class GT_Cover_WirelessItemDetector private void setMaxSlot() { final ICoverable tile = getUIBuildContext().getTile(); if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile - && !(gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) { + && !(gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase)) { maxSlot = tile.getSizeInventory() - 1; } else { maxSlot = -1; @@ -239,7 +239,7 @@ public class GT_Cover_WirelessItemDetector private void setMaxThreshold() { final ICoverable tile = getUIBuildContext().getTile(); if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile - && gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase) { + && gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase) { maxThreshold = gtTile.getMaxItemCount(); } else { maxThreshold = maxSlot > 0 ? maxSlot * 64 : Integer.MAX_VALUE; diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessMaintenanceDetector.java index f6c76591df..f3d62f2c81 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessMaintenanceDetector.java @@ -14,24 +14,24 @@ import com.google.common.io.ByteArrayDataInput; 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.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; import gregtech.api.util.ISerializableObject; -import gregtech.common.covers.GT_Cover_NeedMaintainance; +import gregtech.common.covers.CoverNeedMaintainance; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget; import io.netty.buffer.ByteBuf; -public class GT_Cover_WirelessMaintenanceDetector - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessMaintenanceDetector.MaintenanceTransmitterData> { +public class CoverWirelessMaintenanceDetector + extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessMaintenanceDetector.MaintenanceTransmitterData> { - public GT_Cover_WirelessMaintenanceDetector(ITexture coverTexture) { + public CoverWirelessMaintenanceDetector(ITexture coverTexture) { super(MaintenanceTransmitterData.class, coverTexture); } @@ -51,7 +51,7 @@ public class GT_Cover_WirelessMaintenanceDetector if (tileEntity instanceof IGregTechTileEntity) { IMetaTileEntity metaTE = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); - if (metaTE instanceof GT_MetaTileEntity_MultiBlockBase multiTE) { + if (metaTE instanceof MTEMultiBlockBase multiTE) { int ideal = multiTE.getIdealStatus(); int real = multiTE.getRepairStatus(); @@ -61,9 +61,9 @@ public class GT_Cover_WirelessMaintenanceDetector >= coverVariable.mode.ordinal(); case ROTOR_80, ROTOR_100 -> { ItemStack rotor = multiTE.getRealInventory()[1]; - if (GT_Cover_NeedMaintainance.isRotor(rotor)) { - long max = GT_MetaGenerated_Tool.getToolMaxDamage(rotor); - long current = GT_MetaGenerated_Tool.getToolDamage(rotor); + if (CoverNeedMaintainance.isRotor(rotor)) { + long max = MetaGeneratedTool.getToolMaxDamage(rotor); + long current = MetaGeneratedTool.getToolDamage(rotor); if (coverVariable.mode == MaintenanceMode.ROTOR_80) { signal = current >= max * 8 / 10; @@ -128,7 +128,7 @@ public class GT_Cover_WirelessMaintenanceDetector ROTOR_100 } - public static class MaintenanceTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData { + public static class MaintenanceTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData { private MaintenanceMode mode; @@ -187,13 +187,13 @@ public class GT_Cover_WirelessMaintenanceDetector ">= 4 Issues", ">= 5 Issues", "Rotor < 20%", "Rotor ≈ 0%" }; @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new WirelessMaintenanceDetectorUIFactory(buildContext).createWindow(); } private class WirelessMaintenanceDetectorUIFactory extends AdvancedRedstoneTransmitterBaseUIFactory { - public WirelessMaintenanceDetectorUIFactory(GT_CoverUIBuildContext buildContext) { + public WirelessMaintenanceDetectorUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -228,13 +228,13 @@ public class GT_Cover_WirelessMaintenanceDetector for (int i = 0; i < 8; i++) { final int index = i; controller.addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), + CoverDataFollowerToggleButtonWidget.ofDisableable(), coverData -> coverData.mode == MaintenanceMode.values()[index], (coverData, state) -> { coverData.mode = MaintenanceMode.values()[index]; return coverData; }, - widget -> widget.setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT) + widget -> widget.setToggleTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK, GTUITextures.TRANSPARENT) .setPos(spaceX * (index % 2 == 0 ? 0 : 6), spaceY * (2 + index / 2))); } } |