Reorganize package structure on the client to adhere to modding standards

2008Choco · 2008Choco · commit f12dd4e29f08 · 2024-02-13T16:12:41.000-05:00
diff --git a/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/VeinMinerClient.java b/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/VeinMinerClient.java
@@ -1,4 +1,4 @@
-package wtf.choco.veinminer;
+package wtf.choco.veinminer.client;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -28,21 +28,22 @@
 import org.slf4j.LoggerFactory;
 
 import wtf.choco.network.fabric.FabricProtocolConfiguration;
+import wtf.choco.veinminer.VeinMiner;
+import wtf.choco.veinminer.client.network.FabricServerState;
+import wtf.choco.veinminer.client.network.VeinMinerFabricChannelRegistrar;
+import wtf.choco.veinminer.client.render.VeinMinerRenderType;
+import wtf.choco.veinminer.client.render.hud.HudRenderComponent;
+import wtf.choco.veinminer.client.render.hud.HudRenderComponentPatternWheel;
+import wtf.choco.veinminer.client.render.hud.HudRenderComponentVeinMiningIcon;
 import wtf.choco.veinminer.config.ClientConfig;
-import wtf.choco.veinminer.hud.HudRenderComponent;
-import wtf.choco.veinminer.hud.HudRenderComponentPatternWheel;
-import wtf.choco.veinminer.hud.HudRenderComponentVeinMiningIcon;
-import wtf.choco.veinminer.network.FabricServerState;
-import wtf.choco.veinminer.network.VeinMinerFabricChannelRegistrar;
 import wtf.choco.veinminer.network.protocol.serverbound.ServerboundHandshake;
 import wtf.choco.veinminer.network.protocol.serverbound.ServerboundRequestVeinMine;
 import wtf.choco.veinminer.network.protocol.serverbound.ServerboundToggleVeinMiner;
-import wtf.choco.veinminer.render.VeinMinerRenderType;
 
 /**
  * The Fabric VeinMiner mod entry class.
  */
