Merge pull request #28 from DFOnline/updates

Fix a few things

Author: GeorgeRNG

src/main/java/io/github/techstreet/dfscript/commands/misc/ScriptsCommand.java

@@ -1,16 +1,17 @@
 package io.github.techstreet.dfscript.commands.misc;
 
 import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import io.github.techstreet.dfscript.DFScript;
 import io.github.techstreet.dfscript.commands.Command;
 import io.github.techstreet.dfscript.commands.arguments.StringFuncArgumentType;
+import io.github.techstreet.dfscript.event.system.EventManager;
 import io.github.techstreet.dfscript.screen.script.ScriptListScreen;
 import io.github.techstreet.dfscript.script.Script;
 import io.github.techstreet.dfscript.script.ScriptManager;
 import io.github.techstreet.dfscript.script.values.ScriptValue;
 import io.github.techstreet.dfscript.util.chat.ChatUtil;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@@ -49,6 +50,14 @@ public void register(CommandDispatcher<FabricClientCommandSource> cd) {
                         )
                     )
                 )
+                .then(literal("recursion")
+                    .then(argument("limit", IntegerArgumentType.integer(-1)).executes(ctx -> {
+                        int limit = IntegerArgumentType.getInteger(ctx,"limit");
+                        EventManager.getInstance().setEventLimit(limit);
+                        ChatUtil.info("Set events per tick limit to " + limit);
+                        return 0;
+                    }))
+                )
         );
     }
 
@@ -81,9 +90,11 @@ private void listVars(String script, String filter) {
 
     @Override
     public String getDescription() {
-        return "[blue]/scripts[reset]\n" +
-                "\n" +
-                "Opens a GUI to edit custom DFScript scripts.\n";
+        return """
+                [blue]/scripts[reset]
+
+                Opens a GUI to edit custom DFScript scripts.
+                """;
     }
 
     @Override

src/main/java/io/github/techstreet/dfscript/event/system/EventManager.java

@@ -8,6 +8,8 @@
 public class EventManager {
 
     private static EventManager instance;
+    private int events = 0;
+    private int eventLimit = 100;
     private final HashMap<Class<? extends Event>, List<Consumer<Event>>> listeners = new HashMap<>();
 
     public EventManager() {
@@ -31,7 +33,17 @@ public <T extends Event> void register(Class<T> type, Consumer<T> consumer) {
 
     public void dispatch(Event event) {
         for (Consumer<Event> consumer : listeners.getOrDefault(event.getClass(), new ArrayList<>())) {
+            if(events == eventLimit) return;
+            events++;
             consumer.accept(event);
         }
     }
+
+    public void resetEvents() {
+        this.events = 0;
+    }
+
+    public void setEventLimit(int eventLimit) {
+        this.eventLimit = eventLimit;
+    }
 }

src/main/java/io/github/techstreet/dfscript/mixin/player/MLocalPlayer.java

@@ -3,10 +3,8 @@
 import io.github.techstreet.dfscript.event.SendChatEvent;
 import io.github.techstreet.dfscript.event.TickEvent;
 import io.github.techstreet.dfscript.event.system.EventManager;
-import io.github.techstreet.dfscript.util.chat.ChatUtil;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.text.Text;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -27,6 +25,7 @@ private void chat(String message, Text preview, CallbackInfo ci) {
 
     @Inject(method = "sendCommand(Ljava/lang/String;)Z", at = @At("HEAD"), cancellable = true)
     private void command(String command, CallbackInfoReturnable<Boolean> ci) {
+        if(command.startsWith("scripts")) return;
         SendChatEvent event = new SendChatEvent("/"+command);
         EventManager.getInstance().dispatch(event);
         if (event.isCancelled()) {
@@ -36,6 +35,7 @@ private void command(String command, CallbackInfoReturnable<Boolean> ci) {
 
     @Inject(method = "sendCommand(Ljava/lang/String;Lnet/minecraft/text/Text;)V", at = @At("HEAD"), cancellable = true)
     private void command2(String command, Text preview, CallbackInfo ci) {
+        if(command.startsWith("scripts")) return;
         SendChatEvent event = new SendChatEvent("/"+command);
         EventManager.getInstance().dispatch(event);
         if (event.isCancelled()) {
@@ -45,7 +45,9 @@ private void command2(String command, Text preview, CallbackInfo ci) {
 
     @Inject(method = "tick", at = @At("HEAD"))
     private void tick(CallbackInfo ci) {
-        EventManager.getInstance().dispatch(new TickEvent());
+        EventManager em = EventManager.getInstance();
+        em.dispatch(new TickEvent());
+        em.resetEvents();
     }
 
 }

src/main/java/io/github/techstreet/dfscript/screen/CScreen.java

@@ -31,8 +31,9 @@ public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tic
 
         stack.translate(mc.currentScreen.width/2f, mc.currentScreen.height/2f, 0);
 
-        float s = (float) mc.getWindow().getScaleFactor();
-        stack.scale(s,s,0);
+//        float scaleFactor = (float) mc.getWindow().getScaleFactor();
+        float scaleFactor = 2;
+        stack.scale(scaleFactor,scaleFactor,0);
 
         stack.translate(-width/2f, -height/2f, 0);
 
@@ -41,8 +42,8 @@ public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tic
         mouseX += -mc.currentScreen.width/2;
         mouseY += -mc.currentScreen.height/2;
 
-        mouseX /= s;
-        mouseY /= s;
+        mouseX /= scaleFactor;
+        mouseY /= scaleFactor;
 
         mouseX += width/2;
         mouseY += height/2;
@@ -108,18 +109,20 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
 
     public double translateMouseX(double mouseX) {
         MinecraftClient mc = DFScript.MC;
-        float s = (float) mc.getWindow().getScaleFactor();
+//        float s = (float) mc.getWindow().getScaleFactor();
+        float scaleFactor = 2;
         mouseX += -mc.currentScreen.width/2f;
-        mouseX /= s;
+        mouseX /= scaleFactor;
         mouseX += width/2f;
         return mouseX;
     }
 
     public double translateMouseY(double mouseY) {
         MinecraftClient mc = DFScript.MC;
-        float s = (float) mc.getWindow().getScaleFactor();
+//        float scaleFactor = (float) mc.getWindow().getScaleFactor();
+        float scaleFactor = 2;
         mouseY += -mc.currentScreen.height/2f;
-        mouseY /= s;
+        mouseY /= scaleFactor;
         mouseY += height/2f;
         return mouseY;
     }