segregated all client only events to client replacement module classe…

…s. No more client setup in common module
VazkiiMods · Aug 5, 2024 · 8c9ec1b · 8c9ec1b
1 parent 9e164f2
commit 8c9ec1b
Show file tree

Hide file tree

Showing 19 changed files with 159 additions and 90 deletions.
diff --git a/build.gradle b/build.gradle
@@ -124,8 +124,8 @@ dependencies {
     //runtimeOnly fg.deobf("dev.emi:emi-forge:${deps.emi}")
     runtimeOnly fg.deobf("curse.maven:spark-361579:${deps.spark}")
 
-    //implementation fg.deobf("org.violetmoon.zeta:Zeta:1.0-21")
-    implementation fg.deobf("curse.maven:zeta-968868:5594191")
+    //implementation fg.deobf("org.violetmoon.zeta:Zeta:1.0-24f")
+    implementation fg.deobf("curse.maven:zeta-968868:5594814")
     implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${deps.terrablender}")
     implementation fg.deobf("curse.maven:jei-238222:${deps.jei}")
     implementation fg.deobf("curse.maven:flan-forge-493246:${deps.flan}")

diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java
@@ -97,11 +97,6 @@ public final void register(ZRegister event) {
         event.getRegistry().register(repulsorParticle, "repulsor", Registries.PARTICLE_TYPE);
     }
 
-    @LoadEvent
-    public final void clientSetup(ZClientSetup event) {
-        BlockEntityRenderers.register(magnetizedBlockType, MagnetizedBlockRenderer::new);
-    }
-
     @PlayEvent
     public void tickStart(ZLevelTick.Start event) {
         MagnetSystem.tick(true, event.getLevel());
@@ -122,4 +117,13 @@ public void crawlDigest(ZRecipeCrawl.Digest event) {
         MagnetSystem.onDigest(event);
     }
 
+    @ZetaLoadModule(clientReplacement = true)
+    public static final class Client extends MagnetsModule {
+
+        @LoadEvent
+        public void clientSetup(ZClientSetup event) {
+            BlockEntityRenderers.register(magnetizedBlockType, MagnetizedBlockRenderer::new);
+        }
+    }
+
 }
diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java
@@ -188,12 +188,6 @@ public void addAdditionalHints(ZGatherHints event) {
 		event.accept(matrixEnchanter.asItem(), comp);
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		MenuScreens.register(menuType, MatrixEnchantingScreen::new);
-		BlockEntityRenderers.register(blockEntityType, MatrixEnchantingTableRenderer::new);
-	}
-
 	@PlayEvent
 	public void onBlockPlaced(ZBlock.EntityPlace event) {
 		if(event.getPlacedBlock().getBlock().equals(Blocks.ENCHANTING_TABLE) && automaticallyConvert)
@@ -271,6 +265,13 @@ private void parseInfluences() {
 
 	@ZetaLoadModule(clientReplacement = true)
 	public static class Client extends MatrixEnchantingModule {
+
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
+			MenuScreens.register(menuType, MatrixEnchantingScreen::new);
+			BlockEntityRenderers.register(blockEntityType, MatrixEnchantingTableRenderer::new);
+		}
+
 		@PlayEvent
 		public void onTooltip(ZItemTooltip event) {
 			ItemStack stack = event.getItemStack();

diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/CrafterModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/CrafterModule.java
@@ -55,8 +55,12 @@ public final void register(ZRegister event) {
         Quark.ZETA.registry.register(blockEntityType, "crafter", Registries.BLOCK_ENTITY_TYPE);
     }
 
-    @LoadEvent
-    public final void clientSetup(ZClientSetup event) {
-        event.enqueueWork(() -> MenuScreens.register(menuType, CrafterScreen::new));
+    @ZetaLoadModule(clientReplacement = true)
+    public static final class Client extends CrafterModule {
+
+        @LoadEvent
+        public void clientSetup(ZClientSetup event) {
+            event.enqueueWork(() -> MenuScreens.register(menuType, CrafterScreen::new));
+        }
     }
 }
diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java
@@ -191,10 +191,6 @@ public final void register(ZRegister event) {
         event.getRegistry().register(menuType, "feeding_trough", Registries.MENU);
     }
 
-    @LoadEvent
-    public final void clientSetup(ZClientSetup event) {
-        event.enqueueWork(() -> MenuScreens.register(menuType, TroughScreen::new));
-    }
 
     private static final class TroughPointer {
         private final BlockPos pos;
@@ -310,4 +306,15 @@ private static FakePlayer getOrCreateFakePlayer(ServerLevel serverLevel){
             return any.get();
         }
     }
+
+
+    @ZetaLoadModule(clientReplacement = true)
+    public static final class Client extends FeedingTroughModule{
+
+        @LoadEvent
+        public void clientSetup(ZClientSetup event) {
+            event.enqueueWork(() -> MenuScreens.register(menuType, TroughScreen::new));
+        }
+    }
+
 }
diff --git a/src/main/java/org/violetmoon/quark/content/building/block/CelebratoryLampBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/CelebratoryLampBlock.java
@@ -0,0 +1,27 @@
+package org.violetmoon.quark.content.building.block;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.BlockGetter;
+import org.jetbrains.annotations.Nullable;
+import org.violetmoon.zeta.block.ZetaBlock;
+import org.violetmoon.zeta.module.ZetaModule;
+
+import java.util.List;
+
+public class CelebratoryLampBlock extends ZetaBlock {
+
+    public CelebratoryLampBlock(String regname, @Nullable ZetaModule module, Properties properties) {
+        super(regname, module, properties);
+    }
+
+    @Override
+    public void appendHoverText(ItemStack pStack, @Nullable BlockGetter pLevel, List<Component> pTooltip, TooltipFlag pFlag) {
+        super.appendHoverText(pStack, pLevel, pTooltip, pFlag);
+        if (pFlag.isAdvanced()) {
+            pTooltip.add(1, Component.translatable("quark.misc.celebration").withStyle(ChatFormatting.GRAY));
+        }
+    }
+}
diff --git a/src/main/java/org/violetmoon/quark/content/building/module/CelebratoryLampsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/CelebratoryLampsModule.java
@@ -1,19 +1,13 @@
 package org.violetmoon.quark.content.building.module;
 
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.CreativeModeTabs;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 
-import org.violetmoon.zeta.block.ZetaBlock;
+import org.violetmoon.quark.content.building.block.CelebratoryLampBlock;
 import org.violetmoon.zeta.config.Config;
 import org.violetmoon.zeta.event.bus.LoadEvent;
-import org.violetmoon.zeta.event.bus.PlayEvent;
 import org.violetmoon.zeta.event.load.ZRegister;
-import org.violetmoon.zeta.event.play.ZItemTooltip;
 import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
 
@@ -23,25 +17,12 @@ public class CelebratoryLampsModule extends ZetaModule {
 	@Config
 	public static int lightLevel = 15;
 
-	private static Block stone_lamp, stone_brick_lamp;
+	public static Block stone_lamp, stone_brick_lamp;
 
 	@LoadEvent
 	public final void register(ZRegister event) {
-		stone_lamp = new ZetaBlock("stone_lamp", this, Block.Properties.copy(Blocks.STONE).lightLevel(s -> lightLevel)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
-		stone_brick_lamp = new ZetaBlock("stone_brick_lamp", this, Block.Properties.copy(Blocks.STONE_BRICKS).lightLevel(s -> lightLevel)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
-	}
-
-	@ZetaLoadModule(clientReplacement = true)
-	public static class Client extends CelebratoryLampsModule {
-		@PlayEvent
-		public void onTooltip(ZItemTooltip event) {
-			if(event.getFlags().isAdvanced()) {
-				ItemStack stack = event.getItemStack();
-				Item item = stack.getItem();
-				if(item == stone_lamp.asItem() || item == stone_brick_lamp.asItem())
-					event.getToolTip().add(1, Component.translatable("quark.misc.celebration").withStyle(ChatFormatting.GRAY));
-			}
-		}
+		stone_lamp = new CelebratoryLampBlock("stone_lamp", this, Block.Properties.copy(Blocks.STONE).lightLevel(s -> lightLevel)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
+		stone_brick_lamp = new CelebratoryLampBlock("stone_brick_lamp", this, Block.Properties.copy(Blocks.STONE_BRICKS).lightLevel(s -> lightLevel)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
 	}
 
 }
diff --git a/src/main/java/org/violetmoon/quark/content/building/module/GlassItemFrameModule.java b/src/main/java/org/violetmoon/quark/content/building/module/GlassItemFrameModule.java
@@ -65,13 +65,15 @@ public final void register(ZRegister event) {
 		CreativeTabManager.endDaisyChain();
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		EntityRenderers.register(glassFrameEntity, GlassItemFrameRenderer::new);
-	}
 
 	@ZetaLoadModule(clientReplacement = true)
 	public static class Client extends GlassItemFrameModule {
+
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
+			EntityRenderers.register(glassFrameEntity, GlassItemFrameRenderer::new);
+		}
+
 		@LoadEvent
 		public void registerAdditionalModels(ZAddModels event) {
 			event.register(new ModelResourceLocation(Quark.MOD_ID, "extra/glass_item_frame", "inventory"));

diff --git a/src/main/java/org/violetmoon/quark/content/building/module/MorePottedPlantsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/MorePottedPlantsModule.java
@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.Map;
 
+import net.minecraft.client.color.block.BlockColors;
+import org.violetmoon.zeta.client.event.load.ZAddBlockColorHandlers;
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.event.bus.LoadEvent;
 import org.violetmoon.zeta.event.load.ZRegister;
@@ -69,12 +71,16 @@ private FlowerPotBlock add(ZRegister event, Block block, String name) {
 		return event.getVariantRegistry().addFlowerPot(block, name, Functions.identity());
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		for(Block b : tintedBlocks.keySet()) {
-			BlockState tState = tintedBlocks.get(b).defaultBlockState();
-			BlockColor color = (state, worldIn, pos, tintIndex) -> Minecraft.getInstance().getBlockColors().getColor(tState, worldIn, pos, tintIndex);
-			Minecraft.getInstance().getBlockColors().register(color, b);
+	@ZetaLoadModule(clientReplacement = true)
+	public static final class Client extends MorePottedPlantsModule {
+		@LoadEvent
+		public void registerColors(ZAddBlockColorHandlers event) {
+			for(Block b : tintedBlocks.keySet()) {
+				BlockState tState = tintedBlocks.get(b).defaultBlockState();
+				BlockColors blockColors = event.getBlockColors();
+				BlockColor color = (state, worldIn, pos, tintIndex) -> blockColors.getColor(tState, worldIn, pos, tintIndex);
+				event.register(color, b);
+			}
 		}
 	}
 

diff --git a/src/main/java/org/violetmoon/quark/content/building/module/MoreStoneVariantsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/MoreStoneVariantsModule.java
@@ -17,8 +17,8 @@
 import org.violetmoon.zeta.config.ConfigFlagManager;
 import org.violetmoon.zeta.event.bus.LoadEvent;
 import org.violetmoon.zeta.event.bus.PlayEvent;
+import org.violetmoon.zeta.event.load.ZGatherAdditionalFlags;
 import org.violetmoon.zeta.event.load.ZRegister;
-import org.violetmoon.zeta.event.play.loading.ZGatherAdditionalFlags;
 import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
 import org.violetmoon.zeta.registry.CreativeTabManager;
@@ -60,7 +60,7 @@ public final void register(ZRegister event) {
 		instance = this;
 	}
 
-	@PlayEvent
+	@LoadEvent
 	public final void moreFlags(ZGatherAdditionalFlags event) {
 		ConfigFlagManager manager = event.flagManager();
 		manager.putFlag(this, "granite", true);
@@ -103,6 +103,8 @@ private void add(ZRegister event, String name, MapColor color, SoundType sound,
 
 		event.getVariantRegistry().addSlabStairsWall(bricks, null);
 		CreativeTabManager.endDaisyChain();
+
+
 	}
 
 }
diff --git a/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java
@@ -80,9 +80,13 @@ public void itemUsed(ZRightClickBlock event) {
 		}
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
+	@ZetaLoadModule(clientReplacement = true)
+	public static class Client extends StoolsModule {
+
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
 		EntityRenderers.register(stoolEntity, StoolEntityRenderer::new);
 	}
+	}
 
 }
diff --git a/...n/java/org/violetmoon/quark/content/management/module/ExpandedItemInteractionsModule.java b/...n/java/org/violetmoon/quark/content/management/module/ExpandedItemInteractionsModule.java
@@ -93,11 +93,6 @@ public final void register(ZRegister event) {
 		Quark.ZETA.registry.register(heldShulkerBoxMenuType, "held_shulker_box", Registries.MENU);
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		MenuScreens.register(heldShulkerBoxMenuType, HeldShulkerBoxScreen::new);
-	}
-
 	@LoadEvent
 	public final void configChanged(ZConfigChanged event) {
 		staticEnabled = enabled;
@@ -374,6 +369,12 @@ private static ItemStack tryAddToShulkerBox(Player player, ItemStack shulkerBox,
 
 	@ZetaLoadModule(clientReplacement = true)
 	public static class Client extends ExpandedItemInteractionsModule {
+
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
+			MenuScreens.register(heldShulkerBoxMenuType, HeldShulkerBoxScreen::new);
+		}
+
 		@PlayEvent
 		public void gatherTooltip(ZRenderTooltip.GatherComponents.Low event) {
 			if(!enableArmorInteraction && (!enableShulkerBoxInteraction || !allowOpeningShulkerBoxes))

diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java
@@ -153,8 +153,12 @@ public final void setup(ZCommonSetup event) {
 		crabSpawnableTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "crab_spawnable"));
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		EntityRenderers.register(crabType, CrabRenderer::new);
+	@ZetaLoadModule(clientReplacement = true)
+	public static class Client extends CrabsModule {
+
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
+			EntityRenderers.register(crabType, CrabRenderer::new);
+		}
 	}
 }
diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/ShibaModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/ShibaModule.java
@@ -69,9 +69,15 @@ public final void entityAttrs(ZEntityAttributeCreation e) {
 		e.put(shibaType, Wolf.createAttributes().build());
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		EntityRenderers.register(shibaType, ShibaRenderer::new);
+	@ZetaLoadModule(clientReplacement = true)
+	public static class Client extends ShibaModule {
+
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
+			EntityRenderers.register(shibaType, ShibaRenderer::new);
+		}
 	}
 
+
+
 }
diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/StonelingsModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/StonelingsModule.java
@@ -78,9 +78,13 @@ public final void entityAttrs(ZEntityAttributeCreation e) {
 		e.put(stonelingType, Stoneling.prepareAttributes().build());
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		EntityRenderers.register(stonelingType, StonelingRenderer::new);
+	@ZetaLoadModule(clientReplacement = true)
+	public static class Client extends StonelingsModule {
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
+			EntityRenderers.register(stonelingType, StonelingRenderer::new);
+		}
+
 	}
 
 }
diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/ToretoiseModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/ToretoiseModule.java
@@ -84,9 +84,13 @@ public final void entityAttrs(ZEntityAttributeCreation e) {
 		e.put(toretoiseType, Toretoise.prepareAttributes().build());
 	}
 
-	@LoadEvent
-	public final void clientSetup(ZClientSetup event) {
-		EntityRenderers.register(toretoiseType, ToretoiseRenderer::new);
-	}
+	@ZetaLoadModule(clientReplacement = true)
+	public static class Client extends ToretoiseModule {
 
+		@LoadEvent
+		public final void clientSetup(ZClientSetup event) {
+			EntityRenderers.register(toretoiseType, ToretoiseRenderer::new);
+		}
+
+	}
 }