Move Zeta-pertinent mixins, make the piston structure resolver a Zeta…

… global

src/main/java/vazkii/quark/base/handler/GeneralConfig.java

@@ -4,7 +4,11 @@
 
 import com.google.common.collect.Lists;
 
+import vazkii.quark.base.Quark;
 import vazkii.quark.base.module.config.Config;
+import vazkii.zeta.event.ZConfigChanged;
+import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.piston.ZetaPistonStructureResolver;
 
 public class GeneralConfig {
 
@@ -49,10 +53,10 @@ public class GeneralConfig {
 	public static boolean useAntiOverlap = true;
 
 	@Config(name = "Use Piston Logic Replacement",
-			description = "Quark replaces the Piston logic to allow for its piston features to work. If you're having troubles, try turning this off.")
+			description = "Enable Zeta's piston structure resolver, needed for some Quark features. If you're having troubles, try turning this off, but be aware other Zeta-using mods can enable it too.")
 	public static boolean usePistonLogicRepl = true;
 
-	@Config
+	@Config(description = "Ask Zeta to set the piston push limit. Only has an effect if Zeta's piston structure resolver is in use.")
 	@Config.Min(value = 0, exclusive = true)
 	public static int pistonPushLimit = 12;
 
@@ -122,4 +126,10 @@ public static boolean isScreenAllowed(Object screen) {
 		return allowedScreens.contains(clazz) != useScreenListBlacklist;
 	}
 
+	@LoadEvent
+	public static void configChanged(ZConfigChanged e) {
+		ZetaPistonStructureResolver.GlobalSettings.requestEnabled(Quark.MOD_ID, usePistonLogicRepl);
+		ZetaPistonStructureResolver.GlobalSettings.requestPushLimit(Quark.MOD_ID, pistonPushLimit);
+	}
+
 }

src/main/java/vazkii/quark/content/automation/block/IronRodBlock.java

@@ -15,7 +15,7 @@
 import net.minecraft.world.level.block.state.StateDefinition.Builder;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Material;
-import vazkii.quark.api.ICollateralMover;
+import vazkii.zeta.api.ICollateralMover;
 import vazkii.quark.base.Quark;
 import vazkii.quark.base.block.IQuarkBlock;
 import vazkii.quark.base.handler.CreativeTabHandler;

src/main/java/vazkii/quark/content/automation/module/ChainsConnectBlocksModule.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.ChainBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import vazkii.quark.api.IIndirectConnector;
+import vazkii.zeta.api.IIndirectConnector;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.zeta.util.Hint;

src/main/java/vazkii/quark/content/automation/module/PistonsMoveTileEntitiesModule.java

@@ -21,11 +21,10 @@
 import net.minecraftforge.event.TickEvent.Phase;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.apache.commons.lang3.tuple.Pair;
-import vazkii.quark.api.IIndirectConnector;
+import vazkii.zeta.api.IIndirectConnector;
 import vazkii.quark.api.IPistonCallback;
 import vazkii.quark.api.QuarkCapabilities;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.handler.GeneralConfig;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.ModuleLoader;
 import vazkii.zeta.module.ZetaModule;
@@ -36,6 +35,7 @@
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
 import vazkii.zeta.event.bus.PlayEvent;
