diff --git a/build.gradle b/build.gradle index db79275..c08cdf8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + id 'net.fabricmc.fabric-loom' version "${loom_version}" } base.archivesName = project.archives_base_name @@ -11,7 +11,7 @@ repositories { // adventure snapshots maven { - url = "https://s01.oss.sonatype.org/content/repositories/snapshots/" + url = "https://central.sonatype.com/repository/maven-snapshots/" mavenContent { snapshotsOnly() } } } @@ -19,11 +19,10 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // LuaJ include(implementation("org.luaj:luaj-jse:3.0.1")) @@ -34,7 +33,7 @@ dependencies { include(implementation("io.leangen.geantyref:geantyref:2.0.1")) // Adventure - include(modImplementation("net.kyori:adventure-platform-fabric:6.8.0")) + include(implementation("net.kyori:adventure-platform-fabric:6.9.0-SNAPSHOT")) include(implementation("net.kyori:adventure-text-serializer-gson:4.26.1")) include(implementation("net.kyori:adventure-text-serializer-legacy:4.26.1")) } @@ -48,11 +47,10 @@ processResources { } tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 21 + it.options.release = 25 - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } jar { diff --git a/gradle.properties b/gradle.properties index 81c4738..30605e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.21.11 - loader_version=0.18.4 + minecraft_version=26.1 + loader_version=0.18.5 loom_version=1.15-SNAPSHOT # Mod Properties @@ -14,5 +14,5 @@ org.gradle.parallel=true archives_base_name = chipmunkmod # Dependencies - fabric_version=0.141.3+1.21.11 + fabric_version=0.144.3+26.1 diff --git a/src/main/java/land/chipmunk/chipmunkmod/commands/ItemCommand.java b/src/main/java/land/chipmunk/chipmunkmod/commands/ItemCommand.java index 8825ff6..bb05a18 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/commands/ItemCommand.java +++ b/src/main/java/land/chipmunk/chipmunkmod/commands/ItemCommand.java @@ -46,7 +46,7 @@ public class ItemCommand { if (player == null || connection == null) return Command.SINGLE_SUCCESS; - final ItemStack stack = getItem(context, "item").createItemStack(count, false); + final ItemStack stack = getItem(context, "item").createItemStack(count); final int slot = 36 + player.getInventory().getSelectedSlot(); connection.send(new ServerboundSetCreativeModeSlotPacket(slot, stack)); diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java index 06cdba3..259c43b 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java +++ b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java @@ -245,7 +245,7 @@ public class CommandCore implements Listener { final ClientPacketListener connection = client.getConnection(); if (player == null || connection == null) return; - final int distanceSquared = player.chunkPosition().distanceSquared(new ChunkPos(origin)); + final int distanceSquared = player.chunkPosition().distanceSquared(ChunkPos.containing(origin)); final int distance = (int) Math.sqrt(Math.abs(distanceSquared)); final int simulationDistance = connection.getLevel().getServerSimulationDistance(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f799a41..8629e77 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,9 +30,9 @@ ], "depends": { - "fabricloader": ">=0.18.3", + "fabricloader": ">=0.18.5", "fabric-api": "*", - "minecraft": "1.21.11", - "java": ">=21" + "minecraft": "~26.1", + "java": ">=25" } }