feat(legacy): ornithe port

.github/workflows/gradle.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1", "26.2"]
+        version: ["1.8.9", "1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1", "26.2"]
 
     steps:
       - uses: actions/checkout@v6

build.gradle.kts

@@ -1,22 +1,41 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import net.ornithemc.ploceus.api.PloceusGradleExtensionApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("dev.kikugie.loom-back-compat")
     id("org.jetbrains.kotlin.jvm") version "2.4.10"
+    id("net.fabricmc.fabric-loom-remap") version "1.17-SNAPSHOT" apply false
+    id("ploceus") version "1.17.4" apply false
     id("dev.deftu.gradle.bloom") version "0.2.0"
     id("me.modmuss50.mod-publish-plugin") version "2.2.0"
 }
 
+val isOrnithe = stonecutter.current.version == "1.8.9"
+val ploceus = if (isOrnithe) {
+    pluginManager.apply("net.fabricmc.fabric-loom-remap")
+    pluginManager.apply("ploceus")
+
+    configurations.configureEach {
+        exclude(group = "org.lwjgl.lwjgl")
+    }
+
+    extensions.getByType<PloceusGradleExtensionApi>().apply {
+        setIntermediaryGeneration(2)
+    }
+} else {
+    null
+}
+
 val modid: String = sc.properties["mod.id"]
 val modname: String = sc.properties["mod.name"]
 val modversion: String = sc.properties["mod.version"]
 val mcversion: String = sc.current.version
 val versionrange: String = sc.properties["mod.mc_compat"]
 val loaderversion: String = sc.properties["deps.fabric_loader"]
 val oneconfigversion: String = sc.properties["deps.oneconfig"]
-val fapiversion: String = sc.properties["deps.fabric_api"]
+val loader = if (isOrnithe) "ornithe" else "fabric"
 
 version = "$modversion+$mcversion"
 base.archivesName = modid
@@ -26,7 +45,7 @@ val requiredJava: JavaVersion = when {
     sc.current.parsed >= "1.20.5" -> JavaVersion.VERSION_21
     sc.current.parsed >= "1.18" -> JavaVersion.VERSION_17
     sc.current.parsed >= "1.17" -> JavaVersion.VERSION_16
-    else -> JavaVersion.VERSION_1_8
+    else -> JavaVersion.VERSION_25
 }
 
 val compatibleVersions: List<String> = sc.properties.rawOrNull("mod", "mc_releases")
@@ -46,6 +65,9 @@ repositories {
         name = "Sonatype Snapshots"
         content { includeGroup("net.kyori") }
     }
+    maven("https://maven.cloverclient.com/releases") {
+        content { includeGroup("pl.tomgirl") }
+    }
     strictMaven("https://maven.deftu.dev/releases", "Deftu", "dev.deftu")
     strictMaven("https://maven.terraformersmc.com/", "TerraformersMC", "com.terraformersmc")
     strictMaven("https://maven.fabricmc.net/", "FabricMC", "net.fabricmc")
