implemented the changes i wanted in the log PR

IoIxD · May 21, 2024 · 76a7960 · 76a7960
1 parent 777ddf7
commit 76a7960
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 44 deletions.
diff --git a/build.sh b/build.sh
@@ -1,2 +1,8 @@
+if [[ ! -z $INSTANCE_FOLDER ]]; then
+    rm $INSTANCE_FOLDER/mods/cobblemounts-*.jar
+fi
 rm build/libs/cobblemounts-*.jar
 ./gradlew build
+if [[ ! -z $INSTANCE_FOLDER ]]; then
+    cp build/libs/cobblemounts-*.jar $INSTANCE_FOLDER/mods
+fi
diff --git a/src/main/java/net/ioixd/client/mixin/PokemonUpdateTick.java b/src/main/java/net/ioixd/client/mixin/PokemonUpdateTick.java
@@ -30,71 +30,49 @@ private void tickMovement(Vec3d movement, CallbackInfo info) {
             Pokemon pokemonData = pokemonEntity.getPokemon();
             Entity firstPassenger = pokemonEntity.getFirstPassenger();
             if (firstPassenger instanceof PlayerEntity player) {
-                
+
                 // Make the Pokemon's position match the player's and set their position
                 // accordingly.
                 float legendaryModifier = pokemonData.isLegendary() ? 0.0f
-                    : (float) CobblemountsClient.SYNCED_CONFIG.legendaryModifier;
+                        : (float) CobblemountsClient.SYNCED_CONFIG.legendaryModifier;
                 boolean isLegendary = pokemonData.isLegendary();
-                //float movementSpeed = player.getMovementSpeed() * (pokemonData.getSpeed() / 12.0f) + speedModifier;
+                // float movementSpeed = player.getMovementSpeed() * (pokemonData.getSpeed() /
+                // 12.0f) + speedModifier;
                 float speedScalar = (float) CobblemountsClient.SYNCED_CONFIG.groundSpeedScalar;
                 float speedCap = (float) CobblemountsClient.SYNCED_CONFIG.groundSpeedCap;
                 boolean isSpeedCapped = CobblemountsClient.SYNCED_CONFIG.groundCappedSpeed;
                 boolean useLogScaling = CobblemountsClient.SYNCED_CONFIG.groundUseLogScaling;
                 float movementSpeed = 0.0f;
                 if (!useLogScaling) {
-                    movementSpeed = player.getMovementSpeed() * ((pokemonData.getSpeed() / 12.0f) * (speedScalar / 2.0f));
-                    if (isLegendary) {
-                        if (isSpeedCapped) {
-                            if (CobblemountsClient.SYNCED_CONFIG.legendaryModifierCapBreak) {
-                                if (movementSpeed >= speedCap) {
-                                    movementSpeed = (speedCap + ((legendaryModifier * speedScalar) / 2.0f));
-                                } else {
-                                    movementSpeed = (movementSpeed + ((legendaryModifier * speedScalar) / 2.0f));
-                                }
-                            } else {
-                                movementSpeed = (movementSpeed + ((legendaryModifier * speedScalar) / 2.0f));
-                                if (movementSpeed >= speedCap) {
-                                    movementSpeed = speedCap;
-                                }
-                            }
-                        } else {
-                            movementSpeed = (movementSpeed + ((legendaryModifier * speedScalar) / 2.0f));
-                        }
-                    } else {
-                        if (isSpeedCapped) {
-                            if (movementSpeed >= speedCap) {
-                                movementSpeed = speedCap;
-                            }
-                        }
-                    }
+                    movementSpeed = player.getMovementSpeed()
+                            * ((pokemonData.getSpeed() / 12.0f) * (speedScalar / 2.0f));
                 } else {
-                    movementSpeed = (player.getMovementSpeed() * 10.0f * (2.5f*(float)Math.log((pokemonData.getSpeed() + speedScalar) / speedScalar)));
-                    if (isLegendary) {
-                        if (isSpeedCapped) {
-                            if (CobblemountsClient.SYNCED_CONFIG.legendaryModifierCapBreak) {
-                                if (movementSpeed >= speedCap) {
-                                    movementSpeed = (speedCap + legendaryModifier);
-                                } else {
-                                    movementSpeed = (movementSpeed + legendaryModifier);
-                                }
+                    movementSpeed = (player.getMovementSpeed() * 10.0f
+                            * (2.5f * (float) Math.log((pokemonData.getSpeed() + speedScalar) / speedScalar)));
+                }
+                if (isLegendary) {
+                    if (isSpeedCapped) {
+                        if (CobblemountsClient.SYNCED_CONFIG.legendaryModifierCapBreak) {
+                            if (movementSpeed >= speedCap) {
+                                movementSpeed = (speedCap + legendaryModifier);
                             } else {
                                 movementSpeed = (movementSpeed + legendaryModifier);
-                                if (movementSpeed >= speedCap) {
-                                    movementSpeed = speedCap;
-                                }
                             }
                         } else {
                             movementSpeed = (movementSpeed + legendaryModifier);
-                        }
-                    } else {
-                        if (isSpeedCapped) {
                             if (movementSpeed >= speedCap) {
                                 movementSpeed = speedCap;
                             }
                         }
+                    } else {
+                        movementSpeed = (movementSpeed + legendaryModifier);
+                    }
+                } else {
+                    if (isSpeedCapped) {
+                        if (movementSpeed >= speedCap) {
+                            movementSpeed = speedCap;
+                        }
                     }
-
                 }
                 pokemonEntity.limbAnimator.setSpeed(pokemonEntity.getMovementSpeed() / 1.3f);