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/gui | |
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/gui')
-rw-r--r-- | src/main/java/gregtech/api/gui/GUIColorOverride.java (renamed from src/main/java/gregtech/api/gui/GT_GUIColorOverride.java) | 20 | ||||
-rw-r--r-- | src/main/java/gregtech/api/gui/modularui/CoverUIBuildContext.java (renamed from src/main/java/gregtech/api/gui/modularui/GT_CoverUIBuildContext.java) | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/api/gui/modularui/GTUIInfos.java (renamed from src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java) | 25 | ||||
-rw-r--r-- | src/main/java/gregtech/api/gui/modularui/GTUITextures.java (renamed from src/main/java/gregtech/api/gui/modularui/GT_UITextures.java) | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/api/gui/modularui/GUITextureSet.java | 31 | ||||
-rw-r--r-- | src/main/java/gregtech/api/gui/widgets/CoverTickRateButton.java (renamed from src/main/java/gregtech/api/gui/widgets/GT_CoverTickRateButton.java) | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/api/gui/widgets/LockedWhileActiveButton.java (renamed from src/main/java/gregtech/api/gui/widgets/GT_LockedWhileActiveButton.java) | 8 | ||||
-rw-r--r-- | src/main/java/gregtech/api/gui/widgets/PhantomItemButton.java (renamed from src/main/java/gregtech/api/gui/widgets/GT_PhantomItemButton.java) | 8 |
8 files changed, 53 insertions, 57 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java b/src/main/java/gregtech/api/gui/GUIColorOverride.java index 6ade7b030d..aa796d2b63 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java +++ b/src/main/java/gregtech/api/gui/GUIColorOverride.java @@ -15,11 +15,11 @@ import com.google.common.util.concurrent.UncheckedExecutionException; import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.Side; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.util.ColorsMetadataSection; @SuppressWarnings("UnstableApiUsage") -public class GT_GUIColorOverride { +public class GUIColorOverride { private static final Object NOT_FOUND = new Object(); private static final LoadingCache<ResourceLocation, Object> cache = CacheBuilder.newBuilder() @@ -39,29 +39,29 @@ public class GT_GUIColorOverride { return NOT_FOUND; } }); - private static final GT_GUIColorOverride FALLBACK = new GT_GUIColorOverride(); + private static final GUIColorOverride FALLBACK = new GUIColorOverride(); private ColorsMetadataSection cmSection; - public static GT_GUIColorOverride get(String fullLocation) { + public static GUIColorOverride get(String fullLocation) { // see other get for more info if (FMLLaunchHandler.side() != Side.CLIENT) return FALLBACK; - return new GT_GUIColorOverride(new ResourceLocation(fullLocation)); + return new GUIColorOverride(new ResourceLocation(fullLocation)); } - public static GT_GUIColorOverride get(ResourceLocation path) { + public static GUIColorOverride get(ResourceLocation path) { // use dummy fallback if there isn't such thing as a resource pack. // #side() usually has two possible return value, but since this might be called by test code, it might // also return null when in test env. Using #isClient will cause a NPE. A plain inequality test won't. // FMLCommonHandler's #getSide() might trigger a NPE when in test env, so no. if (FMLLaunchHandler.side() != Side.CLIENT) return FALLBACK; - return new GT_GUIColorOverride(path); + return new GUIColorOverride(path); } - private GT_GUIColorOverride() { + private GUIColorOverride() { cmSection = null; } - private GT_GUIColorOverride(ResourceLocation resourceLocation) { + private GUIColorOverride(ResourceLocation resourceLocation) { try { Object metadata = cache.get(resourceLocation); if (metadata != NOT_FOUND) cmSection = (ColorsMetadataSection) metadata; @@ -80,7 +80,7 @@ public class GT_GUIColorOverride { } public boolean sGuiTintingEnabled() { - return sLoaded() ? cmSection.sGuiTintingEnabled() : GregTech_API.sColoredGUI; + return sLoaded() ? cmSection.sGuiTintingEnabled() : GregTechAPI.sColoredGUI; } public boolean sLoaded() { diff --git a/src/main/java/gregtech/api/gui/modularui/GT_CoverUIBuildContext.java b/src/main/java/gregtech/api/gui/modularui/CoverUIBuildContext.java index f98d6099fc..2bf8795c5c 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_CoverUIBuildContext.java +++ b/src/main/java/gregtech/api/gui/modularui/CoverUIBuildContext.java @@ -7,7 +7,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import gregtech.api.interfaces.tileentity.ICoverable; -public class GT_CoverUIBuildContext extends UIBuildContext { +public class CoverUIBuildContext extends UIBuildContext { // cover data is not synced to client, while ID is private final int coverID; @@ -24,7 +24,7 @@ public class GT_CoverUIBuildContext extends UIBuildContext { * @param anotherWindow If cover UI is shown on top of another window * @param guiColorization The color used to render machine's GUI */ - public GT_CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile, + public CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile, boolean anotherWindow, int guiColorization) { super(player); this.coverID = coverID; @@ -41,7 +41,7 @@ public class GT_CoverUIBuildContext extends UIBuildContext { * @param tile Tile this cover is attached to * @param anotherWindow If cover GUI is shown in opened on top of another window */ - public GT_CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile, + public CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile, boolean anotherWindow) { this(player, coverID, side, tile, anotherWindow, tile.getGUIColorization()); } diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java b/src/main/java/gregtech/api/gui/modularui/GTUIInfos.java index ea9a39bdf8..ede4b54e08 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java +++ b/src/main/java/gregtech/api/gui/modularui/GTUIInfos.java @@ -23,13 +23,13 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; -import gregtech.api.net.GT_Packet_SendCoverData; -import gregtech.api.util.GT_CoverBehaviorBase; +import gregtech.api.net.GTPacketSendCoverData; +import gregtech.api.util.CoverBehaviorBase; -public class GT_UIInfos { +public class GTUIInfos { public static void init() {} @@ -70,7 +70,7 @@ public class GT_UIInfos { .container((player, world, x, y, z) -> { final TileEntity te = world.getTileEntity(x, y, z); if (!(te instanceof ICoverable gtTileEntity)) return null; - final GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); + final CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); return createCoverContainer( player, cover::createWindow, @@ -83,7 +83,7 @@ public class GT_UIInfos { if (!world.isRemote) return null; final TileEntity te = world.getTileEntity(x, y, z); if (!(te instanceof ICoverable gtTileEntity)) return null; - final GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); + final CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); return createCoverGuiContainer( player, cover::createWindow, @@ -109,13 +109,13 @@ public class GT_UIInfos { } /** - * Opens cover UI, created by {@link GT_CoverBehaviorBase#createWindow}. + * Opens cover UI, created by {@link CoverBehaviorBase#createWindow}. */ public static void openCoverUI(ICoverable tileEntity, EntityPlayer player, ForgeDirection side) { if (tileEntity.isClientSide()) return; - GT_Values.NW.sendToPlayer( - new GT_Packet_SendCoverData( + GTValues.NW.sendToPlayer( + new GTPacketSendCoverData( side, tileEntity.getCoverIDAtSide(side), tileEntity.getComplexCoverDataAtSide(side), @@ -162,9 +162,9 @@ public class GT_UIInfos { } private static ModularUIContainer createCoverContainer(EntityPlayer player, - Function<GT_CoverUIBuildContext, ModularWindow> windowCreator, Runnable onWidgetUpdate, int coverID, + Function<CoverUIBuildContext, ModularWindow> windowCreator, Runnable onWidgetUpdate, int coverID, ForgeDirection side, ICoverable tile) { - final GT_CoverUIBuildContext buildContext = new GT_CoverUIBuildContext(player, coverID, side, tile, false); + final CoverUIBuildContext buildContext = new CoverUIBuildContext(player, coverID, side, tile, false); final ModularWindow window = windowCreator.apply(buildContext); if (window == null) return null; return new ModularUIContainer(new ModularUIContext(buildContext, onWidgetUpdate), window); @@ -172,8 +172,7 @@ public class GT_UIInfos { @SideOnly(Side.CLIENT) private static ModularGui createCoverGuiContainer(EntityPlayer player, - Function<GT_CoverUIBuildContext, ModularWindow> windowCreator, int coverID, ForgeDirection side, - ICoverable tile) { + Function<CoverUIBuildContext, ModularWindow> windowCreator, int coverID, ForgeDirection side, ICoverable tile) { final ModularUIContainer container = createCoverContainer(player, windowCreator, null, coverID, side, tile); if (container == null) { return null; diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java b/src/main/java/gregtech/api/gui/modularui/GTUITextures.java index 6031399c06..125e1640b0 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java +++ b/src/main/java/gregtech/api/gui/modularui/GTUITextures.java @@ -10,7 +10,7 @@ import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture; import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture; import com.gtnewhorizons.modularui.api.drawable.UITexture; -public class GT_UITextures { +public class GTUITextures { public static final UITexture TRANSPARENT = UITexture.fullImage(GregTech.ID, "gui/picture/transparent"); diff --git a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java index 18d7741421..0063d59346 100644 --- a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java +++ b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java @@ -30,29 +30,26 @@ public class GUITextureSet { private UITexture gregtechLogo; public static final GUITextureSet DEFAULT = new GUITextureSet() - .setMainBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT) + .setMainBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT) .setItemSlot(ModularUITextures.ITEM_SLOT) .setFluidSlot(ModularUITextures.FLUID_SLOT) - .setCoverTab( - GT_UITextures.TAB_COVER_NORMAL, - GT_UITextures.TAB_COVER_HIGHLIGHT, - GT_UITextures.TAB_COVER_DISABLED) - .setTitleTab(GT_UITextures.TAB_TITLE, GT_UITextures.TAB_TITLE_DARK, GT_UITextures.TAB_TITLE_ANGULAR) - .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT); + .setCoverTab(GTUITextures.TAB_COVER_NORMAL, GTUITextures.TAB_COVER_HIGHLIGHT, GTUITextures.TAB_COVER_DISABLED) + .setTitleTab(GTUITextures.TAB_TITLE, GTUITextures.TAB_TITLE_DARK, GTUITextures.TAB_TITLE_ANGULAR) + .setGregTechLogo(GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT); public static final Function<SteamVariant, GUITextureSet> STEAM = steamVariant -> new GUITextureSet() - .setMainBackground(GT_UITextures.BACKGROUND_STEAM.get(steamVariant)) - .setItemSlot(GT_UITextures.SLOT_ITEM_STEAM.get(steamVariant)) - .setFluidSlot(GT_UITextures.SLOT_FLUID_STEAM.get(steamVariant)) + .setMainBackground(GTUITextures.BACKGROUND_STEAM.get(steamVariant)) + .setItemSlot(GTUITextures.SLOT_ITEM_STEAM.get(steamVariant)) + .setFluidSlot(GTUITextures.SLOT_FLUID_STEAM.get(steamVariant)) .setCoverTab( - GT_UITextures.TAB_COVER_STEAM_NORMAL.get(steamVariant), - GT_UITextures.TAB_COVER_STEAM_HIGHLIGHT.get(steamVariant), - GT_UITextures.TAB_COVER_STEAM_DISABLED.get(steamVariant)) + GTUITextures.TAB_COVER_STEAM_NORMAL.get(steamVariant), + GTUITextures.TAB_COVER_STEAM_HIGHLIGHT.get(steamVariant), + GTUITextures.TAB_COVER_STEAM_DISABLED.get(steamVariant)) .setTitleTab( - GT_UITextures.TAB_TITLE_STEAM.getAdaptable(steamVariant), - GT_UITextures.TAB_TITLE_DARK_STEAM.getAdaptable(steamVariant), - GT_UITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable(steamVariant)) - .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get(steamVariant)); + GTUITextures.TAB_TITLE_STEAM.getAdaptable(steamVariant), + GTUITextures.TAB_TITLE_DARK_STEAM.getAdaptable(steamVariant), + GTUITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable(steamVariant)) + .setGregTechLogo(GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get(steamVariant)); public GUITextureSet() {} diff --git a/src/main/java/gregtech/api/gui/widgets/GT_CoverTickRateButton.java b/src/main/java/gregtech/api/gui/widgets/CoverTickRateButton.java index 883ffb4079..ab05a98925 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_CoverTickRateButton.java +++ b/src/main/java/gregtech/api/gui/widgets/CoverTickRateButton.java @@ -1,6 +1,6 @@ package gregtech.api.gui.widgets; -import static gregtech.api.gui.modularui.GT_UITextures.OVERLAY_BUTTON_HOURGLASS; +import static gregtech.api.gui.modularui.GTUITextures.OVERLAY_BUTTON_HOURGLASS; import static gregtech.common.covers.CoverInfo.MAX_TICK_RATE_ADDITION; import java.util.List; @@ -16,18 +16,18 @@ import com.gtnewhorizons.modularui.api.widget.Widget; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.common.covers.CoverInfo; -public class GT_CoverTickRateButton extends ButtonWidget { +public class CoverTickRateButton extends ButtonWidget { - private static final UITexture BACKGROUND = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0, 1, 0.5f); + private static final UITexture BACKGROUND = GTUITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0, 1, 0.5f); private final CoverInfo coverInfo; private int clientTickRate; private int tickRateAddition; - public GT_CoverTickRateButton(@NotNull CoverInfo coverInfo, @NotNull IWidgetBuilder<?> builder) { + public CoverTickRateButton(@NotNull CoverInfo coverInfo, @NotNull IWidgetBuilder<?> builder) { this.coverInfo = coverInfo; this.clientTickRate = coverInfo.getTickRate(); this.tickRateAddition = coverInfo.getTickRateAddition(); diff --git a/src/main/java/gregtech/api/gui/widgets/GT_LockedWhileActiveButton.java b/src/main/java/gregtech/api/gui/widgets/LockedWhileActiveButton.java index 9a93a8fadf..0e793372c5 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_LockedWhileActiveButton.java +++ b/src/main/java/gregtech/api/gui/widgets/LockedWhileActiveButton.java @@ -16,15 +16,15 @@ import com.gtnewhorizons.modularui.api.widget.Widget; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.tileentity.IMachineProgress; -public class GT_LockedWhileActiveButton extends ButtonWidget { +public class LockedWhileActiveButton extends ButtonWidget { @NotNull private final IMachineProgress machine; - public GT_LockedWhileActiveButton(@NotNull IMachineProgress machine, @NotNull ModularWindow.Builder builder) { + public LockedWhileActiveButton(@NotNull IMachineProgress machine, @NotNull ModularWindow.Builder builder) { super(); this.machine = machine; @@ -74,7 +74,7 @@ public class GT_LockedWhileActiveButton extends ButtonWidget { private IDrawable[] appendLockedOverlay(@NotNull IDrawable[] drawables) { if (machine.isActive()) { final IDrawable[] copy = Arrays.copyOf(drawables, drawables.length + 1); - copy[drawables.length] = GT_UITextures.OVERLAY_BUTTON_LOCKED; + copy[drawables.length] = GTUITextures.OVERLAY_BUTTON_LOCKED; return copy; } return drawables; diff --git a/src/main/java/gregtech/api/gui/widgets/GT_PhantomItemButton.java b/src/main/java/gregtech/api/gui/widgets/PhantomItemButton.java index 4e2d144aa7..e13266b33f 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_PhantomItemButton.java +++ b/src/main/java/gregtech/api/gui/widgets/PhantomItemButton.java @@ -16,18 +16,18 @@ import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.metatileentity.IItemLockable; /** * Creates a phantom item in a GUI. Useful for filtering. */ -public class GT_PhantomItemButton extends SlotWidget { +public class PhantomItemButton extends SlotWidget { public static final IDrawable[] FILTER_BACKGROUND = { ModularUITextures.ITEM_SLOT, - GT_UITextures.OVERLAY_SLOT_FILTER }; + GTUITextures.OVERLAY_SLOT_FILTER }; - public GT_PhantomItemButton(final IItemLockable delegate) { + public PhantomItemButton(final IItemLockable delegate) { super(BaseSlot.phantom(new PhantomItemDelegate(delegate), 0)); controlsAmount = false; } |