Merge branch 'zeta120' of https://github.com/VazkiiMods/Quark into ze…

…ta120
VazkiiMods · Dec 30, 2023 · f99bc24 · f99bc24
2 parents f8330c3 + 5219425
commit f99bc24
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/contributors.properties b/contributors.properties
@@ -881,7 +881,6 @@ jeniuslu=2
 Bobisnotap=1
 Rosenator=2
 MrBons4i=2
-VolrathStormborn=2
 Lorykeee=2
 TheMelon27=2
 YYMB=2
@@ -908,3 +907,11 @@ DarrSkunk=2
 Erratix3107=1
 MythicHH=2
 Infernal187=2
+Fuxedo_Tox=2
+tangolikeelk=1
+alex2005a=2
+billbertking1=2
+badsbee=2
+Guildes_=3
+peapen_teh_elf=2
+julienmsorel=2
diff --git a/src/main/java/org/violetmoon/quark/QuarkRemapHandler.java b/src/main/java/org/violetmoon/quark/QuarkRemapHandler.java
@@ -18,7 +18,8 @@ public class QuarkRemapHandler {
     private static final Map<String, String> REMAP = new HashMap<>();
 
     static {
-        REMAP.put("quark:crafter", "minecraft:crafter");
+        //fixme crafter
+        //REMAP.put("quark:crafter", "minecraft:crafter");
         REMAP.put("quark:polished_tuff", "minecraft:polished_tuff");
     }
 

diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/TotemOfHoldingModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/TotemOfHoldingModule.java
@@ -44,7 +44,7 @@ public class TotemOfHoldingModule extends ZetaModule {
 	@Config(description = "Set this to false to remove the behaviour where totems destroy themselves if the player dies again.")
 	public static boolean darkSoulsMode = true;
 
-	@Config(name = "Spawn Totem on PVP Kill", description = "Totem will always spawn if the player killer is himself.")
+	@Config(name = "Spawn Totem on PVP Kill", description = "Totem will always spawn if the player killer is themselves.")
 	public static boolean enableOnPK = false;
 
 	@Config(description = "Set this to true to make it so that if a totem is destroyed, the items it holds are destroyed alongside it rather than dropped")

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
@@ -1,5 +1,13 @@
 package org.violetmoon.quark.content.automation.module;
 
+import net.minecraft.client.gui.screens.MenuScreens;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.material.MapColor;
+import net.minecraftforge.common.extensions.IForgeMenuType;
 import org.violetmoon.quark.base.Quark;
 import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.quark.content.automation.block.CrafterBlock;
@@ -9,19 +17,10 @@
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.event.bus.LoadEvent;
 import org.violetmoon.zeta.event.load.ZRegister;
-import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
 
-import net.minecraft.client.gui.screens.MenuScreens;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.material.MapColor;
-import net.minecraftforge.common.extensions.IForgeMenuType;
-
-@ZetaLoadModule(category = "automation")
+//fixme Fix crafter PITA atm and frankly not worth delaying a stable release over
+//@ZetaLoadModule(category = "automation")
 public class CrafterModule extends ZetaModule {
 
     public static Block block;

diff --git a/src/main/java/org/violetmoon/zeta/module/TentativeModule.java b/src/main/java/org/violetmoon/zeta/module/TentativeModule.java
@@ -1,14 +1,12 @@
 package org.violetmoon.zeta.module;
 
-import java.util.List;
+import org.apache.commons.lang3.text.WordUtils;
+import org.violetmoon.zeta.util.ZetaSide;
+
 import java.util.Locale;
 import java.util.Set;
 import java.util.function.Function;
 
-import net.minecraftforge.api.distmarker.Dist;
-import org.apache.commons.lang3.text.WordUtils;
-import org.violetmoon.zeta.util.ZetaSide;
-
 /**
  * performs some common data-munging of the data straight off a ZetaLoadModule annotation
  */