diff --git a/build.gradle b/build.gradle index a2f74fb..61fbeff 100644 --- a/build.gradle +++ b/build.gradle @@ -2,5 +2,5 @@ plugins { // see https://fabricmc.net/develop/ for new versions 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 + //id 'net.neoforged.moddev' version '2.0.126' apply false } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 40d3908..70ba467 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,8 +1,10 @@ plugins { id 'multiloader-common' - id 'net.neoforged.moddev' + //id 'net.neoforged.moddev' + id 'net.fabricmc.fabric-loom' } +/* neoForge { neoFormVersion = neo_form_version // Automatically enable AccessTransformers if the file exists @@ -15,6 +17,11 @@ neoForge { mappingsVersion = parchment_version } } +*/ + +dependencies { + minecraft "com.mojang:minecraft:${minecraft_version}" +} dependencies { compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5' diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java index 35eea0f..404a8ba 100644 --- a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java @@ -1,5 +1,6 @@ package com.lukasabbe.bookshelfinspector.platform.services; + import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerPlayer; diff --git a/fabric/build.gradle b/fabric/build.gradle index 8cff053..29b3169 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,6 +1,6 @@ plugins { id 'multiloader-loader' - id 'fabric-loom' + id 'net.fabricmc.fabric-loom' id "com.modrinth.minotaur" version "2.+" } repositories { @@ -10,15 +10,11 @@ repositories { dependencies { minecraft "com.mojang:minecraft:${minecraft_version}" - mappings loom.layered { - officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip") - } - modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" + implementation "net.fabricmc:fabric-loader:${fabric_loader_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config}" - modApi "com.terraformersmc:modmenu:${project.mod_menu}" + //modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config}" + //modApi "com.terraformersmc:modmenu:${project.mod_menu}" include(implementation "org.yaml:snakeyaml:${project.YAML_snake}") } @@ -52,7 +48,7 @@ modrinth { projectId = "rOrXjyPb" // https://modrinth.com/mod/bookshelf-inspector version = project.version versionType = project.versionType - uploadFile = remapJar + //uploadFile = remapJar gameVersions = [project.minecraft_version] loaders = ["fabric"] if(project.versionType == "beta" || project.versionType == "alpha"){ 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 a18b401..a30ec2f 100644 --- a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java @@ -1,3 +1,4 @@ +/* package com.lukasabbe.bookshelfinspector.config; import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient; @@ -50,3 +51,4 @@ public class ModMenu implements ModMenuApi { }; } } + */ diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java index 7ab34ae..73f4735 100644 --- a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java @@ -7,7 +7,6 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerPlayer; public class FabricNetworkHelper implements INetworkHelper { - @Override public void sendPacketFromServer(ServerPlayer player, CustomPacketPayload payload) { ServerPlayNetworking.send(player, payload); diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index f000f61..aab3034 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.11", + "minecraft": "~26.1-alpha.1", "java": ">=${java_version}" } } diff --git a/gradle.properties b/gradle.properties index 1ff479a..bae9e63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,29 +1,29 @@ -version=2.2+1.21.11 +version=2.2+26.1 # release, beta & alpha versionType=release group=com.lukasabbe.bookshelfinspector -java_version=21 +java_version=25 # Common -minecraft_version=1.21.11 +minecraft_version=26.1-snapshot-1 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.11, 1.22) +minecraft_version_range=[1.21.11, 26.1) # https://projects.neoforged.net/neoforged/neoform -neo_form_version=1.21.11-20251209.172050 +neo_form_version=26.1-snapshot-1-2 # The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions parchment_minecraft=1.21.10 parchment_version=2025.10.12 # Fabric -fabric_version=0.139.5+1.21.11 -fabric_loader_version=0.18.1 +fabric_version=0.140.0+26.1 +fabric_loader_version=0.18.3 # NeoForge neoforge_version=21.11.6-beta diff --git a/settings.gradle b/settings.gradle index f050bfa..d374ed5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -41,4 +41,4 @@ plugins { rootProject.name = 'BookshelfInspectorMultiloader' include('common') include('fabric') -include('neoforge') \ No newline at end of file +//include('neoforge') \ No newline at end of file