+import vazkii.zeta.piston.ZetaPistonStructureResolver;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -96,8 +96,8 @@ public void addAdditionalHints(ZGatherHints consumer) {
 		if(ModuleLoader.INSTANCE.isModuleEnabled(SturdyStoneModule.class))
 			comp = comp.append(" ").append(Component.translatable("quark.jei.hint.piston_sturdy"));
 
-		if(GeneralConfig.pistonPushLimit != 12)
-			comp = comp.append(" ").append(Component.translatable("quark.jei.hint.piston_max_blocks", GeneralConfig.pistonPushLimit));
+		if(ZetaPistonStructureResolver.GlobalSettings.getPushLimit() != 12)
+			comp = comp.append(" ").append(Component.translatable("quark.jei.hint.piston_max_blocks", ZetaPistonStructureResolver.GlobalSettings.getPushLimit()));
 
 		consumer.accept(Items.PISTON, comp);
 		consumer.accept(Items.STICKY_PISTON, comp);

src/main/java/vazkii/quark/content/building/block/WeatheringCopperVerticalSlabBlock.java

@@ -10,7 +10,7 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.state.BlockState;
-import vazkii.quark.base.block.CustomWeatheringCopper;
+import vazkii.zeta.block.CustomWeatheringCopper;
 import vazkii.zeta.module.ZetaModule;
 
 public class WeatheringCopperVerticalSlabBlock extends QuarkVerticalSlabBlock implements CustomWeatheringCopper {

src/main/java/vazkii/quark/content/world/module/CorundumModule.java

@@ -13,7 +13,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MaterialColor;
 import org.apache.commons.lang3.tuple.Pair;
-import vazkii.quark.api.IIndirectConnector;
+import vazkii.zeta.api.IIndirectConnector;
 import vazkii.quark.base.Quark;
 import vazkii.quark.base.block.QuarkInheritedPaneBlock;
 import vazkii.quark.base.handler.ToolInteractionHandler;

src/main/java/vazkii/quark/mixin/PistonBaseBlockMixin.java

@@ -14,7 +14,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import vazkii.quark.base.handler.QuarkPistonStructureResolver;
 import vazkii.quark.content.automation.module.PistonsMoveTileEntitiesModule;
 import vazkii.quark.content.experimental.module.GameNerfsModule;
 
@@ -33,11 +32,6 @@ private void moveBlocks(Level worldIn, BlockPos pos, Direction directionIn, bool
 		PistonsMoveTileEntitiesModule.detachTileEntities(worldIn, pistonBlockStructureHelper, directionIn, extending);
 	}
 
-	@ModifyExpressionValue(method = {"checkIfExtend", "moveBlocks"}, at = @At(value = "NEW", target = "net/minecraft/world/level/block/piston/PistonStructureResolver"))
-	private PistonStructureResolver transformStructureHelper(PistonStructureResolver prev) {
-		return new QuarkPistonStructureResolver(prev);
-	}
-
 	@ModifyVariable(method = "moveBlocks", at = @At(value = "STORE", ordinal = 0), index = 15, ordinal = 2, slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addDestroyBlockEffect(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V"), to = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/piston/MovingPistonBlock;newMovingBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;ZZ)Lnet/minecraft/world/level/block/entity/BlockEntity;")))
 	private BlockPos storeOldPos(BlockPos pos, @Share("oldPos") LocalRef<BlockPos> oldPos) {
 		oldPos.set(pos);

src/main/java/vazkii/quark/mixin/accessor/AccessorLootTable.java → src/main/java/vazkii/quark/mixin/zeta/AccessorLootTable.java

@@ -1,4 +1,4 @@
-package vazkii.quark.mixin.accessor;
+package vazkii.quark.mixin.zeta;
 
 import net.minecraft.world.level.storage.loot.LootPool;
 import net.minecraft.world.level.storage.loot.LootTable;
@@ -11,6 +11,6 @@
 public interface AccessorLootTable {
 
 	@Accessor("pools")
-	List<LootPool> quark$getPools();
+	List<LootPool> zeta$getPools();
 
 }

src/main/java/vazkii/quark/mixin/accessor/AccessorPistonStructureResolver.java → src/main/java/vazkii/quark/mixin/zeta/AccessorPistonStructureResolver.java

@@ -1,4 +1,4 @@
-package vazkii.quark.mixin.accessor;
+package vazkii.quark.mixin.zeta;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -11,14 +11,14 @@
 public interface AccessorPistonStructureResolver {
 
 	@Accessor("extending")
-	boolean quark$extending();
+	boolean zeta$extending();
 
 	@Accessor("level")
-	Level quark$level();
+	Level zeta$level();
 
 	@Accessor("pistonPos")
-	BlockPos quark$pistonPos();
+	BlockPos zeta$pistonPos();
 
 	@Accessor("pistonDirection")
-	Direction quark$pistonDirection();
+	Direction zeta$pistonDirection();
 }

src/main/java/vazkii/quark/mixin/zeta/PistonBaseBlockMixin.java

@@ -0,0 +1,16 @@
+package vazkii.quark.mixin.zeta;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.minecraft.world.level.block.piston.PistonBaseBlock;
+import net.minecraft.world.level.block.piston.PistonStructureResolver;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import vazkii.zeta.piston.ZetaPistonStructureResolver;
+
+@Mixin(PistonBaseBlock.class)
+public class PistonBaseBlockMixin {
+	@ModifyExpressionValue(method = {"checkIfExtend", "moveBlocks"}, at = @At(value = "NEW", target = "net/minecraft/world/level/block/piston/PistonStructureResolver"))
+	private PistonStructureResolver transformStructureHelper(PistonStructureResolver prev) {
+		return new ZetaPistonStructureResolver(prev);
+	}
+}

src/main/java/vazkii/quark/mixin/WeatheringCopperMixin.java → src/main/java/vazkii/quark/mixin/zeta_forge/WeatheringCopperMixin.java

@@ -1,4 +1,4 @@
-package vazkii.quark.mixin;
+package vazkii.quark.mixin.zeta_forge;
 
 import net.minecraft.world.level.block.WeatheringCopper;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,4 +15,6 @@
 })
 public interface WeatheringCopperMixin {
 	// Delegated. Only valid because WeatheringCopper members are not refmapped.
+
+	//TODO ZETA: use a real interface mixin on Fabric
 }

src/main/java/vazkii/quark/mixin/client/accessor/AccessorBlockColors.java → src/main/java/vazkii/quark/mixin/zeta_forge/client/AccessorBlockColors.java

