General cleanup and porting of missed modules

VazkiiMods · Nov 5, 2023 · 386b733 · 386b733
1 parent f92b968
commit 386b733
Show file tree

Hide file tree

Showing 12 changed files with 270 additions and 229 deletions.
diff --git a/src/main/java/vazkii/quark/content/experimental/client/screen/VariantSelectorScreen.java b/src/main/java/vazkii/quark/content/experimental/client/screen/VariantSelectorScreen.java
@@ -1,19 +1,9 @@
 package vazkii.quark.content.experimental.client.screen;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.lwjgl.opengl.GL11;
-
 import com.google.common.collect.ImmutableSet;
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.blaze3d.vertex.VertexFormat;
-
+import com.mojang.blaze3d.vertex.*;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
@@ -26,8 +16,12 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import org.lwjgl.opengl.GL11;
 import vazkii.quark.content.experimental.module.VariantSelectorModule;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class VariantSelectorScreen extends Screen {
 
 	float timeIn = 0;
@@ -176,7 +170,7 @@ public void tick() {
 
 			if(slotSelected != -1) {
 				String variant = slotSelected == 0 ? "" : variants.get(slotSelected - 1);
-				VariantSelectorModule.setClientVariant(variant, true);
+				VariantSelectorModule.Client.setClientVariant(variant, true);
 				mc.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));
 			}
 		}

diff --git a/src/main/java/vazkii/quark/content/experimental/module/EnchantmentsBegoneModule.java b/src/main/java/vazkii/quark/content/experimental/module/EnchantmentsBegoneModule.java
@@ -9,20 +9,20 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.EnchantmentInstance;
-import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.config.Config;
 import vazkii.zeta.event.ZAnvilUpdate;
 import vazkii.zeta.event.ZConfigChanged;
 import vazkii.zeta.event.bus.LoadEvent;
 import vazkii.zeta.event.bus.PlayEvent;
+import vazkii.zeta.module.ZetaLoadModule;
 import vazkii.zeta.module.ZetaModule;
 
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-@LoadModule(category = "experimental", enabledByDefault = false, hasSubscriptions = true)
+@ZetaLoadModule(category = "experimental", enabledByDefault = false)
 public class EnchantmentsBegoneModule extends ZetaModule {
 
 	@Config

diff --git a/src/main/java/vazkii/quark/content/experimental/module/GameNerfsModule.java b/src/main/java/vazkii/quark/content/experimental/module/GameNerfsModule.java
@@ -1,7 +1,6 @@
 package vazkii.quark.content.experimental.module;
 
 import com.mojang.serialization.Dynamic;
-
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
@@ -20,10 +19,8 @@
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.Level;
-
 import net.minecraftforge.eventbus.api.Event;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.config.Config;
 import vazkii.zeta.event.*;
 import vazkii.zeta.event.bus.LoadEvent;
@@ -37,7 +34,7 @@
 import java.util.UUID;
 import java.util.function.Predicate;
 
-@LoadModule(category = "experimental", enabledByDefault = false, hasSubscriptions = true)
+@ZetaLoadModule(category = "experimental", enabledByDefault = false)
 public class GameNerfsModule extends ZetaModule {
 
 	private static final String TAG_TRADES_ADJUSTED = "quark:zombie_trades_adjusted";