diff --git a/build.gradle b/build.gradle index 7c571ad..a2f74fb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { // see https://fabricmc.net/develop/ for new versions - id 'fabric-loom' version '1.11-SNAPSHOT' apply false + id 'fabric-loom' version '1.14-SNAPSHOT' apply false // see https://projects.neoforged.net/neoforged/moddevgradle for new versions id 'net.neoforged.moddev' version '2.0.112' apply false } \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java index e417755..813dd3d 100644 --- a/common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java @@ -1,6 +1,6 @@ package com.lukasabbe.bookshelfinspector; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,9 +9,9 @@ public class Constants { public static final String MOD_NAME = "Bookshelf Inspector"; public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME); - public static final ResourceLocation BOOK_SHELF_INVENTORY_REQUEST_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory_request"); - public static final ResourceLocation BOOK_SHELF_INVENTORY_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory"); - public static final ResourceLocation MOD_CHECK_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"mod_check"); - public static final ResourceLocation LECTERN_INVENTORY_REQUEST_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID, "lectern_inventory_request"); - public static final ResourceLocation SHELF_INVENTORY_REQUEST_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"shelf_inventory_request"); + public static final Identifier BOOK_SHELF_INVENTORY_REQUEST_PACKET_ID = Identifier.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory_request"); + public static final Identifier BOOK_SHELF_INVENTORY_PACKET_ID = Identifier.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory"); + public static final Identifier MOD_CHECK_PACKET_ID = Identifier.fromNamespaceAndPath(MOD_ID,"mod_check"); + public static final Identifier LECTERN_INVENTORY_REQUEST_PACKET_ID = Identifier.fromNamespaceAndPath(MOD_ID, "lectern_inventory_request"); + public static final Identifier SHELF_INVENTORY_REQUEST_PACKET_ID = Identifier.fromNamespaceAndPath(MOD_ID,"shelf_inventory_request"); } \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java index be3091c..7cedef2 100644 --- a/common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java @@ -1,12 +1,12 @@ package com.lukasabbe.bookshelfinspector.data; import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; public class Tags { - public static final TagKey CHISELED_BOOKSHELVES = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "chiseled_bookshelves")); - public static final TagKey LECTERNS = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "lectern")); - public static final TagKey SHELVES = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "shelves")); + public static final TagKey CHISELED_BOOKSHELVES = TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("c", "chiseled_bookshelves")); + public static final TagKey LECTERNS = TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("c", "lectern")); + public static final TagKey SHELVES = TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("c", "shelves")); } diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java index 6563b50..a18b401 100644 --- a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java @@ -16,7 +16,6 @@ public class ModMenu implements ModMenuApi { .setParentScreen(parent) .setTitle(Component.translatable("bookshelfinspector.config.title")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - builder .getOrCreateCategory(Component.translatable("bookshelfinspector.config.category")) .addEntry(entryBuilder diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c9e4e0c..f000f61 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ "depends": { "fabricloader": ">=${fabric_loader_version}", "fabric-api": "*", - "minecraft": "~1.21.9-beta.1", + "minecraft": "~1.21.11", "java": ">=${java_version}" } } diff --git a/gradle.properties b/gradle.properties index b63e147..1ff479a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.2+1.21.10 +version=2.2+1.21.11 # release, beta & alpha versionType=release @@ -6,27 +6,27 @@ group=com.lukasabbe.bookshelfinspector java_version=21 # Common -minecraft_version=1.21.10 +minecraft_version=1.21.11 mod_name=BookshelfInspector mod_author=Lukasabbe mod_id=bookshelfinspector license=MIT credits= description=Inspect any book in a chiseled bookshelf. -minecraft_version_range=[1.21.10, 1.22) +minecraft_version_range=[1.21.11, 1.22) # https://projects.neoforged.net/neoforged/neoform -neo_form_version=1.21.10-20251007.142004 +neo_form_version=1.21.11-20251209.172050 # The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions -parchment_minecraft=1.21.9 -parchment_version=2025.10.05 +parchment_minecraft=1.21.10 +parchment_version=2025.10.12 # Fabric -fabric_version=0.134.1+1.21.10 -fabric_loader_version=0.17.2 +fabric_version=0.139.5+1.21.11 +fabric_loader_version=0.18.1 # NeoForge -neoforge_version=21.10.1-beta +neoforge_version=21.11.6-beta neoforge_loader_version_range=[4,) # Gradle @@ -35,5 +35,5 @@ org.gradle.daemon=false # Global dep YAML_snake=2.5 -cloth_config=20.0.148 -mod_menu=16.0.0-rc.1 \ No newline at end of file +cloth_config=21.11.151 +mod_menu=17.0.0-alpha.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..bad7c24 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.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME