Skip to content

Commit a2d73f1

Browse files
authored
Support 1.21.5+ (#30)
- Update Gradle & some dependencies - Fix paper repo - Update bamboo collision fix for >= 1.21.5
1 parent 40a32c2 commit a2d73f1

File tree

7 files changed

+32
-27
lines changed

7 files changed

+32
-27
lines changed

build-logic/src/main/kotlin/hurricane.java-conventions.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ plugins {
55

66
repositories {
77
//mavenLocal()
8-
maven("https://papermc.io/repo/repository/maven-public/")
9-
maven("https://oss.sonatype.org/content/groups/public/")
8+
mavenCentral()
9+
maven("https://repo.papermc.io/repository/maven-public/")
1010
maven("https://repo.opencollab.dev/maven-releases/")
1111
maven("https://repo.opencollab.dev/maven-snapshots/")
12-
maven("https://repo.maven.apache.org/maven2/")
1312
}
1413

1514
group = properties["group"] as String
@@ -22,7 +21,7 @@ publishing {
2221
}
2322
}
2423

25-
tasks.withType<JavaCompile>() {
24+
tasks.withType<JavaCompile> {
2625
options.encoding = "UTF-8"
2726
}
2827

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ configurate ="4.2.0-SNAPSHOT"
33
geyser ="2.4.2-SNAPSHOT"
44
floodgate ="2.2.3-SNAPSHOT"
55
paper ="1.18.2-R0.1-SNAPSHOT"
6-
paperweight = "1.5.5"
7-
shadow = "8.3.0"
6+
paperweight = "1.7.7"
7+
shadow = "9.0.0-beta17"
88
javadowngrader = "1.0.0"
99

1010
[libraries]

gradle/wrapper/gradle-wrapper.jar

302 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spigot/src/main/java/org/geysermc/hurricane/CollisionFix.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ public CollisionFix(Plugin plugin, boolean bambooEnabled, boolean pointedDripsto
3434
if (bambooEnabled) {
3535
try {
3636
final Class<?> bambooBlockClass = NMSReflection.getNMSClass("world.level.block", "BlockBamboo");
37-
// Codec field being first bumps all fields - as of 1.20.5
38-
boolean hasCodec = Arrays.stream(bambooBlockClass.getFields()).anyMatch(field -> field.getType().getSimpleName().equals("MapCodec"));
39-
final Field bambooBoundingBox = ReflectionAPI.getFieldAccessible(bambooBlockClass, hasCodec ? "g" : NMSReflection.mojmap ? "f" : "c"); // Bounding box for "no leaves", according to Yarn.
37+
final boolean newerThanOrEqualTo1170 = NMSReflection.mojmap;
38+
// Codec field being first bumps all fields - as of 1.20.4
39+
final boolean newerThanOrEqualTo1204 = Arrays.stream(bambooBlockClass.getFields()).anyMatch(field -> field.getType().getSimpleName().equals("MapCodec"));
40+
final boolean newerThanOrEqualTo1215 = NMSReflection.getNMSClass("world.level.block", "LeafLitterBlock") != null;
41+
final Field bambooBoundingBox = ReflectionAPI.getFieldAccessible(bambooBlockClass, newerThanOrEqualTo1215 ? "S" : newerThanOrEqualTo1204 ? "g" : newerThanOrEqualTo1170 ? "f" : "c"); // Bounding box for "no leaves", according to Yarn.
4042
applyNoBoundingBox(bambooBoundingBox);
4143
plugin.getLogger().info("Bamboo collision hack enabled.");
4244
} catch (Exception e) {

0 commit comments

Comments
 (0)