Update to 1.20.4

ZsoltMolnarrr · Apr 16, 2024 · 8d8d5d8 · 8d8d5d8
1 parent 21e5ddb
commit 8d8d5d8
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.3.3
+
+- Update to Minecraft 1.20.4
+- Improve rolling speed in water
+
 # 1.3.2
 
 - Fix enabling/disabling enchantments #43, thanks to Mariany P.

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
 }
 
 architectury {

diff --git a/common/src/main/java/net/combatroll/mixin/MinecraftClientMixin.java b/common/src/main/java/net/combatroll/mixin/MinecraftClientMixin.java
@@ -131,8 +131,9 @@ private void tryRolling() {
             if (player.isTouchingWater()) {
                 var liquidHeight = player.getFluidHeight(FluidTags.WATER);
                 liquidHeight = Math.min(liquidHeight, 1F);
-                // System.out.println("Water! " + liquidHeight * 0.5);
-                direction = direction.multiply(liquidHeight * 0.5);
+                var multiplier = Math.max(1 - (liquidHeight*3), 0.3);
+                // System.out.println("Water! " + multiplier + " liquidHeight: " + liquidHeight);
+                direction = direction.multiply(multiplier);
             }
 
             if (player.isInLava()) {
@@ -144,7 +145,7 @@ private void tryRolling() {
 
             var block = player.getWorld().getBlockState(player.getBlockPos().down()).getBlock();
             var slipperiness = block.getSlipperiness();
-            var defaultSlipperiness = Blocks.GRASS.getSlipperiness();
+            var defaultSlipperiness = Blocks.GRASS_BLOCK.getSlipperiness();
             if (slipperiness > defaultSlipperiness) {
                 var multiplier = defaultSlipperiness / slipperiness;
                 direction = direction.multiply(multiplier * multiplier);

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     shadowCommon(implementation ("com.github.ZsoltMolnarrr:TinyConfig:${project.tiny_config_version}"))
 
     modImplementation("com.terraformersmc:modmenu:${rootProject.mod_menu_version}") { transitive false }
-    modImplementation("maven.modrinth:better-combat:${rootProject.better_combat_version}-fabric")
+    modCompileOnly("maven.modrinth:better-combat:${rootProject.better_combat_version}-fabric")
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -4,24 +4,24 @@ org.gradle.jvmargs=-Xmx6G
 platforms=fabric,forge
 
 # Game
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.1
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
 
 # Loader
-fabric_loader_version=0.14.22
-fabric_api_version=0.89.2+1.20.2
-forge_version=48.0.4
+fabric_api_version=0.95.4+1.20.4
+fabric_loader_version=0.15.6
+forge_version=49.0.27
 
 # Mod
 maven_group=net
 archives_base_name=combatroll
-mod_version=1.3.2
+mod_version=1.3.3
 
 # Dependencies
-cloth_config_version=12.0.109
-player_anim_version=1.0.2+1.19.4
+cloth_config_version=13.0.121
+player_anim_version=1.0.2-rc1+1.20.4
 tiny_config_version=2.3.2
 
 # Compatibility
-mod_menu_version=8.0.0-beta.2
+mod_menu_version=9.0.0
 better_combat_version=1.8.0+1.20.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists