From 4cd7c207a54ab322f246454bd9624f1ef233c6d5 Mon Sep 17 00:00:00 2001 From: LordEnder_Kitty Date: Tue, 10 Dec 2024 06:11:21 -0600 Subject: [PATCH] Updated dependencies and fixed bug --- build.gradle | 34 +++++-------------- gradle.properties | 8 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 0 .../enderkitty/mixin/PlayerEntityMixin.java | 2 +- 5 files changed, 14 insertions(+), 32 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index 03b57a0..66a3996 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } @@ -10,28 +10,20 @@ base { archivesName = project.archives_base_name } -repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. -} +repositories {} dependencies { - // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } processResources { inputs.property "version", project.version - + filesMatching("fabric.mod.json") { expand "version": project.version } @@ -42,11 +34,8 @@ tasks.withType(JavaCompile).configureEach { } java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. withSourcesJar() - + sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 } @@ -57,7 +46,6 @@ jar { } } -// configure the maven publication publishing { publications { create("mavenJava", MavenPublication) { @@ -65,12 +53,6 @@ publishing { from components.java } } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} \ No newline at end of file + + repositories {} +} diff --git a/gradle.properties b/gradle.properties index 90b790d..245bcef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx3G +org.gradle.jvmargs=-Xmx8G org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=1.21.1 yarn_mappings=1.21.1+build.3 -loader_version=0.16.7 +loader_version=0.16.9 # Mod Properties -mod_version=1.1 +mod_version=1.2 maven_group=net.enderkitty archives_base_name=better-crawl-sneaking # Dependencies -fabric_version=0.105.0+1.21.1 +fabric_version=0.110.0+1.21.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/net/enderkitty/mixin/PlayerEntityMixin.java b/src/main/java/net/enderkitty/mixin/PlayerEntityMixin.java index 6c7ccd8..5fa6c10 100644 --- a/src/main/java/net/enderkitty/mixin/PlayerEntityMixin.java +++ b/src/main/java/net/enderkitty/mixin/PlayerEntityMixin.java @@ -24,7 +24,7 @@ private void isSpaceAroundPlayerEmpty(double offsetX, double offsetZ, float f, C Box box = this.getBoundingBox(); cir.setReturnValue(this.isCrawling() ? cir.getReturnValue() || this.getWorld().isSpaceEmpty( - this, new Box(box.minX + offsetX, box.maxY, box.minZ + offsetZ, box.maxX + offsetX, box.maxY + 0.5, box.maxZ + offsetZ) + this, new Box(box.minX + offsetX, box.maxY, box.minZ + offsetZ, box.maxX + offsetX, box.maxY + 0.9, box.maxZ + offsetZ) ) : cir.getReturnValue()); } }