diff --git a/gradle.properties b/gradle.properties index d53ce30..a3f15e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ org.gradle.jvmargs=-Xmx1G org.gradle.daemon=true org.gradle.parallel=true -org.gradle.caching=true \ No newline at end of file +org.gradle.caching=true +org.gradle.configuration-cache=true \ No newline at end of file diff --git a/mo_tool_tiers.mcreator b/mo_tool_tiers.mcreator index ca9cfb7..f30a11c 100644 --- a/mo_tool_tiers.mcreator +++ b/mo_tool_tiers.mcreator @@ -105,7 +105,7 @@ "workspaceSettings": { "modid": "mo_tool_tiers", "modName": "Mo Tool Tiers", - "version": "1.0.0", + "version": "1.1.0", "description": "We\u0027ve added support for a multi-tool tier system using Minecraft tags. You’re welcome to make suggestions or provide feedback on our GitHub.", "author": "NorthWestTrees", "websiteURL": "https://github.com/MCreator-Examples/Mo-Tool-Teirs", @@ -116,9 +116,9 @@ "dependencies": [], "dependants": [], "mcreatorDependencies": [], - "currentGenerator": "neoforge-1.20.6", + "currentGenerator": "neoforge-1.21.1", "credits": "NeoForge, MCreator", "modElementsPackage": "net.nwtg.motooltiers" }, - "mcreatorVersion": 202400232117 + "mcreatorVersion": 202400342716 } \ No newline at end of file diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 7104e30..33bff03 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -1,16 +1,16 @@ modLoader="javafml" -loaderVersion="[2,)" +loaderVersion="[4,)" license="GNU General Public License version 3 (GPLv3)" [[mods]] modId="mo_tool_tiers" -version="1.0.0" +version="1.1.0" displayName="Mo Tool Tiers" updateJSONURL="https://raw.githubusercontent.com/MCreator-Examples/Mo-Tool-Tiers/refs/heads/main/updates/update.json" displayURL="https://github.com/MCreator-Examples/Mo-Tool-Teirs" credits="NeoForge, MCreator" authors="NorthWestTrees" -description="We've added support for a multi-tool tier system using Minecraft tags. You’re welcome to make suggestions or provide feedback on our GitHub." +description="We've added support for a multi-tool tier system using Minecraft tags. You\u2019re welcome to make suggestions or provide feedback on our GitHub." # Start of user code block mod configuration # End of user code block mod configuration @@ -18,14 +18,14 @@ description="We've added support for a multi-tool tier system using Minecraft ta [[dependencies.mo_tool_tiers]] modId="neoforge" type="required" - versionRange="[20.6.117,)" + versionRange="[21.1.65,)" ordering="AFTER" side="BOTH" [[dependencies.mo_tool_tiers]] modId="minecraft" type="required" - versionRange="[1.20.6]" + versionRange="[1.21.1]" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/normal_deep.json b/src/main/resources/data/mo_tool_tiers/tags/item/normal_deep.json new file mode 100644 index 0000000..e98e441 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/normal_deep.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:strong_deep" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/normal_end.json b/src/main/resources/data/mo_tool_tiers/tags/item/normal_end.json new file mode 100644 index 0000000..74b2c1c --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/normal_end.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:strong_end" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/normal_gemstone.json b/src/main/resources/data/mo_tool_tiers/tags/item/normal_gemstone.json new file mode 100644 index 0000000..b80ea50 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/normal_gemstone.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:strong_gemstone", + "minecraft:diamond_sword", + "minecraft:diamond_shovel", + "minecraft:diamond_pickaxe", + "minecraft:diamond_axe", + "minecraft:diamond_hoe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/normal_metal.json b/src/main/resources/data/mo_tool_tiers/tags/item/normal_metal.json new file mode 100644 index 0000000..5d50381 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/normal_metal.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:strong_metal", + "minecraft:iron_sword", + "minecraft:iron_shovel", + "minecraft:iron_pickaxe", + "minecraft:iron_axe", + "minecraft:iron_hoe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/normal_nether.json b/src/main/resources/data/mo_tool_tiers/tags/item/normal_nether.json new file mode 100644 index 0000000..69808e0 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/normal_nether.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:strong_nether", + "minecraft:netherite_sword", + "minecraft:netherite_shovel", + "minecraft:netherite_pickaxe", + "minecraft:netherite_axe", + "minecraft:netherite_hoe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/normal_stone.json b/src/main/resources/data/mo_tool_tiers/tags/item/normal_stone.json new file mode 100644 index 0000000..43a3378 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/normal_stone.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:strong_stone", + "minecraft:stone_sword", + "minecraft:stone_shovel", + "minecraft:stone_pickaxe", + "minecraft:stone_axe", + "minecraft:stone_hoe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/normal_wood.json b/src/main/resources/data/mo_tool_tiers/tags/item/normal_wood.json new file mode 100644 index 0000000..7fdf11a --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/normal_wood.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:strong_wood", + "minecraft:wooden_sword", + "minecraft:wooden_shovel", + "minecraft:wooden_pickaxe", + "minecraft:wooden_axe", + "minecraft:wooden_hoe", + "minecraft:golden_sword", + "minecraft:golden_shovel", + "minecraft:golden_pickaxe", + "minecraft:golden_axe", + "minecraft:golden_hoe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/strong_end.json b/src/main/resources/data/mo_tool_tiers/tags/item/strong_end.json new file mode 100644 index 0000000..fca65aa --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/strong_end.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:weak_deep" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/strong_gemstone.json b/src/main/resources/data/mo_tool_tiers/tags/item/strong_gemstone.json new file mode 100644 index 0000000..66f8c66 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/strong_gemstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:weak_nether" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/strong_metal.json b/src/main/resources/data/mo_tool_tiers/tags/item/strong_metal.json new file mode 100644 index 0000000..9ed0070 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/strong_metal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:weak_gemstone" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/strong_nether.json b/src/main/resources/data/mo_tool_tiers/tags/item/strong_nether.json new file mode 100644 index 0000000..cb15b36 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/strong_nether.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:weak_end" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/strong_stone.json b/src/main/resources/data/mo_tool_tiers/tags/item/strong_stone.json new file mode 100644 index 0000000..9b6c04d --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/strong_stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:weak_metal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/strong_wood.json b/src/main/resources/data/mo_tool_tiers/tags/item/strong_wood.json new file mode 100644 index 0000000..c846916 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/strong_wood.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:weak_stone" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/weak_deep.json b/src/main/resources/data/mo_tool_tiers/tags/item/weak_deep.json new file mode 100644 index 0000000..01b0936 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/weak_deep.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:normal_deep" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/weak_end.json b/src/main/resources/data/mo_tool_tiers/tags/item/weak_end.json new file mode 100644 index 0000000..5340010 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/weak_end.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:normal_end" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/weak_gemstone.json b/src/main/resources/data/mo_tool_tiers/tags/item/weak_gemstone.json new file mode 100644 index 0000000..e971da7 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/weak_gemstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:normal_gemstone" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/weak_metal.json b/src/main/resources/data/mo_tool_tiers/tags/item/weak_metal.json new file mode 100644 index 0000000..5386e2b --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/weak_metal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:normal_metal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/weak_nether.json b/src/main/resources/data/mo_tool_tiers/tags/item/weak_nether.json new file mode 100644 index 0000000..764d1bb --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/weak_nether.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:normal_nether" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/weak_stone.json b/src/main/resources/data/mo_tool_tiers/tags/item/weak_stone.json new file mode 100644 index 0000000..3e9cfbf --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/weak_stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:normal_stone" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mo_tool_tiers/tags/item/weak_wood.json b/src/main/resources/data/mo_tool_tiers/tags/item/weak_wood.json new file mode 100644 index 0000000..e5de801 --- /dev/null +++ b/src/main/resources/data/mo_tool_tiers/tags/item/weak_wood.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#mo_tool_tiers:normal_wood" + ] +} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index ce93411..3fcce27 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 41, + "pack_format": 48, "description": "We've added support for a multi-tool tier system using Minecraft tags. You’re welcome to make suggestions or provide feedback on our GitHub." } } \ No newline at end of file diff --git a/updates/update.json b/updates/update.json index cee0676..5d40d2c 100644 --- a/updates/update.json +++ b/updates/update.json @@ -3,8 +3,13 @@ "1.20.6": { "1.0.0": "ADDED:\n- Added weak tags for all material types.\n- Added normal tags for all material types.\n- Added strong tags for all material types.\n- Added materials for wood, stone, metal, gemstone, nether, end, and deep.\n" }, + "1.21.1": { + "1.1.0": "CHANGES:\n\n- Ported to NeoForge 1.21.1\n\n- Ported to MCreator 2024.3" + }, "promos": { "1.20.6-latest": "1.0.0", - "1.20.6-recommended": "1.0.0" + "1.21.1-latest": "1.1.0", + "1.20.6-recommended": "1.0.0", + "1.21.1-recommended": "1.1.0" } } \ No newline at end of file