diff --git a/.gitignore b/.gitignore index b57e8b3b..19fe28cd 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /run/ /run-data/ /logs +/runs *.classpath *.project diff --git a/gradle.properties b/gradle.properties index 94071b7a..34207ca7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ minecraft_version=1.20.4 # as they do not follow standard versioning conventions. minecraft_version_range=[1.20.4,1.21) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=20.4.80-beta +neo_version=20.4.198 # The Neo version range can use any version of Neo as bounds neo_version_range=[20.4,) # The loader version range can only use the major version of FML as bounds diff --git a/src/generated/resources/data/naturesaura/curios/slots/belt.json b/src/generated/resources/data/naturesaura/curios/slots/belt.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/generated/resources/data/naturesaura/curios/slots/belt.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/curios/slots/charm.json b/src/generated/resources/data/naturesaura/curios/slots/charm.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/generated/resources/data/naturesaura/curios/slots/charm.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/curios/slots/necklace.json b/src/generated/resources/data/naturesaura/curios/slots/necklace.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/generated/resources/data/naturesaura/curios/slots/necklace.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/curios/slots/ring.json b/src/generated/resources/data/naturesaura/curios/slots/ring.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/generated/resources/data/naturesaura/curios/slots/ring.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/forge/biome_modifier/aura_bloom.json b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_bloom.json similarity index 76% rename from src/generated/resources/data/naturesaura/forge/biome_modifier/aura_bloom.json rename to src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_bloom.json index 5b2133ae..07d434e3 100644 --- a/src/generated/resources/data/naturesaura/forge/biome_modifier/aura_bloom.json +++ b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_bloom.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "naturesaura:aura_bloom", "step": "vegetal_decoration" diff --git a/src/generated/resources/data/naturesaura/forge/biome_modifier/aura_cactus.json b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json similarity index 75% rename from src/generated/resources/data/naturesaura/forge/biome_modifier/aura_cactus.json rename to src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json index 7a8b4048..3299f787 100644 --- a/src/generated/resources/data/naturesaura/forge/biome_modifier/aura_cactus.json +++ b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#forge:is_sandy", "features": "naturesaura:aura_cactus", "step": "vegetal_decoration" diff --git a/src/generated/resources/data/naturesaura/forge/biome_modifier/aura_mushroom.json b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json similarity index 76% rename from src/generated/resources/data/naturesaura/forge/biome_modifier/aura_mushroom.json rename to src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json index b2ac9789..8303c8a4 100644 --- a/src/generated/resources/data/naturesaura/forge/biome_modifier/aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#forge:is_mushroom", "features": "naturesaura:aura_mushroom", "step": "vegetal_decoration" diff --git a/src/generated/resources/data/naturesaura/forge/biome_modifier/crimson_aura_mushroom.json b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/crimson_aura_mushroom.json similarity index 77% rename from src/generated/resources/data/naturesaura/forge/biome_modifier/crimson_aura_mushroom.json rename to src/generated/resources/data/naturesaura/neoforge/biome_modifier/crimson_aura_mushroom.json index e3a0f533..bad81fd7 100644 --- a/src/generated/resources/data/naturesaura/forge/biome_modifier/crimson_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/crimson_aura_mushroom.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#minecraft:is_nether", "features": "naturesaura:crimson_aura_mushroom", "step": "vegetal_decoration" diff --git a/src/generated/resources/data/naturesaura/forge/biome_modifier/warped_aura_mushroom.json b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/warped_aura_mushroom.json similarity index 77% rename from src/generated/resources/data/naturesaura/forge/biome_modifier/warped_aura_mushroom.json rename to src/generated/resources/data/naturesaura/neoforge/biome_modifier/warped_aura_mushroom.json index b3aad564..3b2b3b2f 100644 --- a/src/generated/resources/data/naturesaura/forge/biome_modifier/warped_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/warped_aura_mushroom.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#minecraft:is_nether", "features": "naturesaura:warped_aura_mushroom", "step": "vegetal_decoration" diff --git a/src/main/java/de/ellpeck/naturesaura/packet/PacketHandler.java b/src/main/java/de/ellpeck/naturesaura/packet/PacketHandler.java index 504e5505..d3293188 100644 --- a/src/main/java/de/ellpeck/naturesaura/packet/PacketHandler.java +++ b/src/main/java/de/ellpeck/naturesaura/packet/PacketHandler.java @@ -7,11 +7,12 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.Mod.EventBusSubscriber; +import net.neoforged.fml.common.Mod.EventBusSubscriber.Bus; import net.neoforged.neoforge.network.PacketDistributor; import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent; -@Mod.EventBusSubscriber +@EventBusSubscriber(bus = Bus.MOD) public final class PacketHandler { @SubscribeEvent diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3e08fd8d..16cf0a10 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,22 +4,22 @@ # Note that there are a couple of TOML lists in this file. # Find more information on toml format here: https://github.com/toml-lang/toml # 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="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +modLoader = "javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47. +loaderVersion = "${loader_version_range}" #mandatory # 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="${mod_license}" +license = "${mod_license}" # A URL to refer people to when problems occur with this mod #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="${mod_id}" #mandatory +modId = "${mod_id}" #mandatory # The version number of the mod -version="${mod_version}" #mandatory +version = "${mod_version}" #mandatory # A display name for the mod -displayName="${mod_name}" #mandatory +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 @@ -29,7 +29,7 @@ displayName="${mod_name}" #mandatory # A text field displayed in the mod UI #credits="" #optional # A text field displayed in the mod UI -authors="${mod_authors}" #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. @@ -39,29 +39,33 @@ authors="${mod_authors}" #optional #displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) # The description text for the mod (multi line!) (#mandatory) -description='''${mod_description}''' +description = '''${mod_description}''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.${mod_id}]] #optional +[[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 +modId = "neoforge" #mandatory +# The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive). +# 'required' requires the mod to exist, 'optional' does not +# 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning +type = "required" #mandatory +# Optional field describing why the dependency is required or why it is incompatible +# reason="..." # 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 +versionRange = "${neo_version_range}" #mandatory +# An ordering relationship for the dependency. # BEFORE - This mod is loaded BEFORE the dependency # AFTER - This mod is loaded AFTER the dependency -ordering="NONE" +ordering = "NONE" # Side this dependency is applied on - BOTH, CLIENT, or SERVER -side="BOTH" +side = "BOTH" # Here's another dependency -[[dependencies.${mod_id}]] -modId="minecraft" -mandatory=true +[[dependencies.${ mod_id }]] +modId = "minecraft" +type = "required" # This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange="${minecraft_version_range}" -ordering="NONE" -side="BOTH" +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