bumped required infinity version

fixed server client split issue fr this time
Buffed frying pan
Fixed prince princess anim bug

fabric-1.21.1/build.gradle

@@ -46,8 +46,8 @@ dependencies {
     compileOnly "mezz.jei:jei-1.21.1-fabric-api:${jei_version}"
     modLocalRuntime "mezz.jei:jei-1.21.1-fabric:${jei_version}"
 
-    compileOnly(files("$rootDir/infinite_dimensions_jars/infinity-2.7.2+1.21.1-neoforge.jar"))
-    runtimeOnly(files("$rootDir/infinite_dimensions_jars/infinity-2.7.2+1.21.1-fabric.jar"))
+    compileOnly(files("$rootDir/infinite_dimensions_jars/infinity-2.7.3+1.21.1-neoforge.jar"))
+    runtimeOnly(files("$rootDir/infinite_dimensions_jars/infinity-2.7.3+1.21.1-fabric.jar"))
     compileOnly(files("$rootDir/infinite_dimensions_jars/gravity-api-1.0.7-1.20.1.jar"))
     compileOnly(files("$rootDir/infinite_dimensions_jars/sable-neoforge-1.21.1-2.0.3.jar"))
 
@@ -121,7 +121,7 @@ tasks.named('processResources', ProcessResources).configure {
 tasks.matching { it.name in ["runClient", "runServer", "runDatagen"] }.configureEach {
     doFirst {
         def infinityConfigPrefix = "config/common/"
-        zipTree(rootProject.file("infinite_dimensions_jars/infinity-2.7.2+1.21.1-fabric.jar")).visit { details ->
+        zipTree(rootProject.file("infinite_dimensions_jars/infinity-2.7.3+1.21.1-fabric.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()

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/FabricInfinityCompat.java

@@ -3,9 +3,9 @@ package com.craisinlord.antarchy.fabric;
 import com.craisinlord.antarchy.Antarchy;
 import com.craisinlord.antarchy.compat.infinity.InfinityCompatBridge;
 import com.craisinlord.antarchy.compat.infinity.InfinityWarpResult;
-import net.lerariemann.infinity.util.InfinityMethods;
-import net.lerariemann.infinity.util.teleport.PortalCreator;
-import net.lerariemann.infinity.util.teleport.WarpLogic;
+import net.codexarchonic.infinity.util.InfinityMethods;
+import net.codexarchonic.infinity.util.teleport.PortalCreator;
+import net.codexarchonic.infinity.util.teleport.WarpLogic;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
@@ -15,8 +15,8 @@ import net.minecraft.util.RandomSource;
 public final class FabricInfinityCompat implements InfinityCompatBridge {
     public static boolean isAvailableOnClasspath() {
         try {
-            Class.forName("net.lerariemann.infinity.util.InfinityMethods");
-            Class.forName("net.lerariemann.infinity.util.teleport.WarpLogic");
+            Class.forName("net.codexarchonic.infinity.util.InfinityMethods");
+            Class.forName("net.codexarchonic.infinity.util.teleport.WarpLogic");
             return true;
         } catch (Throwable ignored) {
             return false;

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClient.java

@@ -23,6 +23,7 @@ import java.util.concurrent.Executor;
 public final class AntarchyFabricClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
+        com.craisinlord.antarchy.Antarchy.physicalClient = true;
         ModelLoadingPlugin.register(plugin -> plugin.addModels(SeparateLargeItemModels.all()));
         ClientTickEvents.END_CLIENT_TICK.register(client -> QueenMusicHandler.tick(client, AntarchyFabricSounds.THE_QUEEN.get()));
         AntarchyFabricClientNetworking.register();

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/RoyalMountClientHandler.java

@@ -6,6 +6,7 @@ import com.craisinlord.antarchy.content.network.RoyalMountVerticalPayload;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.phys.EntityHitResult;
 
 public final class RoyalMountClientHandler {
     private static boolean wasAttack;
@@ -13,6 +14,7 @@ public final class RoyalMountClientHandler {
     private static boolean wasFlightToggle;
     private static boolean wasAscend;
     private static boolean wasDescend;
+    private static boolean wasUse;
 
     private RoyalMountClientHandler() {
     }
@@ -20,10 +22,22 @@ public final class RoyalMountClientHandler {
     public static void tick() {
         Minecraft mc = Minecraft.getInstance();
         LocalPlayer player = mc.player;
-        if (player == null || mc.screen != null || !(player.getVehicle() instanceof RoyalMountEntity)) {
+        if (player == null || mc.screen != null) {
             reset();
+            wasUse = false;
             return;
         }
+        if (!(player.getVehicle() instanceof RoyalMountEntity)) {
+            reset();
+            boolean use = mc.options.keyUse.isDown();
+            if (use && !wasUse && !(mc.hitResult instanceof EntityHitResult)
+                    && RoyalMountEntity.findAssistedMountTarget(player, 1.0D) != null) {
+                ClientPlayNetworking.send(new RoyalMountActionPayload(RoyalMountActionPayload.MOUNT));
+            }
+            wasUse = use;
+            return;
+        }
+        wasUse = mc.options.keyUse.isDown();
 
         boolean attack = mc.options.keyAttack.isDown();
         if (attack && !wasAttack) {

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/infinity/AmendmentRareOresMixin.java

@@ -1,7 +1,7 @@
 package com.craisinlord.antarchy.fabric.mixin.infinity;
 
-import net.lerariemann.infinity.util.config.Amendment;
-import net.lerariemann.infinity.util.core.ConfigType;
+import net.codexarchonic.infinity.util.config.Amendment;
+import net.codexarchonic.infinity.util.core.ConfigType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/infinity/PortalCreatorMixin.java

@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.lerariemann.infinity.util.teleport.PortalCreator;
+import net.codexarchonic.infinity.util.teleport.PortalCreator;
 import net.minecraft.server.level.ServerLevel;
 
 @Mixin(PortalCreator.class)

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/infinity/WarpLogicMixin.java

@@ -1,9 +1,9 @@
 package com.craisinlord.antarchy.fabric.mixin.infinity;
 
 import com.craisinlord.antarchy.fabric.InfinityGenerationFailure;
-import net.lerariemann.infinity.access.MinecraftServerAccess;
-import net.lerariemann.infinity.util.teleport.PortalCreator;
-import net.lerariemann.infinity.util.teleport.WarpLogic;
+import net.codexarchonic.infinity.access.MinecraftServerAccess;
+import net.codexarchonic.infinity.util.teleport.PortalCreator;
+import net.codexarchonic.infinity.util.teleport.WarpLogic;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 public interface WarpLogicMixin {
     @Redirect(
             method = "requestWarp(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/resources/ResourceLocation;Z)V",
-            at = @At(value = "INVOKE", target = "Lnet/lerariemann/infinity/util/teleport/PortalCreator;tryAddInfinityDimension(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/resources/ResourceLocation;)Z")
+            at = @At(value = "INVOKE", target = "Lnet/codexarchonic/infinity/util/teleport/PortalCreator;tryAddInfinityDimension(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/resources/ResourceLocation;)Z")
     )
     private static boolean antarchy$queuedDimensionCountsAsNew(MinecraftServer server, ResourceLocation dimensionId) throws Throwable {
         ResourceKey<Level> key = ResourceKey.create(Registries.DIMENSION, dimensionId);

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricClientNetworking.java

@@ -68,6 +68,9 @@ public final class AntarchyFabricClientNetworking {
                         payload.radius())));
         ClientPlayNetworking.registerGlobalReceiver(HordeIntensityPayload.TYPE, (payload, context) ->
                 context.client().execute(() -> HordeClientState.update(payload.intensity())));
-        AntarchyFabricTimeDilationNetworking.registerClientReceiver();
+        ClientPlayNetworking.registerGlobalReceiver(TimeDilationRatePayload.TYPE, (payload, context) ->
+                context.client().execute(() -> com.craisinlord.antarchy.content.time.TimeDilationApi.applySyncedRate(payload.entityUuid(), payload.rate())));
+        ClientPlayNetworking.registerGlobalReceiver(TimeDilationFieldsPayload.TYPE, (payload, context) ->
+                context.client().execute(() -> com.craisinlord.antarchy.content.client.ClientTimeDilationTicker.applyFields(payload.fields())));
     }
 }

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java

@@ -264,6 +264,10 @@ public final class AntarchyFabricNetworking {
     }
 
     private static void handleRoyalMountAction(ServerPlayer player, RoyalMountActionPayload payload) {
+        if (payload.action() == RoyalMountActionPayload.MOUNT) {
+            com.craisinlord.antarchy.content.entity.royal.RoyalMountEntity.tryAssistedMount(player);
+            return;
+        }
         if (!(player.getVehicle() instanceof com.craisinlord.antarchy.content.entity.royal.RoyalMountEntity mount)) {
             return;
         }

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricTimeDilationNetworking.java

@@ -2,9 +2,7 @@ package com.craisinlord.antarchy.fabric.network;
 
 import com.craisinlord.antarchy.content.network.TimeDilationRatePayload;
 import com.craisinlord.antarchy.content.network.TimeDilationFieldsPayload;
-import com.craisinlord.antarchy.content.time.TimeDilationApi;
 import com.craisinlord.antarchy.content.time.TimeDilationFieldSnapshot;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
@@ -21,13 +19,6 @@ public final class AntarchyFabricTimeDilationNetworking {
         PayloadTypeRegistry.playS2C().register(TimeDilationFieldsPayload.TYPE, TimeDilationFieldsPayload.STREAM_CODEC);
     }
 
-    public static void registerClientReceiver() {
-        ClientPlayNetworking.registerGlobalReceiver(TimeDilationRatePayload.TYPE, (payload, context) ->
-                context.client().execute(() -> handleRate(context.player(), payload)));
-        ClientPlayNetworking.registerGlobalReceiver(TimeDilationFieldsPayload.TYPE, (payload, context) ->
-                context.client().execute(() -> com.craisinlord.antarchy.content.client.ClientTimeDilationTicker.applyFields(payload.fields())));
-    }
-
     public static void syncRate(Entity entity, double rate) {
         TimeDilationRatePayload payload = new TimeDilationRatePayload(entity.getUUID(), rate);
         for (ServerPlayer player : PlayerLookup.tracking(entity)) {
@@ -45,8 +36,4 @@ public final class AntarchyFabricTimeDilationNetworking {
     public static void syncFields(ServerPlayer player, List<TimeDilationFieldSnapshot> fields) {
         ServerPlayNetworking.send(player, new TimeDilationFieldsPayload(fields));
     }
-
-    private static void handleRate(Entity contextPlayer, TimeDilationRatePayload payload) {
-        TimeDilationApi.applySyncedRate(payload.entityUuid(), payload.rate());
-    }
 }

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntities.java

@@ -656,14 +656,14 @@ public final class AntarchyFabricEntities {
 
     public static final DeferredHolder<EntityType<?>, EntityType<com.craisinlord.antarchy.content.entity.royal.PrinceEntity>> PRINCE = ENTITY_TYPES.register("prince",
             () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.royal.PrinceEntity::new, MobCategory.CREATURE)
-                    .sized(2.2F, 2.2F)
+                    .sized(2.2F, 1.5F)
                     .clientTrackingRange(10)
                     .updateInterval(3)
                     .fireImmune().build("prince"));
 
     public static final DeferredHolder<EntityType<?>, EntityType<com.craisinlord.antarchy.content.entity.royal.PrincessEntity>> PRINCESS = ENTITY_TYPES.register("princess",
             () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.royal.PrincessEntity::new, MobCategory.CREATURE)
-                    .sized(2.2F, 2.2F)
+                    .sized(2.2F, 1.5F)
                     .clientTrackingRange(10)
                     .updateInterval(3)
                     .fireImmune().build("princess"));

fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricMisc.java

@@ -158,6 +158,15 @@ public final class AntarchyFabricMisc {
     public static final DeferredHolder<PoiType, PoiType> PEST_CONTROL_POI = POI_TYPES.register("pest_control",
             () -> new PoiType(java.util.Set.copyOf(AntarchyFabricBlocks.ANT_TRAP.get().getStateDefinition().getPossibleStates()), 1, 1));
 
+    public static final DeferredHolder<PoiType, PoiType> ELYTHIA_PORTAL_POI = POI_TYPES.register("elythia_portal",
+            () -> new PoiType(java.util.Set.copyOf(AntarchyFabricBlocks.ELYTHIA_PORTAL.get().getStateDefinition().getPossibleStates()), 0, 1));
+
+    public static final DeferredHolder<PoiType, PoiType> THORAXIS_PORTAL_POI = POI_TYPES.register("thoraxis_portal",
+            () -> new PoiType(java.util.Set.copyOf(AntarchyFabricBlocks.THORAXIS_PORTAL.get().getStateDefinition().getPossibleStates()), 0, 1));
+
+    public static final DeferredHolder<PoiType, PoiType> CAVARYN_PORTAL_POI = POI_TYPES.register("cavaryn_portal",
+            () -> new PoiType(java.util.Set.copyOf(AntarchyFabricBlocks.CAVARYN_PORTAL.get().getStateDefinition().getPossibleStates()), 0, 1));
+
     public static final DeferredHolder<VillagerProfession, VillagerProfession> PEST_CONTROL = VILLAGER_PROFESSIONS.register("pest_control",
             () -> new VillagerProfession("pest_control", holder -> holder.value() == PEST_CONTROL_POI.get(),
                     holder -> holder.value() == PEST_CONTROL_POI.get(), com.google.common.collect.ImmutableSet.of(), com.google.common.collect.ImmutableSet.of(), SoundEvents.VILLAGER_WORK_FLETCHER));

fabric-1.21.1/src/main/resources/fabric.mod.json

@@ -42,7 +42,7 @@
     "sizeable_foliage": "*"
   },
   "breaks": {
-    "infinity": "<2.7.2"
+    "infinity": "<2.7.3"
   },
   "suggests": {
     "modmenu": "*",