Fixing issues for server side processing

Brian-Wuest · Jan 7, 2025 · 92632f6 · 92632f6
1 parent f495d78
commit 92632f6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 38 deletions.
diff --git a/Forge/src/main/java/com/wuest/prefab/Prefab.java b/Forge/src/main/java/com/wuest/prefab/Prefab.java
@@ -9,11 +9,7 @@
 import net.minecraft.client.KeyMapping;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -111,7 +107,7 @@ public Prefab() {
         // Register the setup method for mod-loading
         bus.addListener(this::setup);
 
-        bus.addListener(ClientProxy::creativeModeTabRegister);
+        bus.addListener(CommonProxy::creativeModeTabRegister);
 
         MinecraftForge.EVENT_BUS.addListener(this::serverStart);
 

diff --git a/Forge/src/main/java/com/wuest/prefab/events/ClientEventHandler.java b/Forge/src/main/java/com/wuest/prefab/events/ClientEventHandler.java
@@ -19,15 +19,13 @@
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.InputEvent;
-import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.TickEvent.ClientTickEvent;
 import net.minecraftforge.event.entity.EntityJoinLevelEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.network.PacketDistributor;
 
 import java.util.ArrayList;
 

diff --git a/Forge/src/main/java/com/wuest/prefab/proxy/ClientProxy.java b/Forge/src/main/java/com/wuest/prefab/proxy/ClientProxy.java
@@ -53,8 +53,6 @@
  */
 @SuppressWarnings({"WeakerAccess", "SpellCheckingInspection"})
 public class ClientProxy extends CommonProxy {
-    public static final ResourceKey<CreativeModeTab> CREATIVE_TAB_KEY = ResourceKey.create(Registries.CREATIVE_MODE_TAB, new ResourceLocation(Prefab.MODID, "prefab"));
-
     /**
      * The hashmap of mod guis.
      */
@@ -196,30 +194,6 @@ public void openGuiForBlock(BlockPos blockPos, Level world, BaseConfig config) {
     public void clientSetup(FMLClientSetupEvent clientSetupEvent) {
     }
 
-    public static void creativeModeTabRegister(RegisterEvent event) {
-        event.register(Registries.CREATIVE_MODE_TAB, helper -> {
-            helper.register(ClientProxy.CREATIVE_TAB_KEY, CreativeModeTab.builder().icon(() -> new ItemStack(ModRegistry.ItemLogo.get()))
-                    .title(Component.translatable("itemGroup.prefab.logo"))
-                    .withLabelColor(0x00FF00)
-                    .displayItems((params, output) -> {
-                        ModRegistry.ITEMS.getEntries().forEach((reg) ->
-                        {
-                            Item currentItem = reg.get();
-
-                            // Only accept the structure scanner in the creative menu when this is in debug mode.
-                            if (Prefab.isDebug && currentItem == ModRegistry.StructureScannerItem.get()) {
-                                output.accept(reg.get());
-                            } else if (currentItem == ModRegistry.ItemLogo.get()) {
-                                return;
-                            }
-
-                            output.accept(new ItemStack(reg.get()));
-                        });
-                    })
-                    .build());
-        });
-    }
-
     private static class PreviewLayer extends RenderType {
         public PreviewLayer() {
             super(Prefab.MODID + ".preview", DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, true, true,

diff --git a/Forge/src/main/java/com/wuest/prefab/proxy/CommonProxy.java b/Forge/src/main/java/com/wuest/prefab/proxy/CommonProxy.java
@@ -8,6 +8,7 @@
 import com.wuest.prefab.config.StructureScannerConfig;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.CreativeModeTab;
@@ -33,6 +34,8 @@
  */
 @SuppressWarnings({"SpellCheckingInspection", "WeakerAccess"})
 public class CommonProxy {
+    public static final ResourceKey<CreativeModeTab> CREATIVE_TAB_KEY = ResourceKey.create(Registries.CREATIVE_MODE_TAB, new ResourceLocation(Prefab.MODID, "prefab"));
+
     public static ModConfiguration proxyConfiguration;
     public static ForgeConfigSpec COMMON_SPEC;
     public static Path Config_File_Path;
@@ -99,4 +102,28 @@ public void openGuiForBlock(BlockPos blockPos, Level world, BaseConfig config) {
 
     public void clientSetup(FMLClientSetupEvent clientSetupEvent) {
     }
+
+    public static void creativeModeTabRegister(RegisterEvent event) {
+        event.register(Registries.CREATIVE_MODE_TAB, helper -> {
+            helper.register(CommonProxy.CREATIVE_TAB_KEY, CreativeModeTab.builder().icon(() -> new ItemStack(ModRegistry.ItemLogo.get()))
+                    .title(Component.translatable("itemGroup.prefab.logo"))
+                    .withLabelColor(0x00FF00)
+                    .displayItems((params, output) -> {
+                        ModRegistry.ITEMS.getEntries().forEach((reg) ->
+                        {
+                            Item currentItem = reg.get();
+
+                            // Only accept the structure scanner in the creative menu when this is in debug mode.
+                            if (Prefab.isDebug && currentItem == ModRegistry.StructureScannerItem.get()) {
+                                output.accept(reg.get());
+                            } else if (currentItem == ModRegistry.ItemLogo.get()) {
+                                return;
+                            }
+
+                            output.accept(new ItemStack(reg.get()));
+                        });
+                    })
+                    .build());
+        });
+    }
 }
diff --git a/Forge/src/main/java/com/wuest/prefab/structures/config/HouseConfiguration.java b/Forge/src/main/java/com/wuest/prefab/structures/config/HouseConfiguration.java
@@ -6,9 +6,7 @@
 import com.wuest.prefab.config.EntityPlayerConfiguration;
 import com.wuest.prefab.gui.GuiLangKeys;
 import com.wuest.prefab.proxy.messages.PlayerEntityTagMessage;
-import com.wuest.prefab.structures.messages.StructureTagMessage;
 import com.wuest.prefab.structures.predefined.StructureHouse;
-import com.wuest.prefab.structures.render.StructureRenderHandler;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
@@ -18,7 +16,6 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.DyeColor;
 import net.minecraftforge.network.NetworkDirection;
-import net.minecraftforge.network.PacketDistributor;
 
 /**
  * This class is used to determine the configuration for a particular house.

diff --git a/Forge/src/main/java/com/wuest/prefab/structures/render/StructureRenderHandler.java b/Forge/src/main/java/com/wuest/prefab/structures/render/StructureRenderHandler.java
@@ -1,6 +1,5 @@
 package com.wuest.prefab.structures.render;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import com.wuest.prefab.Prefab;
 import com.wuest.prefab.blocks.BlockStructureScanner;
@@ -11,7 +10,6 @@
 import com.wuest.prefab.structures.config.StructureConfiguration;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;