PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 21:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Redo ad_astra compat

Browse source
This commit is contained in:
Sollace 2024-04-24 19:33:22 +01:00
parent 119eafbbc7
commit 498577294e
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
5 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenApi.java Normal file
View file

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

11
src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenUtils.java
View file

@ -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);
}
}

4
src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java
View file

@ -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)) {
return FlightType.NONE;
}

29
src/main/java/com/minelittlepony/unicopia/mixin/ad_astra/MixinOxygenUtils.java
View file

@ -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);
}
}
}

3
src/main/resources/unicopia.mixin.json
View file

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