Merge remote-tracking branch 'origin/zeta' into zeta

# Conflicts:
#	src/main/java/org/violetmoon/quark/content/experimental/config/BlockSuffixConfig.java

src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java

@@ -5,8 +5,8 @@
 import org.violetmoon.quark.addons.oddities.item.BackpackItem;
 import org.violetmoon.quark.base.Quark;
 import org.violetmoon.quark.base.block.QuarkBlock;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.quark.base.item.QuarkItem;
-import org.violetmoon.quark.base.module.config.Config;
 import org.violetmoon.quark.base.network.QuarkNetwork;
 import org.violetmoon.quark.base.network.message.oddities.HandleBackpackMessage;
 import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers;

src/main/java/org/violetmoon/quark/addons/oddities/module/CrateModule.java

@@ -5,7 +5,7 @@
 import org.violetmoon.quark.addons.oddities.client.screen.CrateScreen;
 import org.violetmoon.quark.addons.oddities.inventory.CrateMenu;
 import org.violetmoon.quark.base.Quark;
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.event.bus.LoadEvent;
 import org.violetmoon.zeta.event.load.ZRegister;

src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java

@@ -17,7 +17,7 @@
 import org.violetmoon.quark.addons.oddities.magnetsystem.MagnetSystem;
 import org.violetmoon.quark.api.event.RecipeCrawlEvent;
 import org.violetmoon.quark.base.Quark;
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.event.bus.LoadEvent;
 import org.violetmoon.zeta.event.bus.PlayEvent;

src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java

@@ -33,10 +33,10 @@
 import org.violetmoon.quark.addons.oddities.util.CustomInfluence;
 import org.violetmoon.quark.addons.oddities.util.Influence;
 import org.violetmoon.quark.base.Quark;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.quark.base.handler.MiscUtil;
 import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler;
 import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger;
-import org.violetmoon.quark.base.module.config.Config;
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.event.*;
 import org.violetmoon.zeta.event.bus.LoadEvent;

src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java

@@ -5,7 +5,7 @@
 import org.violetmoon.quark.addons.oddities.block.pipe.PipeBlock;
 import org.violetmoon.quark.addons.oddities.client.render.be.PipeRenderer;
 import org.violetmoon.quark.base.Quark;
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.zeta.client.event.load.ZAddModels;
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.event.bus.LoadEvent;

src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java

@@ -20,9 +20,9 @@
 import org.violetmoon.quark.addons.oddities.client.model.TinyPotatoModel;
 import org.violetmoon.quark.addons.oddities.client.render.be.TinyPotatoRenderer;
 import org.violetmoon.quark.base.Quark;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler;
 import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger;
-import org.violetmoon.quark.base.module.config.Config;
 import org.violetmoon.zeta.client.event.load.ZAddModels;
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.client.event.load.ZModelBakingCompleted;

src/main/java/org/violetmoon/quark/addons/oddities/module/TotemOfHoldingModule.java

@@ -17,7 +17,7 @@
 import org.violetmoon.quark.addons.oddities.client.render.entity.TotemOfHoldingRenderer;
 import org.violetmoon.quark.addons.oddities.entity.TotemOfHoldingEntity;
 import org.violetmoon.quark.base.Quark;
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.zeta.client.event.load.ZAddModels;
 import org.violetmoon.zeta.client.event.load.ZClientSetup;
 import org.violetmoon.zeta.event.bus.LoadEvent;

src/main/java/org/violetmoon/quark/base/module/config/Config.java → src/main/java/org/violetmoon/quark/base/config/Config.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config;
+package org.violetmoon.quark.base.config;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/org/violetmoon/quark/base/module/config/ConfigFlagManager.java → src/main/java/org/violetmoon/quark/base/config/ConfigFlagManager.java

@@ -1,12 +1,11 @@
-package org.violetmoon.quark.base.module.config;
+package org.violetmoon.quark.base.config;
 
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.*;
 
 import org.violetmoon.quark.base.handler.GeneralConfig;
-import org.violetmoon.quark.base.module.sync.SyncedFlagHandler;
 import org.violetmoon.zeta.Zeta;
 import org.violetmoon.zeta.event.bus.LoadEvent;
 import org.violetmoon.zeta.event.load.ZRegister;

src/main/java/org/violetmoon/quark/base/module/config/FlagCondition.java → src/main/java/org/violetmoon/quark/base/config/FlagCondition.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config;
+package org.violetmoon.quark.base.config;
 
 import java.util.function.BooleanSupplier;
 

src/main/java/org/violetmoon/quark/base/module/config/FlagLootCondition.java → src/main/java/org/violetmoon/quark/base/config/FlagLootCondition.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config;
+package org.violetmoon.quark.base.config;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;

