Switch to official-like and build on all versions

Author: Deftu

build.gradle.kts

@@ -17,8 +17,8 @@ plugins {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.169"
-        loaderVersion = "1.1.0-alpha.49"
+        version = "1.0.0-alpha.177"
+        loaderVersion = "1.1.0-alpha.53"
 
         usePolyMixin = true
         polyMixinVersion = "0.8.4+build.7"

gradle.properties

@@ -1,11 +1,37 @@
-# Gradle Configuration -- DO NOT TOUCH THESE VALUES.
-org.gradle.daemon=true
-org.gradle.parallel=true
-org.gradle.configureoncommand=true
-org.gradle.parallel.threads=4
-org.gradle.jvmargs=-Xmx2G
-
+### Mod Properties ###
+# The name used to produce your mod's JAR file, also appearing in Bloom processed files and the mod's metadata.
 mod.name=PolySprint
+# Your mod's ID, which is used in the mod's metadata and for identifying the mod in the game. Must be unique from other mods.
 mod.id=polysprint
+# The version of your mod, which is used in the mod's metadata and for version checks.
 mod.version=1.1.0-alpha.1
-mod.group=org.polyfrost
+# The Maven group ID for your mod, which is used in the mod's metadata and for dependency management.
+mod.group=org.polyfrost
+######################
+
+### DGT Configuration ###
+# Switches the mappings for all our versions to use MCP and mojmap.
+dgt.loom.mappings=official-like
+# Sets the DGT automatic Minecraft dependency list to revision 3. Update this to latest if you want to use the latest recommended versions of libraries.
+dgt.minecraft.revision=3
+#########################
+
+#####################################################################################
+### DO NOT EDIT THE PROPERTIES BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING ###
+#####################################################################################
+
+### Gradle Configuration ###
+# Sets JVM arguments for Gradle to improve performance and stability.
+# Adjust memory settings as needed based on your system's capabilities.
+# If you're supporting the template's full version range, do not reduce these values any further, they're already quite low.
+org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
+############################
+
+### Loom Configuration ###
+# Allows us to use dependencies built with newer Loom by ignoring that it was built against a differing Loom version.
+# This is absolutely necessary because we use an older fork of Loom to enable Legacy Forge support.
+# As far as can be seen, there are absolutely no negative side effects to doing this. If you encounter any,
+# feel free to report them to the template's issue tracker and comment this line out to see if it resolves them.
+# You won't be able to use any dependencies built by newer Loom without this line, however.
+loom.ignoreDependencyLoomVersionValidation=true
+##########################

settings.gradle.kts

@@ -24,7 +24,7 @@ pluginManagement {
 
     plugins {
         kotlin("jvm") version("2.2.10")
-        id("dev.deftu.gradle.multiversion-root") version("2.58.0")
+        id("dev.deftu.gradle.multiversion-root") version("2.64.0")
     }
 }
 

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

@@ -29,6 +29,7 @@ import org.polyfrost.polyui.input.KeybindHelper
 
 //#if MC >= 1.16.5
 //$$ import dev.deftu.omnicore.api.client.client
+//$$ import org.polyfrost.oneconfig.api.config.v1.Property
 //#endif
 
 object PolySprintConfig : Config(

versions/1.12.2-fabric/src/main/java/org/polyfrost/polysprint/mixins/event/Mixin_FlyEvent_2EletricBoogaloo.java

@@ -18,21 +18,20 @@
 
 package org.polyfrost.polysprint.mixins.event;
 
-import net.minecraft.entity.player.PlayerAbilities;
-import net.minecraft.world.GameMode;
-import net.minecraft.world.level.LevelInfo;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.world.GameType;
 import org.polyfrost.oneconfig.api.event.v1.EventManager;
 import org.polyfrost.oneconfig.api.event.v1.events.Event;
 import org.polyfrost.polysprint.client.SprintStateEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(GameMode.class)
+@Mixin(GameType.class)
 public abstract class Mixin_FlyEvent_2EletricBoogaloo {
-    @Redirect(method = "gameModeAbilities", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/player/PlayerAbilities;flying:Z"))
-    private void onSetFlying(PlayerAbilities instance, boolean state) {
-        instance.flying = state;
+    @Redirect(method = "configurePlayerCapabilities", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/player/PlayerCapabilities;isFlying:Z"))
+    private void onSetFlying(PlayerCapabilities instance, boolean state) {
+        instance.isFlying = state;
         Event event;
         if (state) {
             event = new SprintStateEvent.Start(SprintStateEvent.Type.FLY);

versions/1.12.2-fabric/src/main/java/org/polyfrost/polysprint/mixins/event/Mixin_RideEvent.java

@@ -30,15 +30,15 @@
 
 @Mixin(Entity.class)
 public abstract class Mixin_RideEvent {
-    @Inject(method = "startRiding", at = @At("HEAD"))
+    @Inject(method = "startRiding(Lnet/minecraft/entity/Entity;Z)Z", at = @At("HEAD"))
     private void onMount(Entity entityIn, boolean force, CallbackInfoReturnable<Boolean> cir) {
         //noinspection ConstantConditions
         if ((Object) this == OmniClient.getPlayer()) {
             EventManager.INSTANCE.post(new SprintStateEvent.Start(SprintStateEvent.Type.RIDE));
         }
     }
 
-    @Inject(method = "stopRiding", at = @At("HEAD"))
+    @Inject(method = "dismountRidingEntity", at = @At("HEAD"))
     private void onDismount(CallbackInfo ci) {
         //noinspection ConstantConditions
         if ((Object) this == OmniClient.getPlayer()) {

versions/1.20.1-fabric/src/main/java/org/polyfrost/polysprint/mixins/Mixin_SetFlyBoost.java

@@ -19,10 +19,10 @@
 package org.polyfrost.polysprint.mixins;
 
 import com.mojang.authlib.GameProfile;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.input.Input;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.player.Input;
+import net.minecraft.client.player.LocalPlayer;
 import org.polyfrost.polysprint.client.PolySprintConfig;
 import org.polyfrost.polysprint.client.SprintState;
 import org.spongepowered.asm.mixin.Mixin;
@@ -31,26 +31,26 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ClientPlayerEntity.class)
-public abstract class Mixin_SetFlyBoost extends AbstractClientPlayerEntity {
+@Mixin(LocalPlayer.class)
+public abstract class Mixin_SetFlyBoost extends AbstractClientPlayer {
     @Shadow public Input input;
 
-    public Mixin_SetFlyBoost(ClientWorld level, GameProfile profile) {
+    public Mixin_SetFlyBoost(ClientLevel level, GameProfile profile) {
         super(level, profile);
     }
 
-    @Inject(method = "tickMovement", at = @At("HEAD"))
+    @Inject(method = "aiStep", at = @At("HEAD"))
     private void polysprint$modifyFlightSpeed(CallbackInfo ci) {
         if (!SprintState.isFlyBoosting()) {
-            this.getAbilities().setFlySpeed(0.05f);
+            this.getAbilities().setFlyingSpeed(0.05f);
             return;
         }
 
         float boost = PolySprintConfig.getFlyBoostAmount();
-        this.getAbilities().setFlySpeed(0.05f * boost);
+        this.getAbilities().setFlyingSpeed(0.05f * boost);
         if (this.getAbilities().flying) {
             double yDelta = 0.0;
-            if (this.input.sneaking) {
+            if (this.input.shiftKeyDown) {
                 yDelta -= 0.15 * boost;
             }
 
@@ -59,7 +59,7 @@ public Mixin_SetFlyBoost(ClientWorld level, GameProfile profile) {
             }
 
             if (yDelta != 0.0) {
-                this.setVelocity(this.getVelocity().add(0.0D, yDelta, 0.0D));
+                this.setDeltaMovement(this.getDeltaMovement().add(0.0D, yDelta, 0.0D));
             }
         }
     }

versions/1.20.1-fabric/src/main/java/org/polyfrost/polysprint/mixins/event/Mixin_SprintEvent_2EletricBoogaloo.java

@@ -19,10 +19,8 @@
 package org.polyfrost.polysprint.mixins.event;
 
 import dev.deftu.omnicore.api.client.OmniClient;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.entity.LivingEntity;
+import net.minecraft.world.entity.LivingEntity;
 import org.polyfrost.oneconfig.api.event.v1.EventManager;
-import org.polyfrost.oneconfig.api.event.v1.events.Event;
 import org.polyfrost.polysprint.client.SprintStateEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;