From 1072dfa5738e34616003f9c87f45a5fcfaf03199 Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 18 Aug 2022 09:57:58 +0200 Subject: [PATCH 1/7] Update version to 1.3.2 --- build.gradle | 2 +- src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 45b195905..55f08c7bd 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'idea' apply plugin: 'maven-publish' -version = '1.3.1' +version = '1.3.2' group = 'com.rettichlp' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'UnicacityAddon' diff --git a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java index 110bd98a2..4da66e1c9 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java @@ -36,7 +36,7 @@ @Mod(name = "UnicacityAddon", modid = "unicacityaddon", version = UnicacityAddon.VERSION, clientSideOnly = true, acceptedMinecraftVersions = "[1.12,1.12.2]") public class UnicacityAddon extends LabyModAddon { - public static final String VERSION = "1.3.1"; + public static final String VERSION = "1.3.2"; public static final Minecraft MINECRAFT = Minecraft.getMinecraft(); public static UnicacityAddon ADDON; From 708370fbea472ee8038f9cff4ebe16449995c9b1 Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 18 Aug 2022 10:03:15 +0200 Subject: [PATCH 2/7] Fix name of NAMETAG_DELAY_SETTINGS in ConfigElements --- .../rettichlp/UnicacityAddon/base/config/ConfigElements.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rettichlp/UnicacityAddon/base/config/ConfigElements.java b/src/main/java/com/rettichlp/UnicacityAddon/base/config/ConfigElements.java index c2ec4a76d..14132496e 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/base/config/ConfigElements.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/base/config/ConfigElements.java @@ -152,7 +152,7 @@ public static boolean getNameTagFactionSpecific() { // Delay public static String getRefreshDisplayNamesInterval() { - return UnicacityAddon.ADDON.getConfig().has("NAMETAG_DELAY_SETTINGS") && !UnicacityAddon.ADDON.getConfig().get("NAMETAG_DELAY_SETTINGS").getAsString().isEmpty() && !UnicacityAddon.ADDON.getConfig().get("NAMETAG_DELAY").getAsString().equals("0") && !UnicacityAddon.ADDON.getConfig().get("NAMETAG_DELAY").getAsString().startsWith("-") + return UnicacityAddon.ADDON.getConfig().has("NAMETAG_DELAY_SETTINGS") && !UnicacityAddon.ADDON.getConfig().get("NAMETAG_DELAY_SETTINGS").getAsString().isEmpty() && !UnicacityAddon.ADDON.getConfig().get("NAMETAG_DELAY_SETTINGS").getAsString().equals("0") && !UnicacityAddon.ADDON.getConfig().get("NAMETAG_DELAY_SETTINGS").getAsString().startsWith("-") ? UnicacityAddon.ADDON.getConfig().get("NAMETAG_DELAY_SETTINGS").getAsString() : "5"; } From 9b5f97d81d6716e1c270bda9fe7d1d8a5c673994 Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 18 Aug 2022 10:21:27 +0200 Subject: [PATCH 3/7] Add check if current screen is chat and return then on all hotkeys without addonScreenshot --- .../UnicacityAddon/events/HotkeyEventHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/HotkeyEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/HotkeyEventHandler.java index 85a2a0d30..e856836ae 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/events/HotkeyEventHandler.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/events/HotkeyEventHandler.java @@ -12,6 +12,7 @@ import com.rettichlp.UnicacityAddon.base.text.PatternHandler; import com.rettichlp.UnicacityAddon.base.utils.ImageUploadUtils; import net.labymod.main.LabyMod; +import net.minecraft.client.gui.GuiChat; import net.minecraft.client.shader.Framebuffer; import net.minecraft.util.ScreenShotHelper; import net.minecraftforge.client.event.ClientChatReceivedEvent; @@ -64,10 +65,15 @@ private void handleHotkey() { try { File file = FileManager.getNewImageFile(); handleScreenshot(file); + return; } catch (IOException e) { throw new RuntimeException(e); } - } else if (Keyboard.isKeyDown(KeyBindRegistry.adFreigeben.getKeyCode())) { + } + + if (UnicacityAddon.MINECRAFT.currentScreen instanceof GuiChat) return; + + if (Keyboard.isKeyDown(KeyBindRegistry.adFreigeben.getKeyCode())) { handleAd("freigeben"); } else if (Keyboard.isKeyDown(KeyBindRegistry.adBlockieren.getKeyCode())) { handleAd("blockieren"); From ec64c697be8a47a08a48c1332ca9b9332dc7131d Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 18 Aug 2022 12:07:29 +0200 Subject: [PATCH 4/7] Fix another stupid bug in ARezeptAnnehmenCommand --- .../commands/faction/rettungsdienst/ARezeptAnnehmenCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rettichlp/UnicacityAddon/commands/faction/rettungsdienst/ARezeptAnnehmenCommand.java b/src/main/java/com/rettichlp/UnicacityAddon/commands/faction/rettungsdienst/ARezeptAnnehmenCommand.java index 83b7090c3..7f388e145 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/commands/faction/rettungsdienst/ARezeptAnnehmenCommand.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/commands/faction/rettungsdienst/ARezeptAnnehmenCommand.java @@ -48,7 +48,7 @@ public class ARezeptAnnehmenCommand extends CommandBase { } if (!MathUtils.isInteger(args[0])) return; - amount = Integer.parseInt(args[2]); + amount = Integer.parseInt(args[0]); MedicationEventHandler.acceptRecipe(); } From 889a02db1ee0b4b145fe9ce7cc5319895bf158b4 Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 18 Aug 2022 12:51:55 +0200 Subject: [PATCH 5/7] Update logic in ADropMoneyCommand, remove unnecessary variables --- .../commands/job/ADropMoneyCommand.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/rettichlp/UnicacityAddon/commands/job/ADropMoneyCommand.java b/src/main/java/com/rettichlp/UnicacityAddon/commands/job/ADropMoneyCommand.java index 99b09c56e..0bf026fbd 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/commands/job/ADropMoneyCommand.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/commands/job/ADropMoneyCommand.java @@ -19,7 +19,6 @@ @UCCommand public class ADropMoneyCommand extends CommandBase { - public static boolean execute = false; private int step = 0; @Override @@ -48,11 +47,8 @@ public boolean checkPermission(@Nonnull MinecraftServer server, @Nonnull IComman @Override public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) { UPlayer p = AbstractionLayer.getPlayer(); - Timer t = new Timer(); - execute = true; - - t.scheduleAtFixedRate(new TimerTask() { + new Timer().scheduleAtFixedRate(new TimerTask() { @Override public void run() { switch (step++) { @@ -64,11 +60,8 @@ public void run() { break; case 3: p.sendChatMessage("/bank einzahlen 15000"); - break; - case 4: - execute = false; step = 0; - t.cancel(); + this.cancel(); break; } } From 223ff5f19ec30b4234a6f7149baf63df022e777d Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 18 Aug 2022 12:52:51 +0200 Subject: [PATCH 6/7] Update version to 1.3.2-dev --- build.gradle | 2 +- src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 55f08c7bd..123b31259 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'idea' apply plugin: 'maven-publish' -version = '1.3.2' +version = '1.3.2-dev' group = 'com.rettichlp' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'UnicacityAddon' diff --git a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java index 4da66e1c9..3c3cdcd24 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java @@ -36,7 +36,7 @@ @Mod(name = "UnicacityAddon", modid = "unicacityaddon", version = UnicacityAddon.VERSION, clientSideOnly = true, acceptedMinecraftVersions = "[1.12,1.12.2]") public class UnicacityAddon extends LabyModAddon { - public static final String VERSION = "1.3.2"; + public static final String VERSION = "1.3.2-dev"; public static final Minecraft MINECRAFT = Minecraft.getMinecraft(); public static UnicacityAddon ADDON; From 660362be1bfd4ae7d6b863fbf0193e8cc007b9ea Mon Sep 17 00:00:00 2001 From: rettichlp Date: Fri, 19 Aug 2022 10:16:18 +0200 Subject: [PATCH 7/7] Update version to 1.3.2 --- build.gradle | 2 +- src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 123b31259..55f08c7bd 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'idea' apply plugin: 'maven-publish' -version = '1.3.2-dev' +version = '1.3.2' group = 'com.rettichlp' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'UnicacityAddon' diff --git a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java index 3c3cdcd24..4da66e1c9 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java @@ -36,7 +36,7 @@ @Mod(name = "UnicacityAddon", modid = "unicacityaddon", version = UnicacityAddon.VERSION, clientSideOnly = true, acceptedMinecraftVersions = "[1.12,1.12.2]") public class UnicacityAddon extends LabyModAddon { - public static final String VERSION = "1.3.2-dev"; + public static final String VERSION = "1.3.2"; public static final Minecraft MINECRAFT = Minecraft.getMinecraft(); public static UnicacityAddon ADDON;