From 5ae9f68281032ce730011cc3fe0ca39c02978729 Mon Sep 17 00:00:00 2001 From: King Lemming Date: Tue, 2 Jan 2018 00:10:53 -0500 Subject: [PATCH] Minor adjustment to relay GUI. Signed-off-by: King Lemming --- build.gradle | 2 +- .../thermaldynamics/block/BlockTDBase.java | 2 +- .../thermaldynamics/gui/client/GuiRelay.java | 16 ++++++-------- .../assets/thermaldynamics/lang/en_US.lang | 20 +++++++++--------- .../thermaldynamics/textures/gui/relay.png | Bin 10104 -> 11095 bytes 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 1a954a0..c10525b 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ dependencies { compile "mezz.jei:jei_${config.jei_mc_version}:${config.jei_version}" } -version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "16") +version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "1") println config.mc_version + "-" + config.forge_version // Setup the Forge/Minecraft plugin data. Specify the preferred Forge/Minecraft version here. diff --git a/src/main/java/cofh/thermaldynamics/block/BlockTDBase.java b/src/main/java/cofh/thermaldynamics/block/BlockTDBase.java index 3b50c79..008fd4c 100644 --- a/src/main/java/cofh/thermaldynamics/block/BlockTDBase.java +++ b/src/main/java/cofh/thermaldynamics/block/BlockTDBase.java @@ -38,7 +38,7 @@ public abstract class BlockTDBase extends BlockCoreTile { protected BlockTDBase(Material material) { - super(material); + super(material, "thermaldynamics"); setSoundType(SoundType.STONE); setCreativeTab(ThermalDynamics.tabCommon); } diff --git a/src/main/java/cofh/thermaldynamics/gui/client/GuiRelay.java b/src/main/java/cofh/thermaldynamics/gui/client/GuiRelay.java index c0aa73f..a93a34f 100644 --- a/src/main/java/cofh/thermaldynamics/gui/client/GuiRelay.java +++ b/src/main/java/cofh/thermaldynamics/gui/client/GuiRelay.java @@ -93,15 +93,13 @@ private void update() { buttonInvert.setToolTip("info.thermaldynamics.relay.invert." + relay.invert); - int colorX = relay.color * 20; - if (relay.color > 11) { - colorX -= 100; - } + int colorX = (relay.color % 8) * 20; + int colorY = relay.color < 8 ? 124 : 164; buttonColor.setSheetX(colorX); buttonColor.setHoverX(colorX); - buttonColor.setSheetY(relay.color <= 11 ? 164 : 204); - buttonColor.setHoverY(relay.color <= 11 ? 184 : 224); + buttonColor.setSheetY(colorY); + buttonColor.setHoverY(colorY + 20); buttonColor.setToolTip("info.thermaldynamics.relay.color." + relay.color); @@ -116,15 +114,15 @@ public void handleElementButtonClick(String buttonName, int mouseButton) { if ("ButtonInvert".equals(buttonName)) { relay.invert = (byte) ((relay.invert + 4 + v) % 4); relay.sendUpdatePacket(); - playClickSound(v == 1 ? 0.5f : 0.8f); + playClickSound(v == 1 ? 0.6f : 0.5f); } else if ("ButtonType".equals(buttonName)) { relay.type = (byte) ((relay.type + 3 + v) % 3); relay.sendUpdatePacket(); - playClickSound(v == 1 ? 0.5f : 0.8f); + playClickSound(v == 1 ? 0.6f : 0.5f); } else if ("ButtonColor".equals(buttonName)) { relay.color = (byte) ((relay.color + 16 + v) % 16); relay.sendUpdatePacket(); - playClickSound(v == 1 ? 0.5f : 0.8f); + playClickSound(v == 1 ? 0.6f : 0.5f); } update(); } diff --git a/src/main/resources/assets/thermaldynamics/lang/en_US.lang b/src/main/resources/assets/thermaldynamics/lang/en_US.lang index ce09060..4982418 100644 --- a/src/main/resources/assets/thermaldynamics/lang/en_US.lang +++ b/src/main/resources/assets/thermaldynamics/lang/en_US.lang @@ -64,16 +64,6 @@ info.thermaldynamics.info.tracker.avg=5 Sec. Avg. Level info.thermaldynamics.info.tracker.avgInOut=5 Sec. Avg. In/Out info.thermaldynamics.info.tracker.cur=Current Level -info.thermaldynamics.relay.gridRS=Duct Power -info.thermaldynamics.relay.invert.0=Scaled -info.thermaldynamics.relay.invert.1=Inverted Scaled -info.thermaldynamics.relay.invert.2=Threshold -info.thermaldynamics.relay.invert.3=Inverted Threshold -info.thermaldynamics.relay.relayRS=Relay Power -info.thermaldynamics.relay.threshold=Threshold >= -info.thermaldynamics.relay.type.0=Redstone Input -info.thermaldynamics.relay.type.1=Redstone Output -info.thermaldynamics.relay.type.2=Comparator Input info.thermaldynamics.relay.color.0=Red info.thermaldynamics.relay.color.1=Green info.thermaldynamics.relay.color.2=Brown @@ -90,6 +80,16 @@ info.thermaldynamics.relay.color.12=Magenta info.thermaldynamics.relay.color.13=Orange info.thermaldynamics.relay.color.14=White info.thermaldynamics.relay.color.15=Black +info.thermaldynamics.relay.gridRS=Duct Power +info.thermaldynamics.relay.invert.0=Scaled +info.thermaldynamics.relay.invert.1=Inverted Scaled +info.thermaldynamics.relay.invert.2=Threshold +info.thermaldynamics.relay.invert.3=Inverted Threshold +info.thermaldynamics.relay.relayRS=Relay Power +info.thermaldynamics.relay.threshold=Threshold >= +info.thermaldynamics.relay.type.0=Redstone Input +info.thermaldynamics.relay.type.1=Redstone Output +info.thermaldynamics.relay.type.2=Comparator Input info.thermaldynamics.servo.decStackSize=Dec. Stack Size Extracted info.thermaldynamics.servo.extractRate=Extraction Rate diff --git a/src/main/resources/assets/thermaldynamics/textures/gui/relay.png b/src/main/resources/assets/thermaldynamics/textures/gui/relay.png index ed9ef8f77a3042e9aae514cc09db55b4eee1d074..0026c50b351b464678c544c66999fdbdcf2cce29 100644 GIT binary patch literal 11095 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 literal 10104 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