Merge pull request #101 from rettichlp/hotfix

hotfix
UnicacityAddon · Aug 4, 2022 · 10b755b · 10b755b
2 parents 98e4073 + ed87275
commit 10b755b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git 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
@@ -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;

diff --git 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
@@ -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
@@ -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;
+            }
         }
     }
 

diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/ScreenshotEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/ScreenshotEventHandler.java
@@ -13,18 +13,22 @@
 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
  * @see <a href="https://github.com/paulzhng/UCUtils/blob/master/src/main/java/de/fuzzlemann/ucutils/events/AlternateScreenshotEventHandler.java">UCUtils by paulzhng</a>
  */
 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) {