simplified interaction handling

parmenashp · Jun 16, 2024 · bcde016 · bcde016
1 parent 57ea0d2
commit bcde016
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/...in/java/com/mitsuaky/stanleyparable/common/network/packets/PacketInteractionToServer.java b/...in/java/com/mitsuaky/stanleyparable/common/network/packets/PacketInteractionToServer.java
@@ -1,14 +1,9 @@
 package com.mitsuaky.stanleyparable.common.network.packets;
 
-import com.mitsuaky.stanleyparable.common.network.PacketHandler;
 import com.mitsuaky.stanleyparable.server.commands.InteractionCheckCommand;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.event.network.CustomPayloadEvent;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 public class PacketInteractionToServer implements Packet {
 
     private final String interactionType;
@@ -32,11 +27,7 @@ public void toBytes(FriendlyByteBuf buf) {
 
     @Override
     public void handle(CustomPayloadEvent.Context ctx) {
-        ctx.enqueueWork(() -> {
-            InteractionCheckCommand.interactionMap.put(interactionType, interactionValue);
-            ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-            executor.schedule(() -> InteractionCheckCommand.interactionMap.put(interactionType, false), 3, TimeUnit.SECONDS);
-        });
+        ctx.enqueueWork(() -> InteractionCheckCommand.interactionMap.put(interactionType, interactionValue));
         ctx.setPacketHandled(true);
     }
 }
diff --git a/forge/src/main/java/com/mitsuaky/stanleyparable/server/commands/ForceInteractionCommand.java b/forge/src/main/java/com/mitsuaky/stanleyparable/server/commands/ForceInteractionCommand.java
@@ -8,17 +8,12 @@
 import net.minecraft.commands.Commands;
 import net.minecraft.network.chat.Component;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 import static com.mitsuaky.stanleyparable.server.commands.InteractionCheckCommand.interactionMap;
 
 public class ForceInteractionCommand {
     static ArgumentBuilder<CommandSourceStack, ?> register() {
         return Commands.literal("forceinteraction")
                 .then(Commands.argument("interactionType", StringArgumentType.word())
-                        .executes(ForceInteractionCommand::runCmdOnOff)
                         .then(Commands.argument("interactionValue", BoolArgumentType.bool())
                                 .executes(ForceInteractionCommand::runCmdForced)));
     }
@@ -31,13 +26,4 @@ private static int runCmdForced(CommandContext<CommandSourceStack> ctx) {
         ctx.getSource().sendSuccess(() -> Component.literal("Interaction " + interactionType + " setado para " + interactionValue), false);
         return 1;
     }
-
-    private static int runCmdOnOff(CommandContext<CommandSourceStack> ctx) {
-        String interactionType = StringArgumentType.getString(ctx, "interactionType");
-        interactionMap.put(interactionType, true);
-        ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-        executor.schedule(() -> interactionMap.put(interactionType, false), 3, TimeUnit.SECONDS);
-        ctx.getSource().sendSuccess(() -> Component.literal("Interaction " + interactionType + " ativada, daqui 3 segundos irá desativar."), false);
-        return 1;
-    }
 }
diff --git a/forge/src/main/java/com/mitsuaky/stanleyparable/server/commands/InteractionCheckCommand.java b/forge/src/main/java/com/mitsuaky/stanleyparable/server/commands/InteractionCheckCommand.java
@@ -26,15 +26,15 @@ public class InteractionCheckCommand {
     private static int runCmd(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
         String interactionType = StringArgumentType.getString(ctx, "interactionType");
 
-        if (interactionMap.containsKey(interactionType) && interactionMap.get(interactionType)) {
+        if (interactionMap.get(interactionType)) {
             if (StanleyParableMod.debugMode) {
-                ctx.getSource().sendSuccess(() -> Component.literal("Interaction detected"), true);
+                ctx.getSource().getServer().getPlayerList().broadcastSystemMessage(Component.literal("Interaction " + interactionType + " detected"), false);
             }
+            ctx.getSource().sendSuccess(() -> Component.literal("Interaction detected"), false);
+            interactionMap.put(interactionType, false);
             return 1;
         } else {
-            if (StanleyParableMod.debugMode) {
-                ctx.getSource().sendFailure(Component.literal("Interaction not detected"));
-            }
+            ctx.getSource().sendFailure(Component.literal("Interaction " + interactionType + " not detected"));
             throw new SimpleCommandExceptionType(Component.translatable("commands.execute.conditional.fail")).create();
         }
     }