lots of stuff

neoforge-1.21.1/build.gradle

@@ -51,6 +51,7 @@ dependencies {
     implementation "software.bernie.geckolib:geckolib-neoforge-1.21.1:${geckolib_version}"
     compileOnly(files(rootProject.file("infinite_dimensions_jars/infinity-2.7.2+1.21.1-neoforge.jar")))
     runtimeOnly(files(rootProject.file("infinite_dimensions_jars/infinity-2.7.2+1.21.1-neoforge.jar")))
+    runtimeOnly("dev.architectury:architectury-neoforge:${architectury_api_version}")
 
     compileOnly(files(rootProject.file("sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar")))
     runtimeOnly(files(rootProject.file("sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar")))
@@ -76,6 +77,18 @@ tasks.withType(ProcessResources).configureEach {
     }
 }
 
+tasks.matching { it.name in ["runClient", "runServer", "runData"] }.configureEach {
+    doFirst {
+        def infinityConfigPrefix = "config/common/"
+        zipTree(rootProject.file("infinite_dimensions_jars/infinity-2.7.2+1.21.1-neoforge.jar")).visit { details ->
+            if (!details.directory && details.relativePath.pathString.startsWith(infinityConfigPrefix)) {
+                def targetPath = details.relativePath.pathString.substring(infinityConfigPrefix.length())
+                file("run/config/infinity/${targetPath}").parentFile.mkdirs()
+            }
+        }
+    }
+}
+
 tasks.withType(Copy).configureEach {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/SizeRaySoundHandlerNeoForge.java

@@ -0,0 +1,20 @@
+package com.craisinlord.antarchy.neoforge.client;
+
+import com.craisinlord.antarchy.Antarchy;
+import com.craisinlord.antarchy.content.client.SizeRaySoundHandler;
+import net.minecraft.client.Minecraft;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
+
+@EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT)
+public final class SizeRaySoundHandlerNeoForge {
+    private SizeRaySoundHandlerNeoForge() {
+    }
+
+    @SubscribeEvent
+    public static void onClientTick(ClientTickEvent.Post event) {
+        SizeRaySoundHandler.tick(Minecraft.getInstance());
+    }
+}

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/mixins/infinity/AmendmentRareOresMixin.java

@@ -0,0 +1,33 @@
+package com.craisinlord.antarchy.neoforge.mixins.infinity;
+
+import net.lerariemann.infinity.util.config.Amendment;
+import net.lerariemann.infinity.util.core.ConfigType;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Mixin(value = Amendment.class, remap = false)
+/*
+ * Makes Antarchy's uranium/titanium ores and blocks much rarer in Infinite Dimensions'
+ * procedural dimensions. This is done natively via Infinity's own amendment system rather
+ * than relying on players editing infinity's config, keyed off the antarchy:infinity_dimension_rare_ores
+ * block tag so the list stays data-driven and native to Antarchy.
+ */
+public class AmendmentRareOresMixin {
+    @Inject(method = "getAmendmentList", at = @At("RETURN"), remap = false)
+    private static void antarchy$addRareOreAmendment(CallbackInfoReturnable<Map<ConfigType, List<Amendment>>> cir) {
+        Map<ConfigType, List<Amendment>> data = cir.getReturnValue();
+        List<Amendment> list = data.computeIfAbsent(ConfigType.BLOCKS, k -> new ArrayList<>());
+        list.add(new Amendment(
+                ConfigType.BLOCKS,
+                new Amendment.UniversalModSelector(),
+                new Amendment.MatchingBlockTagSelector("antarchy:infinity_dimension_rare_ores"),
+                new Amendment.SetValue(0.02)
+        ));
+    }
+}

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java

@@ -23,6 +23,7 @@ import com.craisinlord.antarchy.content.entity.multipart.MultipartFramework;
 import com.craisinlord.antarchy.content.entity.trades.DrTrayaurusTradeManager;
 import com.craisinlord.antarchy.content.horde.CavarynHordeManager;
 import com.craisinlord.antarchy.content.item.*;
+import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisUndersideManager;
 import com.craisinlord.antarchy.content.item.ultimate.UltimateGearHelper;
 import com.craisinlord.antarchy.content.movement.DreamSandLowGravityAccess;
 import com.craisinlord.antarchy.content.AntarchyTags;
@@ -128,6 +129,7 @@ public final class AntarchyNeoForgeEvents {
         NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::handleCavarynHordeKill);
         NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::handleCavarynHordeBlockBreak);
         NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::tickCavarynHordes);
+        NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::tickThoraxisUnderside);
         modEventBus.addListener(AntarchyNeoForgeEvents::modifyEntityAttributes);
         NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::tickOverheadInversion);
         NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::tickDuctTapeStickiness);
@@ -213,6 +215,12 @@ public final class AntarchyNeoForgeEvents {
         }
     }
 
+    static void tickThoraxisUnderside(ServerTickEvent.Post event) {
+        for (ServerLevel level : event.getServer().getAllLevels()) {
+            ThoraxisUndersideManager.tick(level);
+        }
+    }
+
     private static int badOmenLevel(Player player) {
         MobEffectInstance effect = player.getEffect(MobEffects.BAD_OMEN);
         return effect != null ? effect.getAmplifier() + 1 : 0;

neoforge-1.21.1/src/main/resources/assets/antarchy/models/item/grow_ray.json

@@ -1,18 +0,0 @@
-{
-  "loader": "neoforge:separate_transforms",
-  "gui_light": "front",
-  "base": {
-    "parent": "antarchy:item/grow_ray_held_geo"
-  },
-  "perspectives": {
-    "gui": {
-      "parent": "antarchy:item/grow_ray_gui"
-    },
-    "ground": {
-      "parent": "antarchy:item/grow_ray_gui"
-    },
-    "fixed": {
-      "parent": "antarchy:item/grow_ray_gui"
-    }
-  }
-}