Skip to content

Commit b3bc24e

Browse files
EllpeckEllpeck
committed
generate data
1 parent f7f425d commit b3bc24e

File tree

13 files changed

+41
-31
lines changed

13 files changed

+41
-31
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/run/
1515
/run-data/
1616
/logs
17+
/runs
1718

1819
*.classpath
1920
*.project

Diff for: ‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ minecraft_version=1.20.4
1313
# as they do not follow standard versioning conventions.
1414
minecraft_version_range=[1.20.4,1.21)
1515
# The Neo version must agree with the Minecraft version to get a valid artifact
16-
neo_version=20.4.80-beta
16+
neo_version=20.4.198
1717
# The Neo version range can use any version of Neo as bounds
1818
neo_version_range=[20.4,)
1919
# The loader version range can only use the major version of FML as bounds

Diff for: ‎src/generated/resources/data/naturesaura/curios/slots/belt.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

Diff for: ‎src/generated/resources/data/naturesaura/curios/slots/charm.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

Diff for: ‎src/generated/resources/data/naturesaura/curios/slots/necklace.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

Diff for: ‎src/generated/resources/data/naturesaura/curios/slots/ring.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

Diff for: ‎src/generated/resources/data/naturesaura/forge/biome_modifier/aura_bloom.json renamed to ‎src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_bloom.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "forge:add_features",
2+
"type": "neoforge:add_features",
33
"biomes": "#minecraft:is_overworld",
44
"features": "naturesaura:aura_bloom",
55
"step": "vegetal_decoration"

Diff for: ‎src/generated/resources/data/naturesaura/forge/biome_modifier/aura_cactus.json renamed to ‎src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "forge:add_features",
2+
"type": "neoforge:add_features",
33
"biomes": "#forge:is_sandy",
44
"features": "naturesaura:aura_cactus",
55
"step": "vegetal_decoration"

Diff for: ‎src/generated/resources/data/naturesaura/forge/biome_modifier/aura_mushroom.json renamed to ‎src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "forge:add_features",
2+
"type": "neoforge:add_features",
33
"biomes": "#forge:is_mushroom",
44
"features": "naturesaura:aura_mushroom",
55
"step": "vegetal_decoration"

Diff for: ‎src/generated/resources/data/naturesaura/forge/biome_modifier/crimson_aura_mushroom.json renamed to ‎src/generated/resources/data/naturesaura/neoforge/biome_modifier/crimson_aura_mushroom.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "forge:add_features",
2+
"type": "neoforge:add_features",
33
"biomes": "#minecraft:is_nether",
44
"features": "naturesaura:crimson_aura_mushroom",
55
"step": "vegetal_decoration"

Diff for: ‎src/generated/resources/data/naturesaura/forge/biome_modifier/warped_aura_mushroom.json renamed to ‎src/generated/resources/data/naturesaura/neoforge/biome_modifier/warped_aura_mushroom.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "forge:add_features",
2+
"type": "neoforge:add_features",
33
"biomes": "#minecraft:is_nether",
44
"features": "naturesaura:warped_aura_mushroom",
55
"step": "vegetal_decoration"

Diff for: ‎src/main/java/de/ellpeck/naturesaura/packet/PacketHandler.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
import net.minecraft.world.entity.player.Player;
88
import net.minecraft.world.level.Level;
99
import net.neoforged.bus.api.SubscribeEvent;
10-
import net.neoforged.fml.common.Mod;
10+
import net.neoforged.fml.common.Mod.EventBusSubscriber;
11+
import net.neoforged.fml.common.Mod.EventBusSubscriber.Bus;
1112
import net.neoforged.neoforge.network.PacketDistributor;
1213
import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
1314

14-
@Mod.EventBusSubscriber
15+
@EventBusSubscriber(bus = Bus.MOD)
1516
public final class PacketHandler {
1617

1718
@SubscribeEvent

Diff for: ‎src/main/resources/META-INF/mods.toml

+27-23
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
# Note that there are a couple of TOML lists in this file.
55
# Find more information on toml format here: https://github.com/toml-lang/toml
66
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
7-
modLoader="javafml" #mandatory
8-
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
9-
loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
7+
modLoader = "javafml" #mandatory
8+
# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47.
9+
loaderVersion = "${loader_version_range}" #mandatory
1010
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
1111
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
12-
license="${mod_license}"
12+
license = "${mod_license}"
1313
# A URL to refer people to when problems occur with this mod
1414
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
1515
# A list of mods - how many allowed here is determined by the individual mod loader
1616
[[mods]] #mandatory
1717
# The modid of the mod
18-
modId="${mod_id}" #mandatory
18+
modId = "${mod_id}" #mandatory
1919
# The version number of the mod
20-
version="${mod_version}" #mandatory
20+
version = "${mod_version}" #mandatory
2121
# A display name for the mod
22-
displayName="${mod_name}" #mandatory
22+
displayName = "${mod_name}" #mandatory
2323
# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
2424
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
2525
# A URL for the "homepage" for this mod, displayed in the mod UI
@@ -29,7 +29,7 @@ displayName="${mod_name}" #mandatory
2929
# A text field displayed in the mod UI
3030
#credits="" #optional
3131
# A text field displayed in the mod UI
32-
authors="${mod_authors}" #optional
32+
authors = "${mod_authors}" #optional
3333
# Display Test controls the display for your mod in the server connection screen
3434
# 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.
3535
# 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
3939
#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
4040

4141
# The description text for the mod (multi line!) (#mandatory)
42-
description='''${mod_description}'''
42+
description = '''${mod_description}'''
4343
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
44-
[[dependencies.${mod_id}]] #optional
44+
[[dependencies.${ mod_id }]] #optional
4545
# the modid of the dependency
46-
modId="forge" #mandatory
47-
# Does this dependency have to exist - if not, ordering below must be specified
48-
mandatory=true #mandatory
46+
modId = "neoforge" #mandatory
47+
# The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive).
48+
# 'required' requires the mod to exist, 'optional' does not
49+
# 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning
50+
type = "required" #mandatory
51+
# Optional field describing why the dependency is required or why it is incompatible
52+
# reason="..."
4953
# The version range of the dependency
50-
versionRange="${forge_version_range}" #mandatory
51-
# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
54+
versionRange = "${neo_version_range}" #mandatory
55+
# An ordering relationship for the dependency.
5256
# BEFORE - This mod is loaded BEFORE the dependency
5357
# AFTER - This mod is loaded AFTER the dependency
54-
ordering="NONE"
58+
ordering = "NONE"
5559
# Side this dependency is applied on - BOTH, CLIENT, or SERVER
56-
side="BOTH"
60+
side = "BOTH"
5761
# Here's another dependency
58-
[[dependencies.${mod_id}]]
59-
modId="minecraft"
60-
mandatory=true
62+
[[dependencies.${ mod_id }]]
63+
modId = "minecraft"
64+
type = "required"
6165
# This version range declares a minimum of the current minecraft version up to but not including the next major version
62-
versionRange="${minecraft_version_range}"
63-
ordering="NONE"
64-
side="BOTH"
66+
versionRange = "${minecraft_version_range}"
67+
ordering = "NONE"
68+
side = "BOTH"
6569

6670
# Features are specific properties of the game environment, that you may want to declare you require. This example declares
6771
# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't

0 commit comments

Comments
 (0)