src/main/java/org/violetmoon/quark/base/module/config/IConfigCallback.java → src/main/java/org/violetmoon/quark/base/config/IConfigCallback.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config;
+package org.violetmoon.quark.base.config;
 
 public interface IConfigCallback {
 

src/main/java/org/violetmoon/quark/base/module/sync/SyncedFlagHandler.java → src/main/java/org/violetmoon/quark/base/config/SyncedFlagHandler.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.sync;
+package org.violetmoon.quark.base.config;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.PacketListener;
@@ -9,7 +9,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
 import org.violetmoon.quark.base.network.QuarkNetwork;
 import org.violetmoon.quark.base.network.message.structural.S2CUpdateFlag;
 import org.violetmoon.zeta.event.bus.LoadEvent;

src/main/java/org/violetmoon/quark/base/module/config/type/BiomeTagConfig.java → src/main/java/org/violetmoon/quark/base/config/type/BiomeTagConfig.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -10,8 +10,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.violetmoon.quark.base.module.config.Config;
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
+import org.violetmoon.quark.base.config.Config;
+import org.violetmoon.quark.base.config.ConfigFlagManager;
 import org.violetmoon.zeta.module.ZetaModule;
 
 public class BiomeTagConfig implements IBiomeConfig, IConfigType {

src/main/java/org/violetmoon/quark/base/module/config/type/ClusterSizeConfig.java → src/main/java/org/violetmoon/quark/base/config/type/ClusterSizeConfig.java

@@ -1,6 +1,6 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.biome.Biome;

src/main/java/org/violetmoon/quark/base/module/config/type/CompoundBiomeConfig.java → src/main/java/org/violetmoon/quark/base/config/type/CompoundBiomeConfig.java

@@ -1,7 +1,7 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
-import org.violetmoon.quark.base.module.config.Config;
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
+import org.violetmoon.quark.base.config.Config;
+import org.violetmoon.quark.base.config.ConfigFlagManager;
 import org.violetmoon.zeta.module.ZetaModule;
 
 import net.minecraft.core.Holder;

src/main/java/org/violetmoon/quark/base/module/config/type/ConditionalEntitySpawnConfig.java → src/main/java/org/violetmoon/quark/base/config/type/ConditionalEntitySpawnConfig.java

@@ -1,7 +1,7 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
-import org.violetmoon.quark.base.module.config.Config;
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
+import org.violetmoon.quark.base.config.Config;
+import org.violetmoon.quark.base.config.ConfigFlagManager;
 import org.violetmoon.zeta.module.ZetaModule;
 
 public class ConditionalEntitySpawnConfig extends EntitySpawnConfig {

src/main/java/org/violetmoon/quark/base/module/config/type/CostSensitiveEntitySpawnConfig.java → src/main/java/org/violetmoon/quark/base/config/type/CostSensitiveEntitySpawnConfig.java

@@ -1,6 +1,6 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 
 public class CostSensitiveEntitySpawnConfig extends EntitySpawnConfig {
 

src/main/java/org/violetmoon/quark/base/module/config/type/DimensionConfig.java → src/main/java/org/violetmoon/quark/base/config/type/DimensionConfig.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
@@ -8,7 +8,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 
 public class DimensionConfig implements IConfigType {
 

src/main/java/org/violetmoon/quark/base/module/config/type/EntitySpawnConfig.java → src/main/java/org/violetmoon/quark/base/config/type/EntitySpawnConfig.java

@@ -1,7 +1,7 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
-import org.violetmoon.quark.base.module.config.Config;
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
+import org.violetmoon.quark.base.config.Config;
+import org.violetmoon.quark.base.config.ConfigFlagManager;
 import org.violetmoon.zeta.module.ZetaModule;
 
 public class EntitySpawnConfig implements IConfigType {

src/main/java/org/violetmoon/quark/base/module/config/type/IBiomeConfig.java → src/main/java/org/violetmoon/quark/base/config/type/IBiomeConfig.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
 import net.minecraft.core.Holder;
 import net.minecraft.world.level.biome.Biome;

src/main/java/org/violetmoon/quark/base/module/config/type/IConfigType.java → src/main/java/org/violetmoon/quark/base/config/type/IConfigType.java

@@ -1,6 +1,6 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
+import org.violetmoon.quark.base.config.ConfigFlagManager;
 import org.violetmoon.zeta.module.ZetaModule;
 
 public interface IConfigType {

src/main/java/org/violetmoon/quark/base/module/config/type/OrePocketConfig.java → src/main/java/org/violetmoon/quark/base/config/type/OrePocketConfig.java

@@ -1,8 +1,8 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
 import java.util.function.Consumer;
 
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;

src/main/java/org/violetmoon/quark/base/module/config/type/StrictBiomeConfig.java → src/main/java/org/violetmoon/quark/base/config/type/StrictBiomeConfig.java

@@ -1,10 +1,10 @@
-package org.violetmoon.quark.base.module.config.type;
+package org.violetmoon.quark.base.config.type;
 
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 
 import net.minecraft.core.Holder;
 import net.minecraft.world.level.biome.Biome;

src/main/java/org/violetmoon/quark/base/module/config/type/inputtable/ConvulsionMatrixConfig.java → src/main/java/org/violetmoon/quark/base/config/type/inputtable/ConvulsionMatrixConfig.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark.base.module.config.type.inputtable;
+package org.violetmoon.quark.base.config.type.inputtable;
 
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -7,9 +7,9 @@
 
 import javax.annotation.Nullable;
 
-import org.violetmoon.quark.base.module.config.Config;
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
-import org.violetmoon.quark.base.module.config.type.IConfigType;
+import org.violetmoon.quark.base.config.Config;
+import org.violetmoon.quark.base.config.ConfigFlagManager;
+import org.violetmoon.quark.base.config.type.IConfigType;
 import org.violetmoon.quark.content.client.module.GreenerGrassModule;
 import org.violetmoon.zeta.module.ZetaModule;
 

src/main/java/org/violetmoon/quark/base/module/config/type/inputtable/RGBAColorConfig.java → src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBAColorConfig.java

@@ -1,8 +1,8 @@
-package org.violetmoon.quark.base.module.config.type.inputtable;
+package org.violetmoon.quark.base.config.type.inputtable;
 
 import java.util.Objects;
 
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 
 public class RGBAColorConfig extends RGBColorConfig {
 

src/main/java/org/violetmoon/quark/base/module/config/type/inputtable/RGBColorConfig.java → src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBColorConfig.java

@@ -1,10 +1,10 @@
-package org.violetmoon.quark.base.module.config.type.inputtable;
+package org.violetmoon.quark.base.config.type.inputtable;
 
 import java.util.Objects;
 
-import org.violetmoon.quark.base.module.config.Config;
-import org.violetmoon.quark.base.module.config.ConfigFlagManager;
-import org.violetmoon.quark.base.module.config.type.IConfigType;
+import org.violetmoon.quark.base.config.Config;
+import org.violetmoon.quark.base.config.ConfigFlagManager;
+import org.violetmoon.quark.base.config.type.IConfigType;
 import org.violetmoon.zeta.module.ZetaModule;
 
 import net.minecraft.util.Mth;

src/main/java/org/violetmoon/quark/base/handler/GeneralConfig.java

@@ -3,7 +3,7 @@
 import java.util.List;
 
 import org.violetmoon.quark.base.Quark;
-import org.violetmoon.quark.base.module.config.Config;
+import org.violetmoon.quark.base.config.Config;
 import org.violetmoon.zeta.event.bus.LoadEvent;
 import org.violetmoon.zeta.event.load.ZConfigChanged;
 import org.violetmoon.zeta.piston.ZetaPistonStructureResolver;

src/main/java/org/violetmoon/quark/base/network/message/structural/C2SLoginFlag.java

@@ -6,7 +6,7 @@
 import java.util.BitSet;
 import java.util.function.BiConsumer;
 
-import org.violetmoon.quark.base.module.sync.SyncedFlagHandler;
+import org.violetmoon.quark.base.config.SyncedFlagHandler;
 
 public class C2SLoginFlag extends HandshakeMessage {
 

src/main/java/org/violetmoon/quark/base/network/message/structural/C2SUpdateFlag.java

@@ -3,7 +3,7 @@
 import java.io.Serial;
 import java.util.BitSet;
 
-import org.violetmoon.quark.base.module.sync.SyncedFlagHandler;
+import org.violetmoon.quark.base.config.SyncedFlagHandler;
 import org.violetmoon.zeta.network.IZetaMessage;
 import org.violetmoon.zeta.network.IZetaNetworkEventContext;
 

src/main/java/org/violetmoon/quark/base/network/message/structural/S2CLoginFlag.java

@@ -3,7 +3,7 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkEvent;
 import org.apache.commons.lang3.tuple.Pair;
-import org.violetmoon.quark.base.module.sync.SyncedFlagHandler;
+import org.violetmoon.quark.base.config.SyncedFlagHandler;
 
 import java.util.BitSet;
 import java.util.Collections;

src/main/java/org/violetmoon/quark/base/network/message/structural/S2CUpdateFlag.java

@@ -3,7 +3,7 @@
 import java.io.Serial;
 import java.util.BitSet;
 
-import org.violetmoon.quark.base.module.sync.SyncedFlagHandler;
+import org.violetmoon.quark.base.config.SyncedFlagHandler;
 import org.violetmoon.zeta.network.IZetaMessage;
 import org.violetmoon.zeta.network.IZetaNetworkEventContext;