From 3af90bf4fc3246fcffeb5c8ce69eff427fdecd81 Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 4 Aug 2022 12:36:43 +0200 Subject: [PATCH 1/3] Update version to 1.1.1 --- 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 bbe72f817..e25f4c810 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.1.0' +version = '1.1.1' 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 a214714d0..3e01cae66 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java @@ -60,7 +60,7 @@ */ public class UnicacityAddon extends LabyModAddon { - public static final String VERSION = "1.1.0"; + public static final String VERSION = "1.1.1"; public static final Minecraft MINECRAFT = Minecraft.getMinecraft(); public static final LabyMod LABYMOD = LabyMod.getInstance(); public static UnicacityAddon ADDON; From c938f89b624d851a6ea264e2631e18d17db9cf72 Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 4 Aug 2022 12:42:37 +0200 Subject: [PATCH 2/3] Fix bug in MobileEventHandler with blocking of nummer command --- .../rettichlp/UnicacityAddon/commands/ACallCommand.java | 2 ++ .../com/rettichlp/UnicacityAddon/commands/ASMSCommand.java | 2 ++ .../UnicacityAddon/events/MobileEventHandler.java | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rettichlp/UnicacityAddon/commands/ACallCommand.java b/src/main/java/com/rettichlp/UnicacityAddon/commands/ACallCommand.java index 0a7d19649..ebfcdbc41 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/commands/ACallCommand.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/commands/ACallCommand.java @@ -23,6 +23,7 @@ public class ACallCommand extends CommandBase { final Timer timer = new Timer(); + public static boolean isActive; @Override @Nonnull public String getName() { return "acall"; @@ -47,6 +48,7 @@ public class ACallCommand extends CommandBase { .of("Syntax: " + getUsage(sender)).color(ColorCode.GRAY).advance() .createComponent()); + isActive = true; p.sendChatMessage("/nummer " + args[0]); timer.schedule(new TimerTask() { diff --git a/src/main/java/com/rettichlp/UnicacityAddon/commands/ASMSCommand.java b/src/main/java/com/rettichlp/UnicacityAddon/commands/ASMSCommand.java index 0c612a57c..6b317f6e5 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/commands/ASMSCommand.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/commands/ASMSCommand.java @@ -24,6 +24,7 @@ public class ASMSCommand extends CommandBase { final Timer timer = new Timer(); + public static boolean isActive; @Override @Nonnull public String getName() { return "asms"; @@ -48,6 +49,7 @@ public class ASMSCommand extends CommandBase { .of("Syntax: " + getUsage(sender)).color(ColorCode.GRAY).advance() .createComponent()); + isActive = true; p.sendChatMessage("/nummer " + args[0]); timer.schedule(new TimerTask() { diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/MobileEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/MobileEventHandler.java index 97daa9625..1800727b8 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/events/MobileEventHandler.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/events/MobileEventHandler.java @@ -2,6 +2,8 @@ import com.rettichlp.UnicacityAddon.base.abstraction.AbstractionLayer; import com.rettichlp.UnicacityAddon.base.text.PatternHandler; +import com.rettichlp.UnicacityAddon.commands.ACallCommand; +import com.rettichlp.UnicacityAddon.commands.ASMSCommand; import net.minecraft.client.Minecraft; import net.minecraft.inventory.ContainerChest; import net.minecraftforge.client.event.ClientChatReceivedEvent; @@ -57,7 +59,10 @@ public void onClientChatReceived(ClientChatReceivedEvent e) { Matcher numberMatcher = PatternHandler.NUMBER_PATTERN.matcher(msg); if (numberMatcher.find()) { lastCheckedNumber = Integer.parseInt(numberMatcher.group(1)); - e.setCanceled(true); + if (ACallCommand.isActive || ASMSCommand.isActive) { + e.setCanceled(true); + ACallCommand.isActive = ASMSCommand.isActive = false; + } } } From 282a6a60249842cc8da214f143bca102ae29c98f Mon Sep 17 00:00:00 2001 From: rettichlp Date: Thu, 4 Aug 2022 13:23:44 +0200 Subject: [PATCH 3/3] Fix bug ScreenshotEventHandler with screenshots in gui --- .../UnicacityAddon/events/ScreenshotEventHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/ScreenshotEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/ScreenshotEventHandler.java index 6c4d20c7a..c9deb7a9f 100644 --- a/src/main/java/com/rettichlp/UnicacityAddon/events/ScreenshotEventHandler.java +++ b/src/main/java/com/rettichlp/UnicacityAddon/events/ScreenshotEventHandler.java @@ -13,11 +13,13 @@ import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent; +import org.lwjgl.input.Keyboard; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.concurrent.TimeUnit; /** * @author RettichLP @@ -25,6 +27,8 @@ */ public class ScreenshotEventHandler { + private static long lastScreenshot; + @SubscribeEvent public void onKeyInput(InputEvent.KeyInputEvent e) { handleScreenshot(); @@ -36,7 +40,8 @@ public void onKeyboardInput(GuiScreenEvent.KeyboardInputEvent e) { } private void handleScreenshot() { - if (!KeyBindRegistry.addonScreenshot.isPressed()) return; + if (!Keyboard.isKeyDown(KeyBindRegistry.addonScreenshot.getKeyCode())) return; + if (System.currentTimeMillis() - lastScreenshot < TimeUnit.SECONDS.toMillis(1)) return; try { File newImageFile = FileManager.getNewImageFile(); @@ -57,6 +62,8 @@ private void handleScreenshot() { } catch (IOException e) { throw new RuntimeException(e); } + + lastScreenshot = System.currentTimeMillis(); } private void uploadScreenshot(File screenshotFile) {