Merge pull request #7 from Ran-Mewo/main

Update to 1.20.4
Project-alphaa · Jan 13, 2024 · 763fccb · 763fccb
2 parents f285a94 + 9149f41
commit 763fccb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/Common/src/main/java/einstein/improved_animations/animations/entity/PlayerPartAnimator.java b/Common/src/main/java/einstein/improved_animations/animations/entity/PlayerPartAnimator.java
@@ -153,7 +153,7 @@ public void tick(LivingEntity livingEntity, EntityAnimationData entityAnimationD
         // Begin sprint jump timers
         // Ticks after hitting ground
         float previousTicksAfterHittingGround = entityAnimationData.get(TICKS_AFTER_HITTING_GROUND).get();
-        float ticksAfterHittingGround = livingEntity.isOnGround() ? previousTicksAfterHittingGround + 1 : 0;
+        float ticksAfterHittingGround = livingEntity.onGround() ? previousTicksAfterHittingGround + 1 : 0;
         entityAnimationData.setValue(TICKS_AFTER_HITTING_GROUND, ticksAfterHittingGround);
 
         boolean shouldResetJumpTimer =
@@ -173,7 +173,7 @@ public void tick(LivingEntity livingEntity, EntityAnimationData entityAnimationD
 
         // Sprint jump weight
         boolean isJumping =
-                (ticksAfterHittingGround < 1 || !livingEntity.isOnGround())
+                (ticksAfterHittingGround < 1 || !livingEntity.onGround())
                         && entityAnimationData.getValue(DELTA_Y) != 0
                         && ticksAfterSwitchingLegs < 15;
         entityAnimationData.incrementInTicksFromCondition(JUMP_WEIGHT, isJumping, 3, 4);
@@ -189,7 +189,7 @@ public void tick(LivingEntity livingEntity, EntityAnimationData entityAnimationD
         entityAnimationData.incrementInTicksFromCondition(FAST_FALL_WEIGHT, livingEntity.fallDistance > 2, 24, 2);
         entityAnimationData.incrementInFramesOrResetFromCondition(FALL_IMPACT_TIMER, entityAnimationData.getValue(FAST_FALL_WEIGHT) > 0, 20);
 
-        entityAnimationData.incrementInTicksFromCondition(ON_GROUND_WEIGHT, livingEntity.isOnGround(), 6, 6);
+        entityAnimationData.incrementInTicksFromCondition(ON_GROUND_WEIGHT, livingEntity.onGround(), 6, 6);
 
         //setAnimationTimer("vertical_blocks_per_second", (float) (livingEntity.getY() - livingEntity.yo) * 20);
         entityAnimationData.incrementInTicksFromCondition(CLIMBING_UP_WEIGHT, livingEntity.onClimbable() && entityAnimationData.getValue(DELTA_Y) >= 0, 8, 8);

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -8,6 +8,10 @@ version = "${mod_v}"
 group = "${mod_group}"
 archivesBaseName = "${mod_name}-fabric-${mc_v}"
 
+repositories {
+    maven { url "https://maven.terraformersmc.com/releases/" }
+}
+
 dependencies {
     minecraft "com.mojang:minecraft:${mc_v}"
     mappings loom.officialMojangMappings()
@@ -17,7 +21,7 @@ dependencies {
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
     implementation project(":Common")
 
-    modImplementation("curse.maven:modmenu-308702:${modmenu_v}")
+    modImplementation "com.terraformersmc:modmenu:${modmenu_v}"
 }
 
 loom {

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0.16,6.2)', changing: true
         classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Common
-mc_v=1.19.3
+mc_v=1.20.4
 
 # Forge
-forge_v=44.1.0
-catalogue_v=4171025
-configured_v=4166861
+forge_v=49.0.19
+catalogue_v=4766090
+configured_v=4462894
 
 # Fabric
-fabric_v=0.14.12
-fabric_api_v=0.70.0
-modmenu_v=4159524
+fabric_v=0.15.3
+fabric_api_v=0.93.1
+modmenu_v=9.0.0
 
 # Mod Options
 mod_name=Improved Animations