@@ -55,17 +77,28 @@ repositories {
 
 dependencies {
     minecraft("com.mojang:minecraft:$mcversion")
-    loomx.applyMojangMappings()
+    if (isOrnithe) {
+        mappings(ploceus!!.layeredMappings {
+            mappings("net.ornithemc:feather-gen2:$mcversion+build.${sc.properties["feather_build"] as String}:v2") {
+                containsUnpick()
+            }
+            mappings(rootProject.file("mappings/feather-overrides.tiny"))
+        })
+        testCompileOnly("net.ornithemc.osl-gen2:entrypoints:${sc.properties["deps.osl_entrypoints"] as String}")
+    } else {
+        loomx.applyMojangMappings()
+    }
 
     modImplementation("net.fabricmc:fabric-loader:$loaderversion")
-    modImplementation("org.polyfrost.oneconfig:$mcversion-fabric:$oneconfigversion")
+    modImplementation("org.polyfrost.oneconfig:$mcversion-$loader:$oneconfigversion")
     for (module in arrayOf("commands", "config", "config-impl", "events", "internal", "ui", "utils", "hud")) {
         implementation("org.polyfrost.oneconfig:$module:$oneconfigversion")
     }
     implementation("org.polyfrost:polyui:${sc.properties.get<String>("deps.polyui")}")
 
-    for (module in arrayOf("fabric-command-api-v2", "fabric-lifecycle-events-v1")) {
-        modImplementation(fabricApi.module(module, fapiversion))
+    if (!isOrnithe) {
+        val fapiversion: String = sc.properties["deps.fabric_api"]
+        modImplementation("net.fabricmc.fabric-api:fabric-api:$fapiversion")
     }
 
     testImplementation("org.junit.jupiter:junit-jupiter:${sc.properties.get<String>("deps.junit")}")
@@ -194,7 +227,7 @@ publishMods {
     changelog = changelogs
     type = STABLE
 
-    modLoaders.add("fabric")
+    modLoaders.add(loader)
 
     dryRun = modrinthId == null || modrinthToken == null
 

mappings/feather-overrides.tiny

@@ -0,0 +1,18 @@
+tiny	2	0	intermediary	named
+c	net/minecraft/client/Minecraft	net/minecraft/client/Minecraft
+	m	(Lnet/minecraft/unmapped/C_85740840;)V	m_52715402	setScreen
+c	net/minecraft/unmapped/C_23708450	net/minecraft/client/KeyMapping
+	m	()Z	m_70603120	isDown
+c	net/minecraft/unmapped/C_76792751	net/minecraft/client/Options
+	f	Lnet/minecraft/unmapped/C_23708450;	f_50204069	keySprint
+	f	Lnet/minecraft/unmapped/C_23708450;	f_89071996	keyShift
+	f	Lnet/minecraft/unmapped/C_23708450;	f_94470987	keyJump
+c	net/minecraft/unmapped/C_57778754	net/minecraft/client/player/LocalPlayer
+	f	I	f_61582337	sprintTriggerTime
+c	net/minecraft/unmapped/C_88014908	net/minecraft/client/multiplayer/ClientPacketListener
+c	net/minecraft/unmapped/C_06007608$C_36868821	net/minecraft/world/level/GameType
+	m	(Lnet/minecraft/unmapped/C_81721916;)V	m_88990945	updatePlayerAbilities
+c	net/minecraft/unmapped/C_74425583	net/minecraft/world/entity/LivingEntity
+	m	()V	m_11642923	aiStep
+c	net/minecraft/unmapped/C_81721916	net/minecraft/world/entity/player/Abilities
+	f	Z	f_63336874	instabuild

settings.gradle.kts

@@ -3,6 +3,7 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
         maven("https://maven.fabricmc.net/")
+        maven("https://maven.ornithemc.net/releases")
         maven("https://maven.kikugie.dev/releases") { name = "KikuGie Releases" }
         maven("https://maven.kikugie.dev/snapshots") { name = "KikuGie Snapshots" }
         maven("https://maven.deftu.dev/releases")
@@ -22,7 +23,7 @@ plugins {
 
 stonecutter {
     create(rootProject) {
-        versions("1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1", "26.2")
+        versions("1.8.9", "1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1", "26.2")
 
         vcsVersion = "26.2"
     }

src/main/java/org/polyfrost/polysprint/mixins/Mixin_DisableWTap.java

@@ -30,6 +30,7 @@
 public abstract class Mixin_DisableWTap {
     @Shadow protected int sprintTriggerTime;
 
+    //~ if = 1.8.9 'tick' -> 'aiStep'
     @Inject(method = "tick", at = @At("HEAD"))
     private void polysprint$disableDoubleTap(CallbackInfo ci) {
         if (PolySprintConfig.isEnabled() && PolySprintConfig.getDisableWTapSprint()) {

src/main/java/org/polyfrost/polysprint/mixins/Mixin_SetFlyBoost.java

@@ -19,12 +19,18 @@
 package org.polyfrost.polysprint.mixins;
 
 import com.mojang.authlib.GameProfile;
+//? if > 1.8.9 {
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.AbstractClientPlayer;
 //? if =1.21.1
 //import net.minecraft.client.player.Input;
 //? if >1.21.1
 import net.minecraft.client.player.ClientInput;
+//?} else {
+/*import net.minecraft.client.entity.living.player.ClientPlayerEntity;
+import net.minecraft.client.entity.living.player.Input;
+import net.minecraft.world.World;
+*///?}
 import net.minecraft.client.player.LocalPlayer;
 import org.polyfrost.polysprint.client.PolySprintConfig;
 import org.polyfrost.polysprint.client.SprintState;
@@ -34,6 +40,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+//? if > 1.8.9 {
 @Mixin(LocalPlayer.class)
 public abstract class Mixin_SetFlyBoost extends AbstractClientPlayer {
     //? if =1.21.1
@@ -85,3 +92,30 @@ public Mixin_SetFlyBoost(ClientLevel level, GameProfile profile) {
         }
     }
 }
+//?} else {
+/*@Mixin(LocalPlayer.class)
+public abstract class Mixin_SetFlyBoost extends ClientPlayerEntity {
+    @Shadow public Input input;
+
+    public Mixin_SetFlyBoost(World world, GameProfile profile) {
+        super(world, profile);
+    }
+
+    @Inject(method = "aiStep", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/living/player/Input;tick()V", shift = At.Shift.AFTER))
+    private void polysprint$modifyFlightSpeed(CallbackInfo ci) {
+        if (!SprintState.isFlyBoostEnabled()) {
+            return;
+        }
+
+        final float base = 0.05f;
+
+        if (!SprintState.isFlyBoosting()) {
+            this.abilities.setFlySpeed(base);
+            return;
+        }
+
+        float boost = PolySprintConfig.getFlyBoostAmount();
+        this.abilities.setFlySpeed(base * boost);
+    }
+}
+*///?}

src/main/java/org/polyfrost/polysprint/mixins/Mixin_SprintKeyDown.java

@@ -18,6 +18,7 @@
 
 package org.polyfrost.polysprint.mixins;
 
+//? if > 1.8.9 {
 //? if <1.21.5 {
 /*import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -39,3 +40,10 @@ public class Mixin_SprintKeyDown {
     }
     *///?}
 }
+//?} else {
+/*import net.minecraft.SharedConstants;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(SharedConstants.class)
+public abstract class Mixin_SprintKeyDown {}
+*///?}

src/main/java/org/polyfrost/polysprint/mixins/Mixin_StickyKeyBindingSetter.java

@@ -18,6 +18,7 @@
 
 package org.polyfrost.polysprint.mixins;
 
+//? if > 1.8.9 {
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
@@ -65,3 +66,11 @@ private void onSetDown(boolean bl, CallbackInfo ci) {
         ci.cancel();
     }
 }
+//?} else {
+/*import net.minecraft.SharedConstants;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(SharedConstants.class)
+public abstract class Mixin_StickyKeyBindingSetter {
+}
+*///?}

src/main/java/org/polyfrost/polysprint/mixins/Mixin_ToggleSprint.java

@@ -18,7 +18,7 @@
 
 package org.polyfrost.polysprint.mixins;
 
-//? if >1.21.1 {
+//? if > 1.21.1 || = 1.8.9 {
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.KeyMapping;
@@ -30,16 +30,22 @@
 import org.spongepowered.asm.mixin.injection.At;
 //?}
 import net.minecraft.client.player.KeyboardInput;
+//? if = 1.8.9
+//import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 
+//~ if = 1.8.9 'KeyboardInput' -> 'LocalPlayer'
 @Mixin(KeyboardInput.class)
 public class Mixin_ToggleSprint {
-    //? if >1.21.1 {
+    //? if >1.21.1 || = 1.8.9 {
     @Unique
     private boolean polysprint$isToggleActive = false;
 
     // On 1.21.1 KeyboardInput#tick has no keySprint.isDown() call and Mixin_SprintKeyDown handles it instead
+    //? if > 1.8.9 {
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;isDown()Z", ordinal = 6))
+    //?} else
+    //@WrapOperation(method = "aiStep", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;isDown()Z"))
     private boolean setSprintState(KeyMapping instance, Operation<Boolean> original) {
         boolean vanilla = original.call(instance);
         if (Minecraft.getInstance().player == null) return vanilla;

src/main/java/org/polyfrost/polysprint/mixins/event/Mixin_RideEvent.java

@@ -20,6 +20,10 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.Entity;
+//? if = 1.8.9 {
+/*import net.minecraft.world.entity.LivingEntity;
+import org.polyfrost.oneconfig.api.event.v1.events.Event;
+*///?}
 import org.polyfrost.oneconfig.api.event.v1.EventManager;
 import org.polyfrost.polysprint.client.SprintStateEvent;
 import org.spongepowered.asm.mixin.Mixin;
@@ -28,8 +32,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+//~ if = 1.8.9 'Entity' -> 'LivingEntity'
 @Mixin(Entity.class)
 public abstract class Mixin_RideEvent {
+    //? if > 1.8.9 {
     @Inject(method = "startRiding(Lnet/minecraft/world/entity/Entity;)Z", at = @At("HEAD"))
     private void onMount(Entity entity, CallbackInfoReturnable<Boolean> cir) {
         //noinspection ConstantConditions
@@ -45,4 +51,19 @@ private void onDismount(CallbackInfo ci) {
             EventManager.INSTANCE.post(new SprintStateEvent.End(SprintStateEvent.Type.RIDE));
         }
     }
+    //?} else {
+    /*@Inject(method = "startRiding(Lnet/minecraft/entity/Entity;)V", at = @At("HEAD"))
+    private void onMount(Entity entity, CallbackInfo ci) {
+        if ((Object) this == Minecraft.getInstance().player) {
+            Event event;
+            if (entity != null) {
+                event = new SprintStateEvent.Start(SprintStateEvent.Type.RIDE);
+            } else {
+                event = new SprintStateEvent.End(SprintStateEvent.Type.RIDE);
+            }
+
+            EventManager.INSTANCE.post(event);
+        }
+    }
+    *///?}
 }

src/main/kotlin/org/polyfrost/polysprint/client/PolySprintClient.kt

@@ -21,6 +21,9 @@ package org.polyfrost.polysprint.client
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.KeyMapping
 import net.minecraft.client.Minecraft
+//? if >= 26.3 {
+/*import org.lwjgl.sdl.SDLMouse
+*///?} elif > 1.8.9
 import org.lwjgl.glfw.GLFW
 import org.polyfrost.oneconfig.api.commands.v1.CommandManager
 import org.polyfrost.oneconfig.api.event.v1.eventHandler
@@ -30,6 +33,11 @@ import org.polyfrost.oneconfig.api.hud.v1.HudManager
 import org.polyfrost.oneconfig.utils.v1.dsl.createScreen
 import org.polyfrost.polysprint.PolySprintConstants
 import org.polyfrost.polysprint.client.isFlyBoostEnabled
+//? if = 1.8.9 {
+/*import org.polyfrost.oneconfig.internal.legacy.KeyCodes
+import org.lwjgl.input.Keyboard
+import org.lwjgl.input.Mouse
+*///?}
 
 object PolySprintClient {
     var isSprintHeld = false
@@ -140,21 +148,38 @@ object PolySprintClient {
     fun isKeyPhysicallyDown(key: KeyMapping): Boolean = key.isPhysicallyDown()
 
     private fun KeyMapping.isPhysicallyDown(): Boolean {
+        //? if > 1.8.9 {
         val key = InputConstants.getKey(saveString())
         return when (key.type) {
+            //? if >= 26.3 {
+            /*InputConstants.Type.KEYBOARD
+            *///?} else
             InputConstants.Type.KEYSYM, InputConstants.Type.SCANCODE ->
-                //? if <1.21.10
-                //InputConstants.isKeyDown(Minecraft.getInstance().window.window, key.value)
-                //? if >=1.21.10
+                //? if >= 26.3 {
+                /*InputConstants.isKeyDown(key.value)
+                *///?} elif >= 1.21.10 {
                 InputConstants.isKeyDown(Minecraft.getInstance().window, key.value)
+                //?} else {
+                /*InputConstants.isKeyDown(Minecraft.getInstance().window.window, key.value)
+                *///?}
 
             InputConstants.Type.MOUSE ->
-                //? if <1.21.10
-                //GLFW.glfwGetMouseButton(Minecraft.getInstance().window.window, key.value) == GLFW.GLFW_PRESS
-                //? if >=1.21.10
+                //? if >= 26.3 {
+                /*key.value > 0 && (SDLMouse.SDL_GetMouseState(null, null) and (1 shl (key.value - 1))) != 0
+                *///?} elif >= 1.21.10 {
                 GLFW.glfwGetMouseButton(Minecraft.getInstance().window.handle(), key.value) == GLFW.GLFW_PRESS
+                //?} else {
+                /*GLFW.glfwGetMouseButton(Minecraft.getInstance().window.window, key.value) == GLFW.GLFW_PRESS
+                *///?}
 
             else -> false
         }
+        //?} else {
+        /*return if (keyCode < 0) {
+            Mouse.isButtonDown(keyCode + 100)
+        } else {
+            keyCode > 0 && Keyboard.isKeyDown(keyCode)
+        }
+        *///?}
     }
 }