diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle index 0e16021..448be0e 100644 --- a/buildSrc/src/main/groovy/multiloader-common.gradle +++ b/buildSrc/src/main/groovy/multiloader-common.gradle @@ -98,8 +98,6 @@ processResources { 'description' : project.description, 'neoforge_version' : neoforge_version, 'neoforge_loader_version_range': neoforge_loader_version_range, - "forge_version": forge_version, - "forge_loader_version_range": forge_loader_version_range, 'credits' : credits, 'java_version' : java_version ] diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java index ca11bf2..b9a0a46 100644 --- a/common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java @@ -2,6 +2,7 @@ package com.lukasabbe.bookshelfinspector.util; import java.util.TreeMap; +//https://stackoverflow.com/questions/12967896/converting-integers-to-roman-numerals-java public class RomanNumerals { private final static TreeMap map = new TreeMap<>(); static { diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java index 5fb9435..0730c74 100644 --- a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java @@ -4,9 +4,6 @@ import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayloa import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload; import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload; import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload; -import com.lukasabbe.bookshelfinspector.network.server.BookShelfInventoryRequestServerPayloadHandler; -import com.lukasabbe.bookshelfinspector.network.server.LecternInventoryRequestServerPayloadHandler; -import com.lukasabbe.bookshelfinspector.platform.Services; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; diff --git a/gradle.properties b/gradle.properties index 757f2c4..fe59e20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,4 @@ -# Important Notes: -# Every field you add must be added to buildSrc/src/main/groovy/multiloader-common.gradle expandProps map. - -# Project -version=1.0+1.21.5 +version=2.0+1.21.5 group=com.lukasabbe.bookshelfinspector java_version=21 @@ -15,8 +11,7 @@ license=MIT credits= description=Inspect any book in a chiseled bookshelf. minecraft_version_range=[1.21.5, 1.22) -## This is the version of minecraft that the 'common' project uses, you can find a list of all versions here -## https://projects.neoforged.net/neoforged/neoform + neo_form_version=1.21.5-20250325.162830 # The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions parchment_minecraft=1.21.4 @@ -26,10 +21,6 @@ parchment_version=2025.03.23 fabric_version=0.119.5+1.21.5 fabric_loader_version=0.16.10 -# Forge -forge_version=55.0.1 -forge_loader_version_range=[55,) - # NeoForge neoforge_version=21.5.4-beta neoforge_loader_version_range=[4,) diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java index bc30b6f..49458c2 100644 --- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java @@ -7,6 +7,7 @@ import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload; import net.minecraft.client.player.LocalPlayer; import net.minecraft.server.level.ServerPlayer; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.neoforge.network.event.RegisterConfigurationTasksEvent; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; import net.neoforged.neoforge.network.registration.PayloadRegistrar; @@ -14,7 +15,7 @@ public class NetworkHandler { @SubscribeEvent public static void registerPayloads(final RegisterPayloadHandlersEvent event){ - final PayloadRegistrar registrar = event.registrar("1"); + final PayloadRegistrar registrar = event.registrar("bookshelfinspector").optional(); registrar.playToClient( BookShelfInventoryPayload.ID, BookShelfInventoryPayload.CODEC, diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java index 861517c..49e5e87 100644 --- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java @@ -8,7 +8,9 @@ import net.neoforged.neoforge.network.PacketDistributor; public class NeoForgeNetworkHelper implements INetworkHelper { @Override public void sendPacketFromServer(ServerPlayer player, CustomPacketPayload payload) { - PacketDistributor.sendToPlayer(player, payload); + try{ + PacketDistributor.sendToPlayer(player, payload); + }catch (Exception ignored) {} } @Override diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 91be48c..86a7eec 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,35 +1,13 @@ modLoader = "javafml" #mandatory loaderVersion = "*" #mandatory license = "${license}" # Review your options at https://choosealicense.com/. -#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional [[mods]] #mandatory modId = "${mod_id}" #mandatory version = "${version}" #mandatory displayName = "${mod_name}" #mandatory -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional (see https://docs.neoforged.net/docs/misc/updatechecker/) -#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional (displayed in the mod UI) logoFile="${mod_id}.png" #optional credits="${credits}" #optional authors = "${mod_author}" #optional description = '''${description}''' #mandatory (Supports multiline text) -displayTest = "NONE" [[mixins]] -config = "${mod_id}.mixins.json" -[[dependencies.${mod_id}]] #optional -modId = "neoforge" #mandatory -type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") -versionRange = "[${neoforge_version},)" #mandatory -ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory -side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' -[[dependencies.${mod_id}]] -modId = "minecraft" -type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") -versionRange = "${minecraft_version_range}" -ordering = "NONE" -side = "BOTH" - -# Features are specific properties of the game environment, that you may want to declare you require. This example declares -# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't -# stop your mod loading on the server for example. -#[features.${mod_id}] -#openGLVersion="[3.2,)" +config = "${mod_id}.mixins.json" \ No newline at end of file