From 8e65a0f9fdaa7265c9a4014e9f25ff361abc49c1 Mon Sep 17 00:00:00 2001 From: Zontreck Date: Tue, 13 Feb 2024 23:47:11 -0700 Subject: [PATCH] Update to 1.20.1 --- build.gradle | 32 ++++++- gradle.properties | 16 ++-- gradle/wrapper/gradle-wrapper.properties | 3 +- settings.gradle | 7 +- src/main/java/dev/zontreck/fire/FireMod.java | 14 --- .../dev/zontreck/fire/data/BlockSnapshot.java | 9 +- .../zontreck/fire/events/EventHandler.java | 6 +- src/main/resources/META-INF/mods.toml | 86 ++++++++++--------- 8 files changed, 101 insertions(+), 72 deletions(-) diff --git a/build.gradle b/build.gradle index 4d3c6a0..6b7f22a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '5.1+' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' id 'org.parchmentmc.librarian.forgegradle' version '1.+' } @@ -13,6 +13,11 @@ base { archivesName = mod_id } +java { + withJavadocJar() + withSourcesJar() +} + // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -41,6 +46,7 @@ minecraft { // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. // It is REQUIRED to be set to true for this template to function. // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html + copyIdeResources = true // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. // The folder name can be set on a run configuration using the "folderName" property. @@ -53,7 +59,7 @@ minecraft { // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. // This default location is a best practice to automatically put the file in the right place in the final jar. // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Default run configurations. // These can be tweaked, removed, or duplicated as needed. @@ -88,7 +94,7 @@ minecraft { server { property 'forge.enabledGameTestNamespaces', mod_id - //args '--nogui' + args '--nogui' } // This run config launches GameTestServer and runs all registered gametests, then exits. @@ -111,6 +117,7 @@ minecraft { // Include resources generated by data generators. sourceSets.main.resources { srcDir 'src/generated/resources' } + repositories { // Put repositories for dependencies here // ForgeGradle automatically adds the Forge maven and Maven Central for you @@ -169,6 +176,25 @@ dependencies { } +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version: forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors: mod_authors, mod_description: mod_description, + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } +} + // Example for how to get properties into the manifest for reading at runtime. tasks.named('jar', Jar).configure { manifest { diff --git a/gradle.properties b/gradle.properties index 3619d91..61638c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,22 +3,22 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -libzontreck=1.10.012124.1709 +libzontreck=1.10.021324.2257 ## Environment Properties # The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.18.2 +minecraft_version=1.20.1 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.18.2,1.19) +minecraft_version_range=[1.20.1,1.21) # The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=40.2.1 +forge_version=47.2.0 # The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[40,) +forge_version_range=[47,) # The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[40,) +loader_version_range=[47,) # The mapping channel to use for mappings. # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. @@ -36,7 +36,7 @@ loader_version_range=[40,) mapping_channel=parchment # The mapping version to query from the mapping channel. # This must match the format required by the mapping channel. -mapping_version=2022.11.06-1.18.2 +mapping_version=2023.09.03-1.20.1 ## Mod Properties @@ -49,7 +49,7 @@ mod_name=Fire! Fire! # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPLv3 # The mod version. See https://semver.org/ -mod_version=1.0.012424.1509 +mod_version=1.0.021324.2331 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 256e08d..4a279ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,4 +3,9 @@ pluginManagement { gradlePluginPortal() maven { url = "https://maven.zontreck.com/repository/internal" } } -} \ No newline at end of file +} + + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} diff --git a/src/main/java/dev/zontreck/fire/FireMod.java b/src/main/java/dev/zontreck/fire/FireMod.java index a50b26a..60c72ef 100644 --- a/src/main/java/dev/zontreck/fire/FireMod.java +++ b/src/main/java/dev/zontreck/fire/FireMod.java @@ -7,7 +7,6 @@ import dev.zontreck.fire.events.EventHandler; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.server.ServerStartedEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.InterModComms; @@ -65,17 +64,4 @@ public class FireMod MinecraftForge.EVENT_BUS.register(new EventHandler()); } - - // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD - // Event bus for receiving Registry Events) - @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) - public static class RegistryEvents - { - @SubscribeEvent - public static void onBlocksRegistry(final RegistryEvent.Register blockRegistryEvent) - { - // Register a new block here - LOGGER.info("HELLO from Register Block"); - } - } } diff --git a/src/main/java/dev/zontreck/fire/data/BlockSnapshot.java b/src/main/java/dev/zontreck/fire/data/BlockSnapshot.java index ad219e5..c1ea7d1 100644 --- a/src/main/java/dev/zontreck/fire/data/BlockSnapshot.java +++ b/src/main/java/dev/zontreck/fire/data/BlockSnapshot.java @@ -5,6 +5,8 @@ import dev.zontreck.libzontreck.exceptions.InvalidDeserialization; import dev.zontreck.libzontreck.vectors.Vector3; import dev.zontreck.libzontreck.vectors.WorldPosition; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.LongTag; import net.minecraft.nbt.NbtIo; @@ -52,7 +54,7 @@ public class BlockSnapshot { } } - world.playSound(null, position.Position.asBlockPos(), SoundEvents.ITEM_PICKUP, SoundSource.NEUTRAL, world.random.nextFloat(0,1), world.random.nextFloat(0,1)); + world.playSound(null, position.Position.asBlockPos(), SoundEvents.ITEM_PICKUP, SoundSource.NEUTRAL); } public CompoundTag serialize() @@ -73,7 +75,10 @@ public class BlockSnapshot { { try { WorldPosition position = new WorldPosition(tag.getCompound("pos"), true); - BlockState state = NbtUtils.readBlockState(tag.getCompound("state")); + + HolderGetter hg = position.getActualDimension().holderLookup(Registries.BLOCK); + + BlockState state = NbtUtils.readBlockState(hg, tag.getCompound("state")); CompoundTag entity = null; if(tag.contains("entity")) entity = tag.getCompound("entity"); diff --git a/src/main/java/dev/zontreck/fire/events/EventHandler.java b/src/main/java/dev/zontreck/fire/events/EventHandler.java index 4a41bbf..44c6633 100644 --- a/src/main/java/dev/zontreck/fire/events/EventHandler.java +++ b/src/main/java/dev/zontreck/fire/events/EventHandler.java @@ -16,8 +16,8 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.event.server.ServerStoppingEvent; -import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import java.time.Instant; @@ -42,7 +42,7 @@ public class EventHandler { return; } - ServerLevel world = (ServerLevel) event.getWorld(); + ServerLevel world = (ServerLevel) event.getLevel(); if(FireServerConfig.restore.blacklistedDimensions.contains(WorldPosition.getDim(world))) { //FireMod.LOGGER.info("Blacklisted dimension, ignoring"); @@ -115,7 +115,7 @@ public class EventHandler { } @SubscribeEvent - public void onServerTick(TickEvent.WorldTickEvent event) { + public void onServerTick(TickEvent.LevelTickEvent event) { if(ServerUtilities.isClient()) return; if(!FireMod.ENABLED) { diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 8c9cbb4..6eeead8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -6,32 +6,30 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license="GPLv3" +license="${mod_license}" # A URL to refer people to when problems occur with this mod -issueTrackerURL="https://git.zontreck.com/MinecraftMods/Fire/issues" #optional +issueTrackerURL="https://github.com/zontreck/LibZontreckMod/issues" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="fire" #mandatory -# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata -# see the associated build.gradle script for how to populate this completely automatically during a build -version="${file.jarVersion}" #mandatory - # A display name for the mod -displayName="Fire! Fire!" #mandatory -# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ +modId="${mod_id}" #mandatory +# The version number of the mod +version="${mod_version}" #mandatory +# A display name for the mod +displayName="${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional # A file name (in the root of the mod JAR) containing a logo for display -logoFile="fire.png" #optional +#logoFile="examplemod.png" #optional # A text field displayed in the mod UI -credits="zontreck" #optional +#credits="" #optional # A text field displayed in the mod UI -authors="zontreck" #optional +authors="${mod_authors}" #optional # Display Test controls the display for your mod in the server connection screen # MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. # IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. @@ -41,32 +39,40 @@ authors="zontreck" #optional #displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) # The description text for the mod (multi line!) (#mandatory) -description=''' -It's time to put the fires out! -''' +description='''${mod_description}''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.fire]] #optional - # the modid of the dependency - modId="forge" #mandatory - # Does this dependency have to exist - if not, ordering below must be specified - mandatory=true #mandatory - # The version range of the dependency - versionRange="[40,)" #mandatory - # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory - ordering="NONE" - # Side this dependency is applied on - BOTH, CLIENT or SERVER - side="BOTH" +[[dependencies.${mod_id}]] #optional +# the modid of the dependency +modId="forge" #mandatory +# Does this dependency have to exist - if not, ordering below must be specified +mandatory=true #mandatory +# The version range of the dependency +versionRange="${forge_version_range}" #mandatory +# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory +# BEFORE - This mod is loaded BEFORE the dependency +# AFTER - This mod is loaded AFTER the dependency +ordering="NONE" +# Side this dependency is applied on - BOTH, CLIENT, or SERVER +side="BOTH" # Here's another dependency -[[dependencies.fire]] - modId="minecraft" - mandatory=true +[[dependencies.${mod_id}]] +modId="minecraft" +mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="[1.18.2,1.19)" - ordering="NONE" - side="BOTH" -[[dependencies.fire]] - modId="libzontreck" - mandatory=true - versionRange="[1.10,1.11)" - ordering="NONE" - side="BOTH" \ No newline at end of file +versionRange="${minecraft_version_range}" +ordering="NONE" +side="BOTH" + +[[dependencies.${mod_id}]] +modId="libzontreck" +mandatory=true +versionRange="[1.10,1.11)" +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,)" \ No newline at end of file