Cleaning up code

Moving things back to fabric specific code that needs to be there.
Brian-Wuest · Sep 24, 2024 · 3e60993 · 3e60993
1 parent b62e18b
commit 3e60993
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/Fabric/src/main/java/com/wuest/prefab/ClientModRegistry.java b/Fabric/src/main/java/com/wuest/prefab/ClientModRegistry.java
@@ -1,23 +1,28 @@
 package com.wuest.prefab;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import com.prefab.ClientModRegistryBase;
 import com.prefab.ModRegistryBase;
 import com.wuest.prefab.config.EntityPlayerConfiguration;
 import com.wuest.prefab.network.message.PlayerConfigPayload;
 import com.wuest.prefab.network.message.ConfigSyncPayload;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderType;
+import org.lwjgl.glfw.GLFW;
+
 import java.util.UUID;
 
 public class ClientModRegistry {
-
+    public static KeyMapping keyBinding;
     public static EntityPlayerConfiguration playerConfig = new EntityPlayerConfiguration();
 
     public static void registerModComponents() {
-        ClientModRegistryBase.registerKeyBindings();
+        ClientModRegistry.registerKeyBindings();
 
         ClientModRegistry.registerBlockLayers();
 
@@ -64,4 +69,14 @@ private static void registerBlockLayers() {
         BlockRenderLayerMap.INSTANCE.putBlock(ModRegistryBase.LightSwitch, RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(ModRegistryBase.DarkLamp, RenderType.cutoutMipped());
     }
+
+    public static void registerKeyBindings() {
+        // TODO: Create translation keys.
+        keyBinding = KeyBindingHelper.registerKeyBinding(new KeyMapping(
+                "Build Current Structure", // The translation key of the keybinding's name
+                InputConstants.Type.KEYSYM,
+                GLFW.GLFW_KEY_B,
+                "Prefab - Structure Preview" // The translation key of the keybinding's category.
+        ));
+    }
 }
diff --git a/Fabric/src/main/java/com/wuest/prefab/events/ClientEvents.java b/Fabric/src/main/java/com/wuest/prefab/events/ClientEvents.java
@@ -2,6 +2,7 @@
 
 import com.prefab.ClientModRegistryBase;
 import com.prefab.structures.config.BasicStructureConfiguration;
+import com.wuest.prefab.ClientModRegistry;
 import com.wuest.prefab.structures.events.StructureClientEventHandler;
 import com.wuest.prefab.structures.gui.GuiStructure;
 import com.wuest.prefab.structures.items.ItemBasicStructure;
@@ -28,7 +29,7 @@ public static void registerClientEvents() {
 
     public static void registerClientEndTick() {
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            if (ClientModRegistryBase.keyBinding.isDown()) {
+            if (ClientModRegistry.keyBinding.isDown()) {
                 if (StructureRenderHandler.currentStructure != null) {
                     ItemStack mainHandStack = Minecraft.getInstance().player.getMainHandItem();
                     ItemStack offHandStack = Minecraft.getInstance().player.getOffhandItem();

diff --git a/Shared/com/prefab/ClientModRegistryBase.java b/Shared/com/prefab/ClientModRegistryBase.java
@@ -1,6 +1,5 @@
 package com.prefab;
 
-import com.mojang.blaze3d.platform.InputConstants;
 import com.prefab.base.BaseConfig;
 import com.prefab.gui.GuiBase;
 import com.prefab.structures.items.StructureItem;
@@ -11,8 +10,6 @@
 import com.prefab.config.StructureScannerConfig;
 import com.wuest.prefab.gui.screens.GuiStructureScanner;
 import com.wuest.prefab.structures.gui.GuiStructure;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.BiomeColors;
@@ -23,15 +20,13 @@
 import net.minecraft.world.level.GrassColor;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
-import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
 
 public class ClientModRegistryBase {
-    public static KeyMapping keyBinding;
     public static ArrayList<StructureScannerConfig> structureScanners;
 
     /**
@@ -44,8 +39,6 @@ public class ClientModRegistryBase {
     }
 
     public static void registerModComponents() {
-        ClientModRegistryBase.registerKeyBindings();
-
         ClientModRegistryBase.RegisterGuis();
     }
 
@@ -122,15 +115,4 @@ public static void RegisterGuis() {
             consumer.accept(null);
         }
     }
-
-    public static void registerKeyBindings() {
-        // TODO: Create translation keys.
-        keyBinding = KeyBindingHelper.registerKeyBinding(new KeyMapping(
-                "Build Current Structure", // The translation key of the keybinding's name
-                InputConstants.Type.KEYSYM,
-                GLFW.GLFW_KEY_B,
-                "Prefab - Structure Preview" // The translation key of the keybinding's category.
-        ));
-    }
-
 }
diff --git a/Shared/com/prefab/gui/controls/GuiCheckBox.java b/Shared/com/prefab/gui/controls/GuiCheckBox.java
@@ -5,8 +5,6 @@
 import com.prefab.PrefabBase;
 import com.prefab.Utils;
 import com.prefab.gui.GuiUtils;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractButton;
@@ -163,7 +161,6 @@ public void updateWidgetNarration(NarrationElementOutput builder) {
         }
     }
 
-    @Environment(EnvType.CLIENT)
     public interface IPressable {
         void onPress(GuiCheckBox p_onPress_1_);
     }

diff --git a/Shared/com/prefab/structures/base/BuildingMethods.java b/Shared/com/prefab/structures/base/BuildingMethods.java
@@ -231,6 +231,8 @@ public static Triple<Boolean, BlockState, BlockPos> CheckBuildSpaceForAllowedBlo
 				}
 
 				if (!world.isEmptyBlock(currentPos)) {
+					// TODO: Create own event interface which is implemented in mod-loader specific process
+					// pass in the world, player, position, block state.
 					if (!PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak(world, player, currentPos, world.getBlockState(currentPos), null)) {
 						return new Triple<>(false, blockState, currentPos);
 					}