feature: Added support for moving Sable sublevels using walkways and escalators

Author: rbasamoyai

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 Create: Escalated now has compatibility with Sable (Create: Aeronautics) on NeoForge 1.21.1.
 
+### Added:
+- Added support for moving Sable sublevels using walkways and escalators
+
 ### Fixed:
 - Fixed walkways and escalators not working on Sable sublevels
 

src/main/java/rbasamoyai/escalated/EscalatedMixinPlugin.java

@@ -0,0 +1,35 @@
+package rbasamoyai.escalated;
+
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Set;
+
+public class EscalatedMixinPlugin implements IMixinConfigPlugin {
+
+    @Override public void onLoad(String mixinPackage) {}
+
+    @Override public String getRefMapperConfig() { return null; }
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        if (mixinClassName.startsWith("rbasamoyai.escalated.mixin.compat.sable") && !EscalatedModsNeoForge.SABLE.isLoaded())
+            return false;
+        return true;
+    }
+
+    @Override public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {}
+
+    @Override public List<String> getMixins() { return null; }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+    }
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+    }
+
+}

src/main/java/rbasamoyai/escalated/EscalatedModsNeoForge.java

@@ -4,7 +4,7 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
-import net.neoforged.fml.ModList;
+import net.neoforged.fml.loading.LoadingModList;
 
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -14,16 +14,20 @@ public enum EscalatedModsNeoForge {
     SABLE;
 
     private final String id;
+    private final boolean isLoaded;
 
-    EscalatedModsNeoForge() { this.id = CreateLang.asId(name()); }
+    EscalatedModsNeoForge() {
+        this.id = CreateLang.asId(name());
+        this.isLoaded = LoadingModList.get().getModFileById(this.id) != null;
+    }
 
     public String id() { return this.id; }
 
     public ResourceLocation resource(String path) { return ResourceLocation.fromNamespaceAndPath(this.id, path); }
 
     public Block getBlock(String id) { return BuiltInRegistries.BLOCK.get(this.resource(id)); }
 
-    public boolean isLoaded() { return ModList.get().isLoaded(this.id); }
+    public boolean isLoaded() { return this.isLoaded; }
 
     public <T> Optional<T> runIfInstalled(Supplier<Supplier<T>> toRun) {
         return this.isLoaded() ? Optional.of(toRun.get().get()) : Optional.empty();

src/main/java/rbasamoyai/escalated/compat/sable/WalkwayBlockCallback.java

@@ -0,0 +1,51 @@
+package rbasamoyai.escalated.compat.sable;
+
+import dev.ryanhcode.sable.api.physics.callback.BlockSubLevelCollisionCallback;
+import dev.ryanhcode.sable.sublevel.system.SubLevelPhysicsSystem;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
+import org.joml.Vector3d;
+import rbasamoyai.escalated.walkways.AbstractWalkwayBlock;
+import rbasamoyai.escalated.walkways.WalkwayBlockEntity;
+import rbasamoyai.escalated.walkways.WalkwaySlope;
+
+public class WalkwayBlockCallback implements BlockSubLevelCollisionCallback {
+
+    public static final WalkwayBlockCallback INSTANCE = new WalkwayBlockCallback();
+
+    private WalkwayBlockCallback() {}
+
+    // Adapted from BeltBlockCallback#sable$onCollision --ritchie
+    @Override
+    public CollisionResult sable$onCollision(BlockPos blockPos, Vector3d pos, double impactVelocity) {
+        SubLevelPhysicsSystem system = SubLevelPhysicsSystem.getCurrentlySteppingSystem();
+        ServerLevel level = system.getLevel();
+
+        if (!(level.getBlockEntity(blockPos) instanceof WalkwayBlockEntity walkwayBE))
+            return CollisionResult.NONE;
+
+        BlockState state = walkwayBE.getBlockState();
+        if (!(state.getBlock() instanceof AbstractWalkwayBlock walkwayBlock))
+            return CollisionResult.NONE;
+        Direction facing = walkwayBlock.getFacing(state);
+        WalkwaySlope slope = walkwayBlock.getWalkwaySlope(state);
+        if (slope == WalkwaySlope.TERMINAL)
+            return CollisionResult.NONE;
+
+        Vec3i normal = Direction.get(Direction.AxisDirection.POSITIVE, facing.getAxis()).getNormal();
+        float speed = walkwayBE.getWalkwayMovementSpeed() * 20.0f;
+
+        if (facing.getAxis() == Direction.Axis.X) {
+            speed *= -1.0f;
+        }
+
+        final Vector3d velocity = new Vector3d(normal.getX() * speed, normal.getY() * speed, normal.getZ() * speed);
+        // TODO escalator motion?
+
+        return new BlockSubLevelCollisionCallback.CollisionResult(velocity, false);
+    }
+
+}

src/main/java/rbasamoyai/escalated/mixin/compat/sable/AbstractWalkwayBlockMixin.java

@@ -0,0 +1,12 @@
+package rbasamoyai.escalated.mixin.compat.sable;
+
+import dev.ryanhcode.sable.api.block.BlockWithSubLevelCollisionCallback;
+import dev.ryanhcode.sable.api.physics.callback.BlockSubLevelCollisionCallback;
+import org.spongepowered.asm.mixin.Mixin;
+import rbasamoyai.escalated.compat.sable.WalkwayBlockCallback;
+import rbasamoyai.escalated.walkways.AbstractWalkwayBlock;
+
+@Mixin(AbstractWalkwayBlock.class)
+public class AbstractWalkwayBlockMixin implements BlockWithSubLevelCollisionCallback {
+    @Override public BlockSubLevelCollisionCallback sable$getCallback() { return WalkwayBlockCallback.INSTANCE; }
+}

src/main/resources/escalated.mixins.json

@@ -2,10 +2,12 @@
   "required": true,
   "minVersion": "0.8",
   "package": "rbasamoyai.escalated.mixin",
+  "plugin": "rbasamoyai.escalated.EscalatedMixinPlugin",
   "compatibilityLevel": "JAVA_17",
   "client": [
   ],
   "mixins": [
+    "compat.sable.AbstractWalkwayBlockMixin"
   ],
   "injectors": {
     "defaultRequire": 1