-public final class VeinMinerMod implements ClientModInitializer {
+public final class VeinMinerClient implements ClientModInitializer {
 
     /**
      * The "activate veinminer" key mapping. Defaults to ~
diff --git a/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/network/FabricServerState.java b/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/network/FabricServerState.java
@@ -1,4 +1,4 @@
-package wtf.choco.veinminer.network;
+package wtf.choco.veinminer.client.network;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/network/VeinMinerFabricChannelRegistrar.java b/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/network/VeinMinerFabricChannelRegistrar.java
@@ -1,4 +1,4 @@
-package wtf.choco.veinminer.network;
+package wtf.choco.veinminer.client.network;
 
 import net.minecraft.resources.ResourceLocation;
 
@@ -9,7 +9,7 @@
 import wtf.choco.network.Message;
 import wtf.choco.network.fabric.FabricClientChannelRegistrar;
 import wtf.choco.veinminer.VeinMiner;
-import wtf.choco.veinminer.VeinMinerMod;
+import wtf.choco.veinminer.client.VeinMinerClient;
 import wtf.choco.veinminer.network.protocol.VeinMinerClientboundMessageListener;
 import wtf.choco.veinminer.network.protocol.VeinMinerServerboundMessageListener;
 
@@ -22,7 +22,7 @@ public VeinMinerFabricChannelRegistrar(Logger logger) {
     @Nullable
     @Override
     protected VeinMinerClientboundMessageListener onSuccessfulMessage(@NotNull ResourceLocation channel, @NotNull Message<VeinMinerClientboundMessageListener> message) {
-        return VeinMinerMod.hasServerState() ? VeinMinerMod.getServerState() : null;
+        return VeinMinerClient.hasServerState() ? VeinMinerClient.getServerState() : null;
     }
 
 }
diff --git a/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/VeinMinerRenderType.java b/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/VeinMinerRenderType.java
@@ -1,4 +1,4 @@
-package wtf.choco.veinminer.render;
+package wtf.choco.veinminer.client.render;
 
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.VertexFormat.Mode;
diff --git a/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/hud/HudRenderComponent.java b/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/hud/HudRenderComponent.java
@@ -1,4 +1,4 @@
-package wtf.choco.veinminer.hud;
+package wtf.choco.veinminer.client.render.hud;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
diff --git a/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/hud/HudRenderComponentPatternWheel.java b/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/hud/HudRenderComponentPatternWheel.java
@@ -1,4 +1,4 @@
-package wtf.choco.veinminer.hud;
+package wtf.choco.veinminer.client.render.hud;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -10,9 +10,9 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import wtf.choco.veinminer.VeinMinerMod;
+import wtf.choco.veinminer.client.VeinMinerClient;
+import wtf.choco.veinminer.client.network.FabricServerState;
 import wtf.choco.veinminer.config.ClientConfig;
-import wtf.choco.veinminer.network.FabricServerState;
 
 /**
  * A {@link HudRenderComponent} for the pattern selection wheel in the top left.
@@ -47,7 +47,7 @@ else if (remainingMs < FADE_MS) { // Fade out
         int alpha = (Mth.floor(alphaProgress * 255) << 24) & 0xFF000000;
         int colour = 0xFFFFFF | alpha;
 
-        FabricServerState serverState = VeinMinerMod.getServerState();
+        FabricServerState serverState = VeinMinerClient.getServerState();
         String before = serverState.getPreviousPattern().toString();
         String selected = serverState.getSelectedPattern().toString();
         String after = serverState.getNextPattern().toString();
@@ -71,7 +71,7 @@ else if (remainingMs < FADE_MS) { // Fade out
 
     @Override
     public boolean shouldRender(@NotNull ClientConfig config) {
-        return config.isAllowPatternSwitchingKeybind() && VeinMinerMod.getServerState().hasPatternKeys() && remainingMs >= 0L;
+        return config.isAllowPatternSwitchingKeybind() && VeinMinerClient.getServerState().hasPatternKeys() && remainingMs >= 0L;
     }
 
     /**
diff --git a/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/hud/HudRenderComponentVeinMiningIcon.java b/veinminer-fabric/src/main/java/wtf/choco/veinminer/client/render/hud/HudRenderComponentVeinMiningIcon.java
@@ -1,4 +1,4 @@
-package wtf.choco.veinminer.hud;
+package wtf.choco.veinminer.client.render.hud;
 
 import com.mojang.blaze3d.platform.Window;
 
@@ -8,7 +8,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import wtf.choco.veinminer.VeinMinerMod;
+import wtf.choco.veinminer.client.VeinMinerClient;
 import wtf.choco.veinminer.config.ClientConfig;
 
 /**
@@ -32,7 +32,7 @@ public void render(@NotNull Minecraft client, @NotNull GuiGraphics graphics, flo
 
     @Override
     public boolean shouldRender(@NotNull ClientConfig config) {
-        return config.isAllowActivationKeybind() && Minecraft.renderNames() && VeinMinerMod.getServerState().isActive();
+        return config.isAllowActivationKeybind() && Minecraft.renderNames() && VeinMinerClient.getServerState().isActive();
     }
 
 }
diff --git a/veinminer-fabric/src/main/resources/fabric.mod.json b/veinminer-fabric/src/main/resources/fabric.mod.json
@@ -22,7 +22,7 @@
     "environment": "client",
     "entrypoints": {
         "client": [
-            "wtf.choco.veinminer.VeinMinerMod"
+            "wtf.choco.veinminer.client.VeinMinerClient"
         ]
     },
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package wtf.choco.veinminer.network;`
	`1`	`+package wtf.choco.veinminer.client.network;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.Collections;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package wtf.choco.veinminer.render;`
	`1`	`+package wtf.choco.veinminer.client.render;`
`2`	`2`
`3`	`3`	`import com.mojang.blaze3d.vertex.DefaultVertexFormat;`
`4`	`4`	`import com.mojang.blaze3d.vertex.VertexFormat.Mode;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package wtf.choco.veinminer.hud;`
	`1`	`+package wtf.choco.veinminer.client.render.hud;`
`2`	`2`
`3`	`3`	`import com.mojang.blaze3d.vertex.PoseStack;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"environment": "client",`
`23`	`23`	`"entrypoints": {`
`24`	`24`	`"client": [`
`25`		`- "wtf.choco.veinminer.VeinMinerMod"`
	`25`	`+ "wtf.choco.veinminer.client.VeinMinerClient"`
`26`	`26`	`]`
`27`	`27`	`},`
`28`	`28`