moved miners dream to seperate mod

new portal gun draft
fixed scorched guns mixin
sodium compat layer

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyConfigModuleForge.java

@@ -447,11 +447,6 @@ public final class AntarchyConfigModuleForge {
         AntarchySettings.setCritterCageMaxCapturableWidth(AntarchyToolsConfig.critterCageMaxCapturableWidth());
         AntarchySettings.setCritterCageMaxCapturableHeight(AntarchyToolsConfig.critterCageMaxCapturableHeight());
 
-        AntarchySettings.setMinersDreamEnabled(AntarchyToolsConfig.minersDreamEnabled());
-        AntarchySettings.setMinersDreamMinimumRange(AntarchyToolsConfig.minersDreamMinimumRange());
-        AntarchySettings.setMinersDreamMaximumRange(AntarchyToolsConfig.minersDreamMaximumRange());
-        AntarchySettings.setMinersDreamTorchSpacing(AntarchyToolsConfig.minersDreamTorchSpacing());
-        AntarchySettings.setMinersDreamBlocksPerTick(AntarchyToolsConfig.minersDreamBlocksPerTick());
 
         AntarchySettings.setDuctTapeRepairPercentPerUse(AntarchyToolsConfig.ductTapeRepairPercentPerUse());
         AntarchySettings.setPotentNyxiteInvertedDurationSeconds(AntarchyToolsConfig.potentNyxiteInvertedDurationSeconds());

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyToolsConfig.java

@@ -187,11 +187,6 @@ public final class AntarchyToolsConfig {
 
     // Miner's Dream
 
-    private static final ForgeConfigSpec.BooleanValue MINERS_DREAM_ENABLED;
-    private static final ForgeConfigSpec.IntValue      MINERS_DREAM_MINIMUM_RANGE;
-    private static final ForgeConfigSpec.IntValue      MINERS_DREAM_MAXIMUM_RANGE;
-    private static final ForgeConfigSpec.IntValue      MINERS_DREAM_TORCH_SPACING;
-    private static final ForgeConfigSpec.IntValue      MINERS_DREAM_BLOCKS_PER_TICK;
 
 
     // Miscellaneous items / consumables
@@ -472,16 +467,6 @@ public final class AntarchyToolsConfig {
         b.pop();
 
 
-        // Miner's Dream
-
-        b.push("minersDream");
-        MINERS_DREAM_ENABLED         = b.comment("Master toggle. If false, the item remains craftable but cannot be used.").define("enabled", true);
-        MINERS_DREAM_MINIMUM_RANGE   = b.comment("Minimum cave length in blocks. Clamped to [8, 256].")                    .defineInRange("minimumRange", 48, 8, 256);
-        MINERS_DREAM_MAXIMUM_RANGE   = b.comment("Maximum cave length in blocks. Clamped to [8, 256].")                    .defineInRange("maximumRange", 96, 8, 256);
-        MINERS_DREAM_TORCH_SPACING   = b.comment("Approximate blocks between torch placements along the cave.")           .defineInRange("torchSpacing", 10, 4, 64);
-        MINERS_DREAM_BLOCKS_PER_TICK = b.comment("Maximum blocks removed per server tick while excavating.")              .defineInRange("blocksPerTick", 150, 1, 2000);
-        b.pop();
-
 
         // Miscellaneous items / consumables
 
@@ -662,11 +647,6 @@ public final class AntarchyToolsConfig {
     static double  critterCageMaxCapturableWidth()           { return CRITTER_CAGE_MAX_CAPTURABLE_WIDTH.get(); }
     static double  critterCageMaxCapturableHeight()          { return CRITTER_CAGE_MAX_CAPTURABLE_HEIGHT.get(); }
 
-    static boolean minersDreamEnabled()                      { return MINERS_DREAM_ENABLED.get(); }
-    static int     minersDreamMinimumRange()                 { return MINERS_DREAM_MINIMUM_RANGE.get(); }
-    static int     minersDreamMaximumRange()                 { return MINERS_DREAM_MAXIMUM_RANGE.get(); }
-    static int     minersDreamTorchSpacing()                 { return MINERS_DREAM_TORCH_SPACING.get(); }
-    static int     minersDreamBlocksPerTick()                { return MINERS_DREAM_BLOCKS_PER_TICK.get(); }
 
     static double  ductTapeRepairPercentPerUse()             { return DUCT_TAPE_REPAIR_PERCENT_PER_USE.get(); }
     static double  potentNyxiteInvertedDurationSeconds()     { return POTENT_NYXITE_INVERTED_DURATION_SECONDS.get(); }

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/registry/AntarchyForgeEvents.java

@@ -70,7 +70,6 @@ import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.village.VillagerTradesEvent;
 import net.minecraftforge.event.village.WandererTradesEvent;
-import com.craisinlord.antarchy.content.item.MinersDreamExcavationManager;
 import net.minecraftforge.fluids.FluidInteractionRegistry;
 import com.craisinlord.antarchy.forge.network.AntarchyForgeNetworkCore;
 import com.craisinlord.antarchy.content.time.TimeDilationManager;
@@ -106,7 +105,7 @@ public final class AntarchyForgeEvents {
         MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::tickDreadAndIchor);
         MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::tickScorpionWhips);
         MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::tickDreamSandLowGravity);
-        MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::tickMinersDreamExcavations);
+        MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::tickAttitudeAdjusterSlams);
         MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::tickTimeDilation);
         MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::handleAntiwaterDamage);
         MinecraftForge.EVENT_BUS.addListener(AntarchyForgeEvents::handleAntiwaterFall);
@@ -1007,11 +1006,10 @@ public final class AntarchyForgeEvents {
         }
     }
 
-    static void tickMinersDreamExcavations(TickEvent.ServerTickEvent event) {
+    static void tickAttitudeAdjusterSlams(TickEvent.ServerTickEvent event) {
         if (event.phase != TickEvent.Phase.END) return;
         for (ServerLevel level : event.getServer().getAllLevels()) {
             AttitudeAdjusterSlamManager.tick(level);
-            MinersDreamExcavationManager.tick(level);
         }
     }
 

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/registry/AntarchyForgeItems.java

@@ -779,9 +779,6 @@ public final class AntarchyForgeItems {
                     consumer.accept(AntarchyGeoItemExtensions.crossbowHold(this));
                 }
             });
-    // Temporarily disabled: keeping the code but not registering the item for now.
-    // public static final RegistryObject<MinersDreamItem> MINERS_DREAM = ITEMS.register("miners_dream",
-    //         () -> new MinersDreamItem(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)));
     public static final RegistryObject<SquidzookaItem> SQUIDZOOKA = ITEMS.register("squidzooka",
             () -> new SquidzookaItem(new Item.Properties().stacksTo(1).durability(384).rarity(Rarity.RARE)) {
                 @Override

forge-1.20.1/src/main/resources/META-INF/mods.toml

@@ -22,6 +22,15 @@ displayTest="MATCH_VERSION"
     versionRange="${minecraft_version_range}"
     ordering="NONE"
     side="BOTH"
+# Antarchy already includes Apple Cows. Forge 1.20.1 has no "incompatible" dependency type,
+# so this optional dependency uses a version range no release can satisfy: if the standalone
+# Apple Cows mod is installed, Forge refuses to load instead of running both copies.
+[[dependencies.${mod_id}]]
+    modId="apple_cows"
+    mandatory=false
+    versionRange="(,0)"
+    ordering="NONE"
+    side="BOTH"
 
 [[mixins]]
     config="antarchy-common.mixins.json"