Refactor interfaces, tasks, and events packages

triphora · triphora · commit e373670336fb · 2022-04-02T17:29:41.000-04:00
diff --git a/common/src/main/java/dev/frydae/emcutils/EmpireMinecraftUtilities.java b/common/src/main/java/dev/frydae/emcutils/EmpireMinecraftUtilities.java
@@ -1,9 +1,9 @@
 package dev.frydae.emcutils;
 
 import dev.architectury.registry.registries.Registries;
+import dev.frydae.emcutils.events.ServerJoiningEvents;
 import dev.frydae.emcutils.features.UsableItems;
 import dev.frydae.emcutils.features.VaultScreen;
-import dev.frydae.emcutils.interfaces.ServerJoiningEvents;
 import dev.frydae.emcutils.listeners.ChatListener;
 import dev.frydae.emcutils.listeners.CommandListener;
 import dev.frydae.emcutils.tasks.GetChatAlertPitchTask;
diff --git a/common/src/main/java/dev/frydae/emcutils/events/ChatCallback.java b/common/src/main/java/dev/frydae/emcutils/events/ChatCallback.java
@@ -1,6 +1,5 @@
-package dev.frydae.emcutils.interfaces;
+package dev.frydae.emcutils.events;
 
-import dev.frydae.emcutils.event.Event;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
diff --git a/common/src/main/java/dev/frydae/emcutils/events/CommandCallback.java b/common/src/main/java/dev/frydae/emcutils/events/CommandCallback.java
@@ -1,6 +1,5 @@
-package dev.frydae.emcutils.interfaces;
+package dev.frydae.emcutils.events;
 
-import dev.frydae.emcutils.event.Event;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.util.ActionResult;
 
diff --git a/common/src/main/java/dev/frydae/emcutils/events/Event.java b/common/src/main/java/dev/frydae/emcutils/events/Event.java
@@ -1,4 +1,4 @@
-package dev.frydae.emcutils.event;
+package dev.frydae.emcutils.events;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
diff --git a/common/src/main/java/dev/frydae/emcutils/events/ServerJoiningEvents.java b/common/src/main/java/dev/frydae/emcutils/events/ServerJoiningEvents.java
@@ -1,6 +1,5 @@
-package dev.frydae.emcutils.interfaces;
+package dev.frydae.emcutils.events;
 
-import dev.frydae.emcutils.event.Event;
 import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.Internal
diff --git a/common/src/main/java/dev/frydae/emcutils/features/VaultScreen.java b/common/src/main/java/dev/frydae/emcutils/features/VaultScreen.java
@@ -7,8 +7,8 @@
 import dev.architectury.registry.registries.Registrar;
 import dev.architectury.registry.registries.RegistrySupplier;
 import dev.frydae.emcutils.EmpireMinecraftUtilities;
-import dev.frydae.emcutils.interfaces.ScreenAccessor;
 import dev.frydae.emcutils.mixins.HandledScreenAccessor;
+import dev.frydae.emcutils.utils.ScreenAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
diff --git a/common/src/main/java/dev/frydae/emcutils/listeners/ChatListener.java b/common/src/main/java/dev/frydae/emcutils/listeners/ChatListener.java
@@ -2,8 +2,8 @@
 
 import com.google.common.collect.Lists;
 import dev.frydae.emcutils.EmpireMinecraftUtilities;
+import dev.frydae.emcutils.events.ChatCallback;
 import dev.frydae.emcutils.features.ChatChannels;
-import dev.frydae.emcutils.interfaces.ChatCallback;
 import dev.frydae.emcutils.utils.Util;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.PlayerListEntry;
diff --git a/common/src/main/java/dev/frydae/emcutils/listeners/CommandListener.java b/common/src/main/java/dev/frydae/emcutils/listeners/CommandListener.java
@@ -1,8 +1,8 @@
 package dev.frydae.emcutils.listeners;
 
 import dev.frydae.emcutils.containers.EmpireServer;
+import dev.frydae.emcutils.events.CommandCallback;
 import dev.frydae.emcutils.features.VisitResidenceHandler;
-import dev.frydae.emcutils.interfaces.CommandCallback;
 import dev.frydae.emcutils.utils.Util;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
diff --git a/common/src/main/java/dev/frydae/emcutils/mixins/ClientEntityPlayerMixin.java b/common/src/main/java/dev/frydae/emcutils/mixins/ClientEntityPlayerMixin.java
@@ -1,8 +1,8 @@
 package dev.frydae.emcutils.mixins;
 
 import com.google.common.collect.Lists;
-import dev.frydae.emcutils.interfaces.ChatCallback;
-import dev.frydae.emcutils.interfaces.CommandCallback;
+import dev.frydae.emcutils.events.ChatCallback;
+import dev.frydae.emcutils.events.CommandCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.util.ActionResult;
diff --git a/common/src/main/java/dev/frydae/emcutils/mixins/ClientPlayNetworkHandlerMixin.java b/common/src/main/java/dev/frydae/emcutils/mixins/ClientPlayNetworkHandlerMixin.java
@@ -2,8 +2,8 @@
 
 import dev.architectury.event.events.client.ClientTickEvent;
 import dev.frydae.emcutils.EmpireMinecraftUtilities;
+import dev.frydae.emcutils.events.ChatCallback;
 import dev.frydae.emcutils.features.VaultScreen;
-import dev.frydae.emcutils.interfaces.ChatCallback;
 import dev.frydae.emcutils.utils.Util;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.HandledScreens;
diff --git a/common/src/main/java/dev/frydae/emcutils/mixins/HandledScreenAccessor.java b/common/src/main/java/dev/frydae/emcutils/mixins/HandledScreenAccessor.java
@@ -7,6 +7,6 @@
 
 @Mixin(HandledScreen.class)
 public interface HandledScreenAccessor {
-    @Invoker
-    void invokeDrawItem(ItemStack stack, int x, int y, String amountText);
+  @Invoker
+  void invokeDrawItem(ItemStack stack, int x, int y, String amountText);
 }
diff --git a/common/src/main/java/dev/frydae/emcutils/mixins/ScreenMixin.java b/common/src/main/java/dev/frydae/emcutils/mixins/ScreenMixin.java
@@ -1,6 +1,6 @@
 package dev.frydae.emcutils.mixins;
 
-import dev.frydae.emcutils.interfaces.ScreenAccessor;
+import dev.frydae.emcutils.utils.ScreenAccessor;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Final;
diff --git a/common/src/main/java/dev/frydae/emcutils/tasks/GetChatAlertPitchTask.java b/common/src/main/java/dev/frydae/emcutils/tasks/GetChatAlertPitchTask.java
@@ -1,6 +1,5 @@
 package dev.frydae.emcutils.tasks;
 
-import dev.frydae.emcutils.interfaces.Task;
 import dev.frydae.emcutils.listeners.ChatListener;
 import dev.frydae.emcutils.utils.Util;
 import net.minecraft.client.MinecraftClient;
diff --git a/common/src/main/java/dev/frydae/emcutils/tasks/GetChatAlertSoundTask.java b/common/src/main/java/dev/frydae/emcutils/tasks/GetChatAlertSoundTask.java
@@ -1,6 +1,5 @@
 package dev.frydae.emcutils.tasks;
 
-import dev.frydae.emcutils.interfaces.Task;
 import dev.frydae.emcutils.listeners.ChatListener;
 import dev.frydae.emcutils.utils.Util;
 import net.minecraft.client.MinecraftClient;
diff --git a/common/src/main/java/dev/frydae/emcutils/tasks/GetLocationTask.java b/common/src/main/java/dev/frydae/emcutils/tasks/GetLocationTask.java
@@ -1,6 +1,5 @@
 package dev.frydae.emcutils.tasks;
 
-import dev.frydae.emcutils.interfaces.Task;
 import dev.frydae.emcutils.listeners.ChatListener;
 import net.minecraft.client.MinecraftClient;
 
diff --git a/common/src/main/java/dev/frydae/emcutils/tasks/Task.java b/common/src/main/java/dev/frydae/emcutils/tasks/Task.java
@@ -1,4 +1,4 @@
-package dev.frydae.emcutils.interfaces;
+package dev.frydae.emcutils.tasks;
 
 public interface Task {
   void execute();
diff --git a/common/src/main/java/dev/frydae/emcutils/tasks/Tasks.java b/common/src/main/java/dev/frydae/emcutils/tasks/Tasks.java
@@ -1,7 +1,5 @@
 package dev.frydae.emcutils.tasks;
 
-import dev.frydae.emcutils.interfaces.Task;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
diff --git a/common/src/main/java/dev/frydae/emcutils/utils/ScreenAccessor.java b/common/src/main/java/dev/frydae/emcutils/utils/ScreenAccessor.java
@@ -1,4 +1,4 @@
-package dev.frydae.emcutils.interfaces;
+package dev.frydae.emcutils.utils;
 
 import net.minecraft.text.Text;
 
diff --git a/voxel/src/main/java/dev/frydae/emcutils/voxel/EmpireMinecraftUtilitiesVoxel.java b/voxel/src/main/java/dev/frydae/emcutils/voxel/EmpireMinecraftUtilitiesVoxel.java
@@ -1,6 +1,6 @@
 package dev.frydae.emcutils.voxel;
 
-import dev.frydae.emcutils.interfaces.ServerJoiningEvents;
+import dev.frydae.emcutils.events.ServerJoiningEvents;
 import dev.frydae.emcutils.tasks.GetLocationTask;
 import dev.frydae.emcutils.tasks.Tasks;
 import net.fabricmc.api.ClientModInitializer;
diff --git a/voxel/src/main/java/dev/frydae/emcutils/voxel/VoxelMapIntegration.java b/voxel/src/main/java/dev/frydae/emcutils/voxel/VoxelMapIntegration.java
@@ -1,7 +1,7 @@
 package dev.frydae.emcutils.voxel;
 
 import com.mamiyaotaru.voxelmap.VoxelMap;
-import dev.frydae.emcutils.interfaces.Task;
+import dev.frydae.emcutils.tasks.Task;
 import dev.frydae.emcutils.utils.Util;
 
 public class VoxelMapIntegration implements Task {
diff --git a/xaero/src/main/java/dev/frydae/emcutils/xaero/EmpireMinecraftUtilitiesXaero.java b/xaero/src/main/java/dev/frydae/emcutils/xaero/EmpireMinecraftUtilitiesXaero.java
@@ -1,6 +1,6 @@
 package dev.frydae.emcutils.xaero;
 
-import dev.frydae.emcutils.interfaces.ServerJoiningEvents;
+import dev.frydae.emcutils.events.ServerJoiningEvents;
 import dev.frydae.emcutils.tasks.GetLocationTask;
 import dev.frydae.emcutils.tasks.Tasks;
 import net.fabricmc.api.ClientModInitializer;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.frydae.emcutils.event;`
	`1`	`+package dev.frydae.emcutils.events;`
`2`	`2`
`3`	`3`	`import java.lang.reflect.Array;`
`4`	`4`	`import java.util.Arrays;`