From a9b6f5db55405269ebf948fe031c31af2590c4de Mon Sep 17 00:00:00 2001 From: HKS-HNS Date: Wed, 24 Jul 2024 22:02:21 +0200 Subject: Updated to 1.21 --- build.gradle | 10 +++++----- gradle.properties | 6 +++--- .../com/notnite/gloppers/mixin/HopperBlockEntityMixin.java | 4 ++-- src/main/resources/fabric.mod.json | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 7445bac..5c9a3c3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.2-SNAPSHOT" + id "fabric-loom" version "1.7-SNAPSHOT" id "com.modrinth.minotaur" version "2.+" } @@ -29,14 +29,14 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { @@ -51,6 +51,6 @@ modrinth { projectId = "gloppers" versionType = "release" uploadFile = remapJar - gameVersions = ["1.20.4"] + gameVersions = ["1.21"] loaders = ["fabric", "quilt"] } diff --git a/gradle.properties b/gradle.properties index 5b540a0..526bf3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.6 +minecraft_version=1.21 +yarn_mappings=1.21+build.9 +loader_version=0.15.11 mod_version=1.0.2 maven_group=com.notnite diff --git a/src/main/java/com/notnite/gloppers/mixin/HopperBlockEntityMixin.java b/src/main/java/com/notnite/gloppers/mixin/HopperBlockEntityMixin.java index 7637cc8..d88e8bc 100644 --- a/src/main/java/com/notnite/gloppers/mixin/HopperBlockEntityMixin.java +++ b/src/main/java/com/notnite/gloppers/mixin/HopperBlockEntityMixin.java @@ -57,9 +57,9 @@ public abstract class HopperBlockEntityMixin { // a static variable to keep track of what slot we're removing from. @Redirect( method = "insert", - at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Inventory;removeStack(II)Lnet/minecraft/item/ItemStack;") + at = @At(value = "INVOKE", target = "Lnet/minecraft/block/entity/HopperBlockEntity;removeStack(II)Lnet/minecraft/item/ItemStack;") ) - private static ItemStack insert$gloppersRemoveStack(Inventory instance, int slot, int amount) { + private static ItemStack insert$gloppersRemoveStack(HopperBlockEntity instance, int slot, int amount) { dirtySlotState = slot; return instance.getStack(slot); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b75428f..e023250 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ ], "depends": { "fabricloader": ">=0.14.19", - "minecraft": "~1.20", - "java": ">=17" + "minecraft": "~1.21", + "java": ">=21" } } -- cgit