Merge branch '1.20.1' into 1.20.2

src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java

@@ -65,7 +65,7 @@ public class UnicopiaClient implements ClientModInitializer {
     private ZapAppleStageStore.Stage zapAppleStage = ZapAppleStageStore.Stage.HIBERNATING;
 
     public static Optional<PlayerCamera> getCamera() {
-        return Optional.of(getNullableCamera());
+        return Optional.ofNullable(getNullableCamera());
     }
 
     @Nullable

src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenApi.java

@@ -0,0 +1,12 @@
+package com.minelittlepony.unicopia.compat.ad_astra;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface OxygenApi {
+    AtomicReference<OxygenApi> API = new AtomicReference<>((world, pos) -> false);
+
+    boolean hasOxygen(World world, BlockPos pos);
+}

src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenUtils.java

@@ -1,11 +0,0 @@
-package com.minelittlepony.unicopia.compat.ad_astra;
-
-import net.minecraft.entity.Entity;
-
-public final class OxygenUtils {
-    public static OxygenApi API = entity -> false;
-
-    public interface OxygenApi {
-        boolean hasOxygen(Entity entity);
-    }
-}

src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java

@@ -12,7 +12,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
 import com.minelittlepony.unicopia.advancement.UCriteria;
 import com.minelittlepony.unicopia.client.minelittlepony.MineLPDelegate;
 import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation;
-import com.minelittlepony.unicopia.compat.ad_astra.OxygenUtils;
+import com.minelittlepony.unicopia.compat.ad_astra.OxygenApi;
 import com.minelittlepony.unicopia.entity.*;
 import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
 import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck;
@@ -200,7 +200,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
 
         if ((RegistryUtils.isIn(entity.getWorld(), dimension, RegistryKeys.DIMENSION_TYPE, UTags.DimensionTypes.HAS_NO_ATMOSPHERE)
                 || Unicopia.getConfig().dimensionsWithoutAtmosphere.get().contains(RegistryUtils.getId(entity.getWorld(), dimension, RegistryKeys.DIMENSION_TYPE).toString()))
-                && !OxygenUtils.API.hasOxygen(entity)) {
+                && !OxygenApi.API.get().hasOxygen(entity.getWorld(), entity.getBlockPos())) {
             return FlightType.NONE;
         }
 

src/main/java/com/minelittlepony/unicopia/mixin/ad_astra/MixinOxygenUtils.java

@@ -1,30 +1,31 @@
 package com.minelittlepony.unicopia.mixin.ad_astra;
 
-import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
-import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.minelittlepony.unicopia.compat.ad_astra.OxygenUtils;
+import com.minelittlepony.unicopia.compat.ad_astra.OxygenApi;
 
 @Pseudo
 @Mixin(
         targets = { "earth.terrarium.adastra.api.systems.OxygenApi" },
         remap = false
 )
-public interface MixinOxygenUtils extends OxygenUtils.OxygenApi {
-    @Accessor("API")
-    @Coerce
-    static Object getAPI() {
-        throw new AbstractMethodError("stub");
-    }
+interface MixinOxygenApi extends OxygenApi {
+}
 
-    @Dynamic("Compiler-generated class-init() method")
-    @Inject(method = "<clinit>()V", at = @At("RETURN"), remap = false)
-    private static void classInit() {
-        OxygenUtils.API = (OxygenUtils.OxygenApi)getAPI();
+@Pseudo
+@Mixin(
+        targets = { "earth.terrarium.adastra.api.ApiHelper" },
+        remap = false
+)
+abstract class MixinApiHelper {
+    @Inject(method = "load", at = @At("RETURN"), require = 0)
+    private static <T> void onLoad(Class<T> clazz, CallbackInfoReturnable<T> info) {
+        if (info.getReturnValue() instanceof OxygenApi api) {
+            OxygenApi.API.set(api);
+        }
     }
 }

src/main/resources/unicopia.mixin.json

@@ -71,7 +71,8 @@
     "trinkets.MixinTrinketInventory",
     "trinkets.MixinScreenHandler",
     "seasons.MixinFertilizableUtil",
-    "ad_astra.MixinOxygenUtils",
+    "ad_astra.MixinApiHelper",
+    "ad_astra.MixinOxygenApi",
     "forgified.MixinIForgeBoat"
   ],
   "client": [