aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/gui/modularui
diff options
context:
space:
mode:
authorLéa Gris <lea.gris@noiraude.net>2023-03-30 21:48:25 +0200
committerGitHub <noreply@github.com>2023-03-30 21:48:25 +0200
commit7ac8db9ecf8bd8775b5249e48f8ac9a84d675b4d (patch)
tree85faa9ccd9c8d25f3b4cdf36beb03492b51d0462 /src/main/java/gregtech/api/gui/modularui
parent8187e9841b50a5bd1e713655d7b6598ffa8e8ac6 (diff)
downloadGT5-Unofficial-7ac8db9ecf8bd8775b5249e48f8ac9a84d675b4d.tar.gz
GT5-Unofficial-7ac8db9ecf8bd8775b5249e48f8ac9a84d675b4d.tar.bz2
GT5-Unofficial-7ac8db9ecf8bd8775b5249e48f8ac9a84d675b4d.zip
Implementation of A more useful Lava Boiler (#1814)
* Fix Missing null/empty checks on boilers base class Would cause a deadlock on empty boilers unable to start, as it tried to transfer null or empty FuildStack. * Fix Sound coordinates so it can be centered on block * WIP Lava Boiler Improuvements * :spotlessapply * Add GUI slot block background textures * Restrict ash slot to remove items only (disallow inserting items there) * Finalize GUI and Obsidian Production mechanic * Fix still output Obisidian from cooled Lava even when no more Lava available * Lava Boiler Textures: Improves GUI and TOP - Fluid slot now has Steam themed textures - Item slot block background gets a smaller icon that hides behind actual item blocks - Boiler TOP is now a drain texture instead of pump * Add null check
Diffstat (limited to 'src/main/java/gregtech/api/gui/modularui')
-rw-r--r--src/main/java/gregtech/api/gui/modularui/GT_UITextures.java3
-rw-r--r--src/main/java/gregtech/api/gui/modularui/GUITextureSet.java1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java
index 4b6030fa19..a1d1be02ac 100644
--- a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java
+++ b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java
@@ -25,6 +25,7 @@ public class GT_UITextures {
.of(MODID, "gui/background/text_field_light_gray", 61, 12, 1);
public static final SteamTexture SLOT_ITEM_STEAM = SteamTexture.fullImage(MODID, "gui/slot/item_%s");
+ public static final SteamTexture SLOT_FLUID_STEAM = SteamTexture.fullImage(MODID, "gui/slot/fluid_%s");
public static final AdaptableUITexture SLOT_DARK_GRAY = AdaptableUITexture
.of(MODID, "gui/slot/dark_gray", 18, 18, 1);
public static final AdaptableUITexture SLOT_MAINTENANCE = AdaptableUITexture
@@ -68,6 +69,8 @@ public class GT_UITextures {
public static final UITexture OVERLAY_SLOT_DUST = UITexture.fullImage(MODID, "gui/overlay_slot/dust");
public static final SteamTexture OVERLAY_SLOT_DUST_STEAM = SteamTexture
.fullImage(MODID, "gui/overlay_slot/dust_%s");
+ public static final SteamTexture OVERLAY_SLOT_BLOCK_STEAM = SteamTexture
+ .fullImage(MODID, "gui/overlay_slot/block_%s");
public static final UITexture OVERLAY_SLOT_EXPLOSIVE = UITexture.fullImage(MODID, "gui/overlay_slot/explosive");
public static final UITexture OVERLAY_SLOT_EXTRUDER_SHAPE = UITexture
.fullImage(MODID, "gui/overlay_slot/extruder_shape");
diff --git a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java
index 1bacff886a..8b6e9f85ec 100644
--- a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java
+++ b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java
@@ -41,6 +41,7 @@ public class GUITextureSet {
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))
.setCoverTab(
GT_UITextures.TAB_COVER_STEAM_NORMAL.get(steamVariant),
GT_UITextures.TAB_COVER_STEAM_HIGHLIGHT.get(steamVariant),