diff options
Diffstat (limited to 'src/main/java/gregtech/api')
4 files changed, 33 insertions, 12 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), diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java b/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java index 9d6de7df83..dfee28cf47 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java @@ -8,12 +8,13 @@ import gregtech.api.util.GT_Utility; public class GT_Runnable_Sound implements Runnable { - private final int mX, mY, mZ, mTimeUntilNextSound; + private final double mX, mY, mZ; + private final int mTimeUntilNextSound; private final World mWorld; private final ResourceLocation mSoundResourceLocation; private final float mSoundStrength, mSoundModulation; - public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, + public GT_Runnable_Sound(World aWorld, double aX, double aY, double aZ, int aTimeUntilNextSound, ResourceLocation aSoundResourceLocation, float aSoundStrength, float aSoundModulation) { mWorld = aWorld; mX = aX; @@ -26,16 +27,32 @@ public class GT_Runnable_Sound implements Runnable { } /** - * @deprecated Use {@link #GT_Runnable_Sound(World, int, int, int, int, ResourceLocation, float, float)} + * @deprecated Use {@link #GT_Runnable_Sound(World, double, double, double, int, ResourceLocation, float, float)} + */ + public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, + ResourceLocation aSoundResourceLocation, float aSoundStrength, float aSoundModulation) { + this( + aWorld, + (double) aX + 0.5D, + (double) aY + 0.5D, + (double) aZ + 0.5D, + aTimeUntilNextSound, + aSoundResourceLocation, + aSoundStrength, + aSoundModulation); + } + + /** + * @deprecated Use {@link #GT_Runnable_Sound(World, double, double, double, int, ResourceLocation, float, float)} */ @Deprecated public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, String aSoundName, float aSoundStrength, float aSoundModulation) { this( aWorld, - aX, - aY, - aZ, + (double) aX + 0.5D, + (double) aY + 0.5D, + (double) aZ + 0.5D, aTimeUntilNextSound, new ResourceLocation(aSoundName), aSoundStrength, diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 577364c0f7..4dd99e3ff7 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2165,9 +2165,9 @@ public class GT_Utility { if (GregTech_API.sMultiThreadedSounds) new Thread( new GT_Runnable_Sound( GT.getThePlayer().worldObj, - MathHelper.floor_double(aX), - MathHelper.floor_double(aY), - MathHelper.floor_double(aZ), + aX, + aY, + aZ, aTimeUntilNextSound, aSoundResourceLocation, aSoundStrength, @@ -2175,9 +2175,9 @@ public class GT_Utility { "Sound Effect").start(); else new GT_Runnable_Sound( GT.getThePlayer().worldObj, - MathHelper.floor_double(aX), - MathHelper.floor_double(aY), - MathHelper.floor_double(aZ), + aX, + aY, + aZ, aTimeUntilNextSound, aSoundResourceLocation, aSoundStrength, |