@@ -1,4 +1,4 @@
-package vazkii.quark.mixin.client.accessor;
+package vazkii.quark.mixin.zeta_forge.client;
 
 import java.util.Map;
 
@@ -14,6 +14,6 @@
 public interface AccessorBlockColors {
 
 	@Accessor("blockColors")
-	Map<Reference<Block>, BlockColor> quark$getBlockColors();
+	Map<Reference<Block>, BlockColor> zeta$getBlockColors();
 
 }

src/main/java/vazkii/quark/mixin/client/accessor/AccessorItemColors.java → src/main/java/vazkii/quark/mixin/zeta_forge/client/AccessorItemColors.java

@@ -1,4 +1,4 @@
-package vazkii.quark.mixin.client.accessor;
+package vazkii.quark.mixin.zeta_forge.client;
 
 import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.color.item.ItemColors;
@@ -13,6 +13,6 @@
 public interface AccessorItemColors {
 
 	@Accessor("itemColors")
-	Map<Reference<Item>, ItemColor> quark$getItemColors();
+	Map<Reference<Item>, ItemColor> zeta$getItemColors();
 
 }

src/main/java/vazkii/quark/mixinsupport/delegates/WeatheringCopperDelegate.java

@@ -1,7 +1,7 @@
 package vazkii.quark.mixinsupport.delegates;
 
 import net.minecraft.world.level.block.state.BlockState;
-import vazkii.quark.base.block.CustomWeatheringCopper;
+import vazkii.zeta.block.CustomWeatheringCopper;
 import vazkii.quark.mixinsupport.DelegateInterfaceTarget;
 import vazkii.quark.mixinsupport.DelegateReturnValueTarget;
 

src/main/java/vazkii/zeta/Zeta.java

@@ -15,6 +15,7 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.phys.BlockHitResult;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 import vazkii.zeta.registry.BrewingRegistry;
@@ -40,6 +41,8 @@
  * do not touch forge OR quark from this package, it will later be split off
  */
 public abstract class Zeta {
+	public static final Logger GLOBAL_LOG = LogManager.getLogger("zeta");
+
 	public Zeta(String modid, Logger log, ZetaSide side) {
 		this.log = log;
 

src/main/java/vazkii/quark/api/ICollateralMover.java → src/main/java/vazkii/zeta/api/ICollateralMover.java

@@ -1,4 +1,4 @@
-package vazkii.quark.api;
+package vazkii.zeta.api;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/vazkii/quark/api/IConditionalSticky.java → src/main/java/vazkii/zeta/api/IConditionalSticky.java

@@ -1,4 +1,4 @@
-package vazkii.quark.api;
+package vazkii.zeta.api;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/vazkii/quark/api/IIndirectConnector.java → src/main/java/vazkii/zeta/api/IIndirectConnector.java

@@ -1,4 +1,4 @@
-package vazkii.quark.api;
+package vazkii.zeta.api;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;

src/main/java/vazkii/quark/base/block/CustomWeatheringCopper.java → src/main/java/vazkii/zeta/block/CustomWeatheringCopper.java

@@ -1,4 +1,4 @@
-package vazkii.quark.base.block;
+package vazkii.zeta.block;
 
 import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/vazkii/zeta/config/ConfigManager.java

@@ -42,11 +42,14 @@ public ConfigManager(Zeta z, Object rootPojo) {
 		this.z = z;
 		this.cfm = new ConfigFlagManager(z);
 
+		//TODO: where to put this lol
+		z.loadBus.subscribe(rootPojo).subscribe(rootPojo.getClass());
+		z.playBus.subscribe(rootPojo).subscribe(rootPojo.getClass());
+
 		ZetaModuleManager modules = z.modules;
 
 		//all modules are enabled by default
 		enabledCategories.addAll(modules.getCategories());
-		//TODO: track module enablement too with a hashset too?
 
 		this.rootConfig = new SectionDefinition("root", List.of());
 

src/main/java/vazkii/zeta/event/ZLootTableLoad.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.LootTables;
 import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
-import vazkii.quark.mixin.accessor.AccessorLootTable;
+import vazkii.quark.mixin.zeta.AccessorLootTable;
 import vazkii.zeta.event.bus.Cancellable;
 import vazkii.zeta.event.bus.IZetaPlayEvent;
 
@@ -19,7 +19,7 @@ public interface ZLootTableLoad extends IZetaPlayEvent, Cancellable {
 	default void add(LootPoolEntryContainer entry) {
 		LootTable table = getTable();
 
-		List<LootPool> pools = ((AccessorLootTable) table).quark$getPools();
+		List<LootPool> pools = ((AccessorLootTable) table).zeta$getPools();
 		if (pools != null && !pools.isEmpty()) {
 			LootPool firstPool = pools.get(0);
 			LootPoolEntryContainer[] entries = firstPool.entries;