diff --git a/build.gradle b/build.gradle index 404946d5..8a9df82d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,8 @@ plugins { tasks.named('wrapper', Wrapper).configure { // Define wrapper values here so as to not have to always do so when updating gradlew.properties. // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with - // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased + // documentation attached on cursor hover of gradle classes and methods. + // However, this comes with increased // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards. // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`) distributionType = Wrapper.DistributionType.BIN @@ -20,10 +21,12 @@ group = mod_group_id repositories { mavenLocal() + // Add the Parchment Maven repository here + maven { url "https://maven.parchmentmc.org" } } base { - archivesName = mod_id + archivesName = "${mod_id}-${minecraft_version}" } // Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21. @@ -48,7 +51,8 @@ neoForge { client { client() - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + // Comma-separated list of namespaces to load gametests from. + // Empty = all namespaces. systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id } @@ -187,4 +191,4 @@ idea { downloadSources = true downloadJavadoc = true } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index c34a0671..57f2f70b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,19 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -minecraft_version=1.21 +minecraft_version=1.21.1 minecraft_version_range=[1.21,1.22) -neo_version=21.0.157 +neo_version=21.1.206 neo_version_range=[21.0.0-beta,) loader_version_range=[4,) -parchment_minecraft_version=1.21 -parchment_mappings_version=2024.07.28 +parchment_minecraft_version=1.21.1 +parchment_mappings_version=2024.11.17 mod_id=galosphere mod_name=Galosphere mod_license=All-Rights-Reserved -mod_version=1.4.2 +mod_version=1.4.5 mod_group_id=net.orcinus.galosphere mod_authors=Orcinus mod_description=Galosphere aims to improve the underground by adding new biomes and feature diff --git a/src/generated/resources/data/c/tags/block/ores.json b/src/generated/resources/data/c/tags/block/ores.json index aa10d62a..4ada61ac 100644 --- a/src/generated/resources/data/c/tags/block/ores.json +++ b/src/generated/resources/data/c/tags/block/ores.json @@ -1,5 +1,3 @@ { - "values": [ - "#forge:ores/silver" - ] -} \ No newline at end of file + "values": ["#c:ores/silver"] +} diff --git a/src/generated/resources/data/forge/tags/block/ores/silver.json b/src/generated/resources/data/c/tags/block/ores/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/block/ores/silver.json rename to src/generated/resources/data/c/tags/block/ores/silver.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json index 8cb2dcc9..91b44b67 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -1,6 +1,3 @@ { - "values": [ - "#forge:storage_blocks/silver", - "#forge:storage_blocks/raw_silver" - ] -} \ No newline at end of file + "values": ["#c:storage_blocks/silver", "#c:storage_blocks/raw_silver"] +} diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/raw_silver.json b/src/generated/resources/data/c/tags/block/storage_blocks/raw_silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/block/storage_blocks/raw_silver.json rename to src/generated/resources/data/c/tags/block/storage_blocks/raw_silver.json diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/silver.json b/src/generated/resources/data/c/tags/block/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/block/storage_blocks/silver.json rename to src/generated/resources/data/c/tags/block/storage_blocks/silver.json diff --git a/src/generated/resources/data/c/tags/item/ingots.json b/src/generated/resources/data/c/tags/item/ingots.json index ee76608f..6a679bdd 100644 --- a/src/generated/resources/data/c/tags/item/ingots.json +++ b/src/generated/resources/data/c/tags/item/ingots.json @@ -1,5 +1,3 @@ { - "values": [ - "#forge:ingots/silver" - ] -} \ No newline at end of file + "values": ["#c:ingots/silver"] +} diff --git a/src/generated/resources/data/forge/tags/item/ingots/silver.json b/src/generated/resources/data/c/tags/item/ingots/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/item/ingots/silver.json rename to src/generated/resources/data/c/tags/item/ingots/silver.json diff --git a/src/generated/resources/data/c/tags/item/nuggets.json b/src/generated/resources/data/c/tags/item/nuggets.json index 88ddcae1..a10fa003 100644 --- a/src/generated/resources/data/c/tags/item/nuggets.json +++ b/src/generated/resources/data/c/tags/item/nuggets.json @@ -1,5 +1,3 @@ { - "values": [ - "#forge:nuggets/silver" - ] -} \ No newline at end of file + "values": ["#c:nuggets/silver"] +} diff --git a/src/generated/resources/data/forge/tags/item/nuggets/silver.json b/src/generated/resources/data/c/tags/item/nuggets/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/item/nuggets/silver.json rename to src/generated/resources/data/c/tags/item/nuggets/silver.json diff --git a/src/generated/resources/data/c/tags/item/ores.json b/src/generated/resources/data/c/tags/item/ores.json index aa10d62a..4ada61ac 100644 --- a/src/generated/resources/data/c/tags/item/ores.json +++ b/src/generated/resources/data/c/tags/item/ores.json @@ -1,5 +1,3 @@ { - "values": [ - "#forge:ores/silver" - ] -} \ No newline at end of file + "values": ["#c:ores/silver"] +} diff --git a/src/generated/resources/data/forge/tags/item/ores/silver.json b/src/generated/resources/data/c/tags/item/ores/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/item/ores/silver.json rename to src/generated/resources/data/c/tags/item/ores/silver.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials.json b/src/generated/resources/data/c/tags/item/raw_materials.json index 554193bb..871115fb 100644 --- a/src/generated/resources/data/c/tags/item/raw_materials.json +++ b/src/generated/resources/data/c/tags/item/raw_materials.json @@ -1,5 +1,3 @@ { - "values": [ - "#forge:raw_materials/silver" - ] -} \ No newline at end of file + "values": ["#c:raw_materials/silver"] +} diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/silver.json b/src/generated/resources/data/c/tags/item/raw_materials/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/item/raw_materials/silver.json rename to src/generated/resources/data/c/tags/item/raw_materials/silver.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json index 8cb2dcc9..91b44b67 100644 --- a/src/generated/resources/data/c/tags/item/storage_blocks.json +++ b/src/generated/resources/data/c/tags/item/storage_blocks.json @@ -1,6 +1,3 @@ { - "values": [ - "#forge:storage_blocks/silver", - "#forge:storage_blocks/raw_silver" - ] -} \ No newline at end of file + "values": ["#c:storage_blocks/silver", "#c:storage_blocks/raw_silver"] +} diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/raw_silver.json b/src/generated/resources/data/c/tags/item/storage_blocks/raw_silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/item/storage_blocks/raw_silver.json rename to src/generated/resources/data/c/tags/item/storage_blocks/raw_silver.json diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/silver.json b/src/generated/resources/data/c/tags/item/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/item/storage_blocks/silver.json rename to src/generated/resources/data/c/tags/item/storage_blocks/silver.json diff --git a/src/main/java/net/orcinus/galosphere/events/RegisterEvents.java b/src/main/java/net/orcinus/galosphere/events/RegisterEvents.java index bae01f91..a12dfc64 100644 --- a/src/main/java/net/orcinus/galosphere/events/RegisterEvents.java +++ b/src/main/java/net/orcinus/galosphere/events/RegisterEvents.java @@ -28,7 +28,8 @@ import net.orcinus.galosphere.network.handler.ClientEventsHandler; import net.orcinus.galosphere.network.handler.ServerEventsHandler; -@EventBusSubscriber(modid = Galosphere.MODID, bus = EventBusSubscriber.Bus.MOD) + +@EventBusSubscriber(modid = Galosphere.MODID) public class RegisterEvents { @SubscribeEvent @@ -50,26 +51,27 @@ public static void registerSpawnPlacements(RegisterSpawnPlacementsEvent event) { @SubscribeEvent public static void registerPayloadHandler(RegisterPayloadHandlersEvent event) { final PayloadRegistrar registrar = event.registrar("1"); + registrar.playToClient( BarometerPacket.TYPE, BarometerPacket.CODEC, - ClientEventsHandler::sendBarometerInfo + ServerEventsHandler::sendBarometerInfo ); registrar.playToClient( PlayCooldownSoundPacket.TYPE, PlayCooldownSoundPacket.CODEC, - ClientEventsHandler::playCooldownSound + ServerEventsHandler::playCooldownSound ); registrar.playToClient( SendParticlesPacket.TYPE, SendParticlesPacket.CODEC, - ClientEventsHandler::handleSendParticles + ServerEventsHandler::handleSendParticles ); registrar.playToClient( SendPerspectivePacket.TYPE, SendPerspectivePacket.CODEC, - ClientEventsHandler::sendPerspective + ServerEventsHandler::sendPerspective ); } -} +} \ No newline at end of file diff --git a/src/main/java/net/orcinus/galosphere/network/handler/ClientEventsHandler.java b/src/main/java/net/orcinus/galosphere/network/handler/ClientEventsHandler.java index 4a138af2..5ef127fd 100644 --- a/src/main/java/net/orcinus/galosphere/network/handler/ClientEventsHandler.java +++ b/src/main/java/net/orcinus/galosphere/network/handler/ClientEventsHandler.java @@ -14,9 +14,12 @@ import net.orcinus.galosphere.network.PlayCooldownSoundPacket; import net.orcinus.galosphere.network.SendParticlesPacket; import net.orcinus.galosphere.network.SendPerspectivePacket; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; import java.util.Optional; +@OnlyIn(Dist.CLIENT) public class ClientEventsHandler { public static void handleSendParticles(SendParticlesPacket packet, IPayloadContext ctx) { @@ -66,4 +69,4 @@ public static void playCooldownSound(PlayCooldownSoundPacket packet, IPayloadCon } }); } -} +} \ No newline at end of file