cleanup & CTexturedButton

Author: BlazeMCworld

src/main/java/io/github/techstreet/dfscript/DFScript.java

@@ -2,22 +2,19 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParser;
 import io.github.techstreet.dfscript.commands.CommandManager;
-import io.github.techstreet.dfscript.features.*;
+import io.github.techstreet.dfscript.features.UpdateAlerts;
 import io.github.techstreet.dfscript.loader.Loader;
-import io.github.techstreet.dfscript.loader.v2.CodeInitializer;
 import io.github.techstreet.dfscript.script.ScriptManager;
 import io.github.techstreet.dfscript.util.Scheduler;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 public class DFScript implements ModInitializer {
 
     public static final Logger LOGGER = LogManager.getLogger();
@@ -35,8 +32,6 @@ public class DFScript implements ModInitializer {
             .setPrettyPrinting()
             .create();
 
-    public static final JsonParser JSON_PARSER = new JsonParser();
-
     @Override
     public void onInitialize() {
         LOGGER.info("Initializing");

src/main/java/io/github/techstreet/dfscript/commands/CommandManager.java

@@ -1,23 +1,17 @@
 package io.github.techstreet.dfscript.commands;
 
 import com.mojang.brigadier.CommandDispatcher;
-import io.github.techstreet.dfscript.commands.misc.*;
+import io.github.techstreet.dfscript.commands.misc.ScriptsCommand;
 import io.github.techstreet.dfscript.loader.Loadable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-
-import io.github.techstreet.dfscript.util.hypercube.HypercubeRank;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 
 public class CommandManager implements Loadable {
 
     private final CommandManager instance;
     private static final List<Command> commands = new ArrayList<>();
-    public static final HashMap<Command, HypercubeRank> rankedCommands = new HashMap<>();
 
     public CommandManager() {
         instance = this;
@@ -29,13 +23,8 @@ public CommandManager getInstance() {
 
     @Override
     public void load() {
-    	
-    	// misc commands
-        commands.add(new PingCommand());
         commands.add(new ScriptsCommand());
 
-        // Example of registering commands with a required df rank
-        // rankedCommands.put(new TestCommand(), DFRank.JRHELPER);
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> attachTo(dispatcher));
     }
 

src/main/java/io/github/techstreet/dfscript/commands/arguments/FileArgumentType.java

@@ -22,7 +22,7 @@ public void register(CommandDispatcher<FabricClientCommandSource> cd) {
         cd.register(
             literal("scripts")
                 .executes(ctx -> {
-                    DFScript.MC.send(() -> io.github.techstreet.dfscript.DFScript.MC.setScreen(new ScriptListScreen()));
+                    DFScript.MC.send(() -> DFScript.MC.setScreen(new ScriptListScreen()));
                     return 0;
                 })
                 .then(literal("reload")

src/main/java/io/github/techstreet/dfscript/commands/arguments/PlayerArgumentType.java

@@ -1,9 +1,8 @@
 package io.github.techstreet.dfscript.event;
 
 import io.github.techstreet.dfscript.event.system.Event;
-import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
-
 import java.net.InetSocketAddress;
+import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
 
 public class ServerJoinEvent implements Event {
     private final GameJoinS2CPacket packet;

src/main/java/io/github/techstreet/dfscript/commands/arguments/StringListArgumentType.java

@@ -1,9 +1,5 @@
 package io.github.techstreet.dfscript.event.system;
 
-import io.github.techstreet.dfscript.event.TickEvent;
-import io.github.techstreet.dfscript.util.chat.ChatType;
-import io.github.techstreet.dfscript.util.chat.ChatUtil;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

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

@@ -2,20 +2,29 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.techstreet.dfscript.DFScript;
-import io.github.techstreet.dfscript.event.*;
+import io.github.techstreet.dfscript.event.BuildModeEvent;
+import io.github.techstreet.dfscript.event.DevModeEvent;
+import io.github.techstreet.dfscript.event.PlayModeEvent;
+import io.github.techstreet.dfscript.event.ReceiveChatEvent;
+import io.github.techstreet.dfscript.event.RecieveSoundEvent;
+import io.github.techstreet.dfscript.event.ServerJoinEvent;
+import io.github.techstreet.dfscript.event.ServerLeaveEvent;
 import io.github.techstreet.dfscript.event.system.EventManager;
 import io.github.techstreet.dfscript.util.hypercube.HypercubeRank;
 import io.github.techstreet.dfscript.util.hypercube.HypercubeUtil;
+import java.net.InetSocketAddress;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.ClientConnection;
-import net.minecraft.network.packet.s2c.play.*;
+import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
+import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
+import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
+import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
+import net.minecraft.network.packet.s2c.play.TeamS2CPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.net.InetSocketAddress;
-
 @Mixin(ClientPlayNetworkHandler.class)
 public class MClientPlayNetworkHandler {
 
@@ -52,9 +61,9 @@ private void onGameMessage(GameMessageS2CPacket packet, CallbackInfo ci) {
     @Inject(method = "onTeam", at = @At("RETURN"))
     private void handleSetPlayerTeamPacket(TeamS2CPacket packet, CallbackInfo ci) {
         if (DFScript.MC.player != null) {
-            if (io.github.techstreet.dfscript.DFScript.MC.getCurrentServerEntry() != null) {
-                if (io.github.techstreet.dfscript.DFScript.MC.getCurrentServerEntry().address.contains("mcdiamondfire.com")) {
-                    if (packet.getPlayerNames().contains(io.github.techstreet.dfscript.DFScript.MC.player.getName().getString())) {
+            if (DFScript.MC.getCurrentServerEntry() != null) {
+                if (DFScript.MC.getCurrentServerEntry().address.contains("mcdiamondfire.com")) {
+                    if (packet.getPlayerNames().contains(DFScript.MC.player.getName().getString())) {
                         for (HypercubeRank r : HypercubeRank.values()) {
                             if (r.getTeamName() == null)
                                 continue;
@@ -75,8 +84,8 @@ private void handleSetPlayerTeamPacket(TeamS2CPacket packet, CallbackInfo ci) {
     @Inject(method = "onGameJoin", at = @At("RETURN"), cancellable = true)
     private void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) {
         ClientConnection conn = DFScript.MC.getNetworkHandler().getConnection();
-        ServerJoinEvent event = new ServerJoinEvent(packet, ((InetSocketAddress)conn.getAddress()));
-        EventManager.getInstance().dispatch(event);
+//        ServerJoinEvent event = new ServerJoinEvent(packet, ((InetSocketAddress)conn.getAddress()));
+//        EventManager.getInstance().dispatch(event);
     }
 
     @Inject(method = "onDisconnect", at = @At("RETURN"), cancellable = true)