general cleanup

Author: IThundxr

common/src/main/java/com/railwayteam/railways/content/custom_bogeys/selection_menu/RadialBogeyCategoryMenu.java

@@ -15,6 +15,7 @@
 import com.railwayteam.railways.registry.CRIcons;
 import com.railwayteam.railways.registry.CRTrackMaterials.CRTrackType;
 import com.railwayteam.railways.util.Utils;
+import com.railwayteam.railways.util.client.ClientUtils;
 import com.simibubi.create.AllKeys;
 import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
 import com.simibubi.create.content.trains.bogey.BogeySizes.BogeySize;
@@ -563,7 +564,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
     @Override
     public boolean keyReleased(int code, int scanCode, int modifiers) {
         InputConstants.Key mouseKey = InputConstants.getKey(code, scanCode);
-        if (Utils.isActiveAndMatches(AllKeys.TOOL_MENU.getKeybind(), mouseKey)) {
+        if (ClientUtils.isActiveAndMatches(AllKeys.TOOL_MENU.getKeybind(), mouseKey)) {
             onClose();
             return true;
         }

common/src/main/java/com/railwayteam/railways/content/palettes/cycle_menu/RadialTagCycleMenu.java

@@ -7,7 +7,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.railwayteam.railways.content.custom_bogeys.selection_menu.BogeyCategoryHandlerClient;
 import com.railwayteam.railways.mixin.client.AccessorToolboxHandlerClient;
-import com.railwayteam.railways.util.Utils;
+import com.railwayteam.railways.util.client.ClientUtils;
 import com.simibubi.create.AllKeys;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
@@ -215,7 +215,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
     @Override
     public boolean keyReleased(int code, int scanCode, int modifiers) {
         InputConstants.Key mouseKey = InputConstants.getKey(code, scanCode);
-        if (Utils.isActiveAndMatches(AllKeys.TOOL_MENU.getKeybind(), mouseKey)) {
+        if (ClientUtils.isActiveAndMatches(AllKeys.TOOL_MENU.getKeybind(), mouseKey)) {
             onClose();
             return true;
         }

common/src/main/java/com/railwayteam/railways/util/Utils.java

@@ -1,13 +1,9 @@
 package com.railwayteam.railways.util;
 
-import com.mojang.blaze3d.platform.InputConstants;
 import com.railwayteam.railways.Railways;
 import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import dev.architectury.injectables.annotations.ExpectPlatform;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.world.level.chunk.LevelChunk;
 
 import java.nio.file.Path;
@@ -39,12 +35,6 @@ public static boolean isEnvVarTrue(String name) {
 		}
 	}
 
-	@ExpectPlatform
-	@Environment(EnvType.CLIENT)
-	public static boolean isActiveAndMatches(KeyMapping mapping, InputConstants.Key keyCode) {
-		throw new AssertionError();
-	}
-
 	@ExpectPlatform
 	public static void sendCreatePacketToServer(SimplePacketBase packet) {
 		throw new AssertionError();

common/src/main/java/com/railwayteam/railways/util/client/ClientUtils.java

@@ -0,0 +1,15 @@
+package com.railwayteam.railways.util.client;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.KeyMapping;
+
+@Environment(EnvType.CLIENT)
+public class ClientUtils {
+    @ExpectPlatform
+    public static boolean isActiveAndMatches(KeyMapping mapping, InputConstants.Key keyCode) {
+        throw new AssertionError();
+    }
+}

fabric/src/main/java/com/railwayteam/railways/util/client/fabric/ClientUtilsImpl.java

@@ -0,0 +1,14 @@
+package com.railwayteam.railways.util.client.fabric;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import io.github.fabricators_of_create.porting_lib.util.KeyBindingHelper;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.KeyMapping;
+
+@Environment(EnvType.CLIENT)
+public class ClientUtilsImpl {
+    public static boolean isActiveAndMatches(KeyMapping mapping, InputConstants.Key keyCode) {
+        return KeyBindingHelper.isActiveAndMatches(mapping, keyCode);
+    }
+}

fabric/src/main/java/com/railwayteam/railways/util/fabric/UtilsImpl.java

@@ -1,16 +1,11 @@
 package com.railwayteam.railways.util.fabric;
 
-import com.mojang.blaze3d.platform.InputConstants;
 import com.simibubi.create.AllPackets;
 import com.simibubi.create.content.trains.HonkPacket;
 import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
-import io.github.fabricators_of_create.porting_lib.util.KeyBindingHelper;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.chunk.LevelChunk;
 
@@ -25,11 +20,6 @@ public static boolean isDevEnv() {
 		return FabricLoader.getInstance().isDevelopmentEnvironment();
 	}
 
-    @Environment(EnvType.CLIENT)
-    public static boolean isActiveAndMatches(KeyMapping mapping, InputConstants.Key keyCode) {
-		return KeyBindingHelper.isActiveAndMatches(mapping, keyCode);
-    }
-
     public static void sendCreatePacketToServer(SimplePacketBase packet) {
 		AllPackets.getChannel().sendToServer(packet);
     }

forge/src/main/java/com/railwayteam/railways/util/client/forge/ClientUtilsImpl.java

@@ -0,0 +1,13 @@
+package com.railwayteam.railways.util.client.forge;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.client.KeyMapping;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+@OnlyIn(Dist.CLIENT)
+public class ClientUtilsImpl {
+    public static boolean isActiveAndMatches(KeyMapping mapping, InputConstants.Key keyCode) {
+        return mapping.isActiveAndMatches(keyCode);
+    }
+}

forge/src/main/java/com/railwayteam/railways/util/forge/UtilsImpl.java

@@ -1,14 +1,10 @@
 package com.railwayteam.railways.util.forge;
 
-import com.mojang.blaze3d.platform.InputConstants;
 import com.simibubi.create.AllPackets;
 import com.simibubi.create.content.trains.HonkPacket;
 import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.level.ChunkEvent;
 import net.minecraftforge.fml.loading.FMLLoader;
@@ -26,11 +22,6 @@ public static boolean isDevEnv() {
 		return !FMLLoader.isProduction();
 	}
 
-    @OnlyIn(Dist.CLIENT)
-    public static boolean isActiveAndMatches(KeyMapping mapping, InputConstants.Key keyCode) {
-		return mapping.isActiveAndMatches(keyCode);
-    }
-
     public static void sendCreatePacketToServer(SimplePacketBase packet) {
 		AllPackets.getChannel().sendToServer(packet);
     }