From 6e27fd2f073686322367b6489b08421f4028a312 Mon Sep 17 00:00:00 2001 From: cech12 Date: Tue, 15 Oct 2024 21:33:56 +0200 Subject: [PATCH] updated to Forge 52.0.21 - use common tags for carrots, wheat and ender pearls in advancements and recipes (all loaders) - fixed recipes and advancements by using the new common tags in Forge --- CHANGELOG.md | 8 ++++ .../de/cech12/usefulhats/UsefulHatsTags.java | 3 +- .../platform/services/IPlatformHelper.java | 7 --- .../data/c/tags/item/mushroom_caps.json | 11 +++++ .../recipes/combat/bunny_ears.json | 4 +- .../recipes/combat/ender_helmet.json | 2 +- .../recipes/combat/mining_hat.json | 0 .../recipes/combat/mushroom_hat.json | 0 .../recipes/combat/postman_hat.json | 0 .../recipes/combat/stocking_cap.json | 0 .../advancement/recipes/combat/straw_hat.json | 2 +- .../recipes/combat/wing_helmet.json | 0 .../usefulhats/recipe/aquanaut_helmet.json | 0 .../data/usefulhats/recipe/bunny_ears.json | 2 +- .../data/usefulhats/recipe/ender_helmet.json | 2 +- .../data/usefulhats/recipe/halo.json | 0 .../data/usefulhats/recipe/mining_hat.json | 0 .../data/usefulhats/recipe/mushroom_hat.json | 0 .../data/usefulhats/recipe/postman_hat.json | 0 .../data/usefulhats/recipe/stocking_cap.json | 0 .../data/usefulhats/recipe/straw_hat.json | 2 +- .../data/usefulhats/recipe/wing_helmet.json | 0 .../platform/FabricPlatformHelper.java | 5 --- .../data/c/tags/item/mushroom_caps.json | 7 --- .../data/c/tags/item/nuggets/gold.json | 6 --- .../recipes/combat/ender_helmet.json | 32 -------------- .../data/usefulhats/recipe/ender_helmet.json | 16 ------- .../cech12/usefulhats/UsefulHatsForgeMod.java | 4 +- .../platform/ForgePlatformHelper.java | 5 --- .../resources/data/c/tags/item/feathers.json | 10 +++++ .../resources/data/c/tags/item/mushrooms.json | 11 +++++ .../data/forge/tags/item/mushroom_caps.json | 7 --- .../recipes/combat/mining_hat.json | 43 ------------------- .../recipes/combat/mushroom_hat.json | 43 ------------------- .../recipes/combat/postman_hat.json | 43 ------------------- .../recipes/combat/stocking_cap.json | 32 -------------- .../recipes/combat/wing_helmet.json | 43 ------------------- .../usefulhats/recipe/aquanaut_helmet.json | 22 ---------- .../data/usefulhats/recipe/halo.json | 20 --------- .../data/usefulhats/recipe/mining_hat.json | 19 -------- .../data/usefulhats/recipe/mushroom_hat.json | 16 ------- .../data/usefulhats/recipe/postman_hat.json | 19 -------- .../data/usefulhats/recipe/stocking_cap.json | 16 ------- .../data/usefulhats/recipe/wing_helmet.json | 19 -------- gradle.properties | 6 +-- .../platform/NeoForgePlatformHelper.java | 5 --- .../resources/data/c/tags/item/feathers.json | 6 --- .../data/c/tags/item/mushroom_caps.json | 7 --- .../resources/data/c/tags/item/mushrooms.json | 7 --- .../data/c/tags/item/nuggets/gold.json | 6 --- .../recipes/combat/ender_helmet.json | 32 -------------- .../recipes/combat/mining_hat.json | 43 ------------------- .../recipes/combat/mushroom_hat.json | 43 ------------------- .../recipes/combat/postman_hat.json | 43 ------------------- .../recipes/combat/stocking_cap.json | 32 -------------- .../recipes/combat/wing_helmet.json | 43 ------------------- .../usefulhats/recipe/aquanaut_helmet.json | 22 ---------- .../data/usefulhats/recipe/ender_helmet.json | 16 ------- .../data/usefulhats/recipe/halo.json | 20 --------- .../data/usefulhats/recipe/mining_hat.json | 19 -------- .../data/usefulhats/recipe/mushroom_hat.json | 16 ------- .../data/usefulhats/recipe/postman_hat.json | 19 -------- .../data/usefulhats/recipe/stocking_cap.json | 16 ------- .../data/usefulhats/recipe/wing_helmet.json | 19 -------- 64 files changed, 52 insertions(+), 849 deletions(-) create mode 100644 common/src/main/resources/data/c/tags/item/mushroom_caps.json rename {forge => common}/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json (92%) rename {fabric => common}/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json (100%) rename {forge => common}/src/main/resources/data/usefulhats/recipe/ender_helmet.json (85%) rename {fabric => common}/src/main/resources/data/usefulhats/recipe/halo.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/recipe/mining_hat.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/recipe/mushroom_hat.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/recipe/postman_hat.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/recipe/stocking_cap.json (100%) rename {fabric => common}/src/main/resources/data/usefulhats/recipe/wing_helmet.json (100%) delete mode 100644 fabric/src/main/resources/data/c/tags/item/mushroom_caps.json delete mode 100644 fabric/src/main/resources/data/c/tags/item/nuggets/gold.json delete mode 100644 fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json delete mode 100644 fabric/src/main/resources/data/usefulhats/recipe/ender_helmet.json create mode 100644 forge/src/main/resources/data/c/tags/item/feathers.json create mode 100644 forge/src/main/resources/data/c/tags/item/mushrooms.json delete mode 100644 forge/src/main/resources/data/forge/tags/item/mushroom_caps.json delete mode 100644 forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json delete mode 100644 forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json delete mode 100644 forge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json delete mode 100644 forge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json delete mode 100644 forge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json delete mode 100644 forge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json delete mode 100644 forge/src/main/resources/data/usefulhats/recipe/halo.json delete mode 100644 forge/src/main/resources/data/usefulhats/recipe/mining_hat.json delete mode 100644 forge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json delete mode 100644 forge/src/main/resources/data/usefulhats/recipe/postman_hat.json delete mode 100644 forge/src/main/resources/data/usefulhats/recipe/stocking_cap.json delete mode 100644 forge/src/main/resources/data/usefulhats/recipe/wing_helmet.json delete mode 100644 neoforge/src/main/resources/data/c/tags/item/feathers.json delete mode 100644 neoforge/src/main/resources/data/c/tags/item/mushroom_caps.json delete mode 100644 neoforge/src/main/resources/data/c/tags/item/mushrooms.json delete mode 100644 neoforge/src/main/resources/data/c/tags/item/nuggets/gold.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/ender_helmet.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/halo.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/mining_hat.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/postman_hat.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/stocking_cap.json delete mode 100644 neoforge/src/main/resources/data/usefulhats/recipe/wing_helmet.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 881a56c..4e30921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.21.1-6.5.1.0] - 2024-10-15 +### Changed +- updated to Forge 52.0.21 +- use common tags for carrots, wheat and ender pearls in advancements and recipes (all loaders) + +### Fixed +- fixed recipes and advancements by using the new common tags in Forge + ## [1.21.1-6.5.0.0] - 2024-09-28 ### Changed - updated to Minecraft 1.21.1 (Fabric 0.105.0+1.21.1, NeoForge 21.1.62, Forge 52.0.16) diff --git a/common/src/main/java/de/cech12/usefulhats/UsefulHatsTags.java b/common/src/main/java/de/cech12/usefulhats/UsefulHatsTags.java index 191564c..23b2357 100644 --- a/common/src/main/java/de/cech12/usefulhats/UsefulHatsTags.java +++ b/common/src/main/java/de/cech12/usefulhats/UsefulHatsTags.java @@ -1,6 +1,5 @@ package de.cech12.usefulhats; -import de.cech12.usefulhats.platform.Services; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -9,7 +8,7 @@ public class UsefulHatsTags { public static class Items { - public static final TagKey MUSHROOM_CAPS = tag(Services.PLATFORM.getModSharingNamespace(), "mushroom_caps"); + public static final TagKey MUSHROOM_CAPS = tag("c", "mushroom_caps"); } private static TagKey tag(final String namespace, final String name) { diff --git a/common/src/main/java/de/cech12/usefulhats/platform/services/IPlatformHelper.java b/common/src/main/java/de/cech12/usefulhats/platform/services/IPlatformHelper.java index cb7d4d5..bae6ae0 100644 --- a/common/src/main/java/de/cech12/usefulhats/platform/services/IPlatformHelper.java +++ b/common/src/main/java/de/cech12/usefulhats/platform/services/IPlatformHelper.java @@ -12,13 +12,6 @@ public interface IPlatformHelper { */ String getPlatformName(); - /** - * Gets the namespace that is shared by other mods - * - * @return namespace that is shared by other mods - */ - String getModSharingNamespace(); - /** * Checks if a mod with the given id is loaded. * diff --git a/common/src/main/resources/data/c/tags/item/mushroom_caps.json b/common/src/main/resources/data/c/tags/item/mushroom_caps.json new file mode 100644 index 0000000..4fb3b96 --- /dev/null +++ b/common/src/main/resources/data/c/tags/item/mushroom_caps.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_mushroom_block", + "minecraft:red_mushroom_block", + { + "id": "#forge:mushroom_caps", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/usefulhats/advancement/recipes/combat/bunny_ears.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/bunny_ears.json index 4843247..3a5bb89 100644 --- a/common/src/main/resources/data/usefulhats/advancement/recipes/combat/bunny_ears.json +++ b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/bunny_ears.json @@ -21,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:carrot" - ] + "items": "#c:crops/carrot" } ] } diff --git a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json similarity index 92% rename from forge/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json rename to common/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json index 6aa424f..a188d5a 100644 --- a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json +++ b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "items": "#forge:ender_pearls" + "items": "#c:ender_pearls" } ] } diff --git a/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json rename to common/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json diff --git a/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json rename to common/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json diff --git a/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json rename to common/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json diff --git a/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json rename to common/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json diff --git a/common/src/main/resources/data/usefulhats/advancement/recipes/combat/straw_hat.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/straw_hat.json index 0ba15c1..2a7a2c8 100644 --- a/common/src/main/resources/data/usefulhats/advancement/recipes/combat/straw_hat.json +++ b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/straw_hat.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "items": "minecraft:wheat" + "items": "#c:crops/wheat" } ] } diff --git a/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json b/common/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json rename to common/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json diff --git a/fabric/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json b/common/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json rename to common/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json diff --git a/common/src/main/resources/data/usefulhats/recipe/bunny_ears.json b/common/src/main/resources/data/usefulhats/recipe/bunny_ears.json index d5e3cf5..a4710f0 100644 --- a/common/src/main/resources/data/usefulhats/recipe/bunny_ears.json +++ b/common/src/main/resources/data/usefulhats/recipe/bunny_ears.json @@ -11,7 +11,7 @@ "item": "minecraft:rabbit_hide" }, "C": { - "item": "minecraft:carrot" + "tag": "c:crops/carrot" } }, "result": { diff --git a/forge/src/main/resources/data/usefulhats/recipe/ender_helmet.json b/common/src/main/resources/data/usefulhats/recipe/ender_helmet.json similarity index 85% rename from forge/src/main/resources/data/usefulhats/recipe/ender_helmet.json rename to common/src/main/resources/data/usefulhats/recipe/ender_helmet.json index ab10426..36dfe63 100644 --- a/forge/src/main/resources/data/usefulhats/recipe/ender_helmet.json +++ b/common/src/main/resources/data/usefulhats/recipe/ender_helmet.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "tag": "forge:ender_pearls" + "tag": "c:ender_pearls" } }, "result": { diff --git a/fabric/src/main/resources/data/usefulhats/recipe/halo.json b/common/src/main/resources/data/usefulhats/recipe/halo.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/recipe/halo.json rename to common/src/main/resources/data/usefulhats/recipe/halo.json diff --git a/fabric/src/main/resources/data/usefulhats/recipe/mining_hat.json b/common/src/main/resources/data/usefulhats/recipe/mining_hat.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/recipe/mining_hat.json rename to common/src/main/resources/data/usefulhats/recipe/mining_hat.json diff --git a/fabric/src/main/resources/data/usefulhats/recipe/mushroom_hat.json b/common/src/main/resources/data/usefulhats/recipe/mushroom_hat.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/recipe/mushroom_hat.json rename to common/src/main/resources/data/usefulhats/recipe/mushroom_hat.json diff --git a/fabric/src/main/resources/data/usefulhats/recipe/postman_hat.json b/common/src/main/resources/data/usefulhats/recipe/postman_hat.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/recipe/postman_hat.json rename to common/src/main/resources/data/usefulhats/recipe/postman_hat.json diff --git a/fabric/src/main/resources/data/usefulhats/recipe/stocking_cap.json b/common/src/main/resources/data/usefulhats/recipe/stocking_cap.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/recipe/stocking_cap.json rename to common/src/main/resources/data/usefulhats/recipe/stocking_cap.json diff --git a/common/src/main/resources/data/usefulhats/recipe/straw_hat.json b/common/src/main/resources/data/usefulhats/recipe/straw_hat.json index 2e56404..5e24cee 100644 --- a/common/src/main/resources/data/usefulhats/recipe/straw_hat.json +++ b/common/src/main/resources/data/usefulhats/recipe/straw_hat.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:wheat" + "tag": "c:crops/wheat" } }, "result": { diff --git a/fabric/src/main/resources/data/usefulhats/recipe/wing_helmet.json b/common/src/main/resources/data/usefulhats/recipe/wing_helmet.json similarity index 100% rename from fabric/src/main/resources/data/usefulhats/recipe/wing_helmet.json rename to common/src/main/resources/data/usefulhats/recipe/wing_helmet.json diff --git a/fabric/src/main/java/de/cech12/usefulhats/platform/FabricPlatformHelper.java b/fabric/src/main/java/de/cech12/usefulhats/platform/FabricPlatformHelper.java index 666933e..897e7f5 100644 --- a/fabric/src/main/java/de/cech12/usefulhats/platform/FabricPlatformHelper.java +++ b/fabric/src/main/java/de/cech12/usefulhats/platform/FabricPlatformHelper.java @@ -13,11 +13,6 @@ public String getPlatformName() { return "Fabric"; } - @Override - public String getModSharingNamespace() { - return "c"; - } - @Override public boolean isModLoaded(String modId) { return FabricLoader.getInstance().isModLoaded(modId); diff --git a/fabric/src/main/resources/data/c/tags/item/mushroom_caps.json b/fabric/src/main/resources/data/c/tags/item/mushroom_caps.json deleted file mode 100644 index 9a51b34..0000000 --- a/fabric/src/main/resources/data/c/tags/item/mushroom_caps.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block" - ] -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/c/tags/item/nuggets/gold.json b/fabric/src/main/resources/data/c/tags/item/nuggets/gold.json deleted file mode 100644 index 2fe99bd..0000000 --- a/fabric/src/main/resources/data/c/tags/item/nuggets/gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:gold_nugget" - ] -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json b/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json deleted file mode 100644 index 1bc045f..0000000 --- a/fabric/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:ender_helmet" - ] - }, - "criteria": { - "has_ender_pearl": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:ender_pearl" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:ender_helmet" - } - } - }, - "requirements": [ - [ - "has_ender_pearl", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/usefulhats/recipe/ender_helmet.json b/fabric/src/main/resources/data/usefulhats/recipe/ender_helmet.json deleted file mode 100644 index 02f51ce..0000000 --- a/fabric/src/main/resources/data/usefulhats/recipe/ender_helmet.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "###", - "# #" - ], - "key": { - "#": { - "item": "minecraft:ender_pearl" - } - }, - "result": { - "id": "usefulhats:ender_helmet" - } -} \ No newline at end of file diff --git a/forge/src/main/java/de/cech12/usefulhats/UsefulHatsForgeMod.java b/forge/src/main/java/de/cech12/usefulhats/UsefulHatsForgeMod.java index c4af490..ad835cb 100644 --- a/forge/src/main/java/de/cech12/usefulhats/UsefulHatsForgeMod.java +++ b/forge/src/main/java/de/cech12/usefulhats/UsefulHatsForgeMod.java @@ -10,8 +10,8 @@ @Mod(Constants.MOD_ID) public class UsefulHatsForgeMod { - public UsefulHatsForgeMod() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + public UsefulHatsForgeMod(FMLJavaModLoadingContext context) { + IEventBus modEventBus = context.getModEventBus(); ModItems.ITEMS.register(modEventBus); ModItems.DATA_COMPONENTS.register(modEventBus); ModItems.addEventListeners(); diff --git a/forge/src/main/java/de/cech12/usefulhats/platform/ForgePlatformHelper.java b/forge/src/main/java/de/cech12/usefulhats/platform/ForgePlatformHelper.java index 64f482f..2ace8e6 100644 --- a/forge/src/main/java/de/cech12/usefulhats/platform/ForgePlatformHelper.java +++ b/forge/src/main/java/de/cech12/usefulhats/platform/ForgePlatformHelper.java @@ -14,11 +14,6 @@ public String getPlatformName() { return "Forge"; } - @Override - public String getModSharingNamespace() { - return "forge"; - } - @Override public boolean isModLoaded(String modId) { return ModList.get().isLoaded(modId); diff --git a/forge/src/main/resources/data/c/tags/item/feathers.json b/forge/src/main/resources/data/c/tags/item/feathers.json new file mode 100644 index 0000000..6d8cbd9 --- /dev/null +++ b/forge/src/main/resources/data/c/tags/item/feathers.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:feather", + { + "id": "#forge:feathers", + "required": false + } + ] +} \ No newline at end of file diff --git a/forge/src/main/resources/data/c/tags/item/mushrooms.json b/forge/src/main/resources/data/c/tags/item/mushrooms.json new file mode 100644 index 0000000..59a8918 --- /dev/null +++ b/forge/src/main/resources/data/c/tags/item/mushrooms.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_mushroom", + "minecraft:red_mushroom", + { + "id": "#forge:mushrooms", + "required": false + } + ] +} \ No newline at end of file diff --git a/forge/src/main/resources/data/forge/tags/item/mushroom_caps.json b/forge/src/main/resources/data/forge/tags/item/mushroom_caps.json deleted file mode 100644 index 9a51b34..0000000 --- a/forge/src/main/resources/data/forge/tags/item/mushroom_caps.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block" - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json b/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json deleted file mode 100644 index 5b1bb86..0000000 --- a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:mining_hat" - ] - }, - "criteria": { - "has_gold_ingot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:ingots/gold" - } - ] - } - }, - "has_glowstone_dust": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:dusts/glowstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:mining_hat" - } - } - }, - "requirements": [ - [ - "has_gold_ingot", - "has_glowstone_dust", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json b/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json deleted file mode 100644 index a42b76a..0000000 --- a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:mushroom_hat" - ] - }, - "criteria": { - "has_mushroom_cap_block": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:mushroom_caps" - } - ] - } - }, - "has_mushroom": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:mushrooms" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:mushroom_hat" - } - } - }, - "requirements": [ - [ - "has_mushroom_cap_block", - "has_mushroom", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json b/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json deleted file mode 100644 index 636db11..0000000 --- a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:postman_hat" - ] - }, - "criteria": { - "has_lapis_lazuli": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:gems/lapis" - } - ] - } - }, - "has_gold_nugget": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:nuggets/gold" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:postman_hat" - } - } - }, - "requirements": [ - [ - "has_lapis_lazuli", - "has_gold_nugget", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json b/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json deleted file mode 100644 index b6e5489..0000000 --- a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:stocking_cap" - ] - }, - "criteria": { - "has_string": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:string" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:stocking_cap" - } - } - }, - "requirements": [ - [ - "has_string", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json b/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json deleted file mode 100644 index 302c3da..0000000 --- a/forge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:wing_helmet" - ] - }, - "criteria": { - "has_feather": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:feathers" - } - ] - } - }, - "has_phantom_membrane": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:phantom_membrane" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:wing_helmet" - } - } - }, - "requirements": [ - [ - "has_feather", - "has_phantom_membrane", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json b/forge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json deleted file mode 100644 index dce21e0..0000000 --- a/forge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "#O#", - "#G#" - ], - "key": { - "#": { - "item": "minecraft:turtle_scute" - }, - "O": { - "item": "minecraft:turtle_helmet" - }, - "G": { - "tag": "forge:glass_panes" - } - }, - "result": { - "id": "usefulhats:aquanaut_helmet" - } -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/recipe/halo.json b/forge/src/main/resources/data/usefulhats/recipe/halo.json deleted file mode 100644 index ee21328..0000000 --- a/forge/src/main/resources/data/usefulhats/recipe/halo.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - " # ", - "#O#", - " # " - ], - "key": { - "O": { - "item": "minecraft:nether_star" - }, - "#": { - "tag": "forge:dusts/glowstone" - } - }, - "result": { - "id": "usefulhats:halo" - } -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/recipe/mining_hat.json b/forge/src/main/resources/data/usefulhats/recipe/mining_hat.json deleted file mode 100644 index dbd16b6..0000000 --- a/forge/src/main/resources/data/usefulhats/recipe/mining_hat.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "#O#", - "# #" - ], - "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "O": { - "tag": "forge:dusts/glowstone" - } - }, - "result": { - "id": "usefulhats:mining_hat" - } -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json b/forge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json deleted file mode 100644 index 85ebc24..0000000 --- a/forge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "###", - "# #" - ], - "key": { - "#": { - "tag": "forge:mushroom_caps" - } - }, - "result": { - "id": "usefulhats:mushroom_hat" - } -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/recipe/postman_hat.json b/forge/src/main/resources/data/usefulhats/recipe/postman_hat.json deleted file mode 100644 index 51265fb..0000000 --- a/forge/src/main/resources/data/usefulhats/recipe/postman_hat.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "#O#", - "# #" - ], - "key": { - "#": { - "tag": "forge:gems/lapis" - }, - "O": { - "tag": "forge:nuggets/gold" - } - }, - "result": { - "id": "usefulhats:postman_hat" - } -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/recipe/stocking_cap.json b/forge/src/main/resources/data/usefulhats/recipe/stocking_cap.json deleted file mode 100644 index cce2043..0000000 --- a/forge/src/main/resources/data/usefulhats/recipe/stocking_cap.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "###", - "# #" - ], - "key": { - "#": { - "tag": "forge:string" - } - }, - "result": { - "id": "usefulhats:stocking_cap" - } -} \ No newline at end of file diff --git a/forge/src/main/resources/data/usefulhats/recipe/wing_helmet.json b/forge/src/main/resources/data/usefulhats/recipe/wing_helmet.json deleted file mode 100644 index a0253c5..0000000 --- a/forge/src/main/resources/data/usefulhats/recipe/wing_helmet.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "F#F", - "# #" - ], - "key": { - "#": { - "item": "minecraft:phantom_membrane" - }, - "F": { - "tag": "forge:feathers" - } - }, - "result": { - "id": "usefulhats:wing_helmet" - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 32eb491..14e5326 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ # Project group=de.cech12.usefulhats -mod_version=6.5.0.0 +mod_version=6.5.1.0 mod_id=usefulhats mod_name=Useful Hats mod_author=Cech12 @@ -25,8 +25,8 @@ cloth_config_version=15.0.140 mod_menu_version=11.0.2 # Forge -forge_version=52.0.16 -forge_version_range=[52.0.16,) +forge_version=52.0.21 +forge_version_range=[52.0.21,) forge_loader_version_range=[50,) # NeoForge diff --git a/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgePlatformHelper.java index d991f7b..57404bf 100644 --- a/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgePlatformHelper.java +++ b/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgePlatformHelper.java @@ -14,11 +14,6 @@ public String getPlatformName() { return "Neoforge"; } - @Override - public String getModSharingNamespace() { - return "c"; - } - @Override public boolean isModLoaded(String modId) { return ModList.get().isLoaded(modId); diff --git a/neoforge/src/main/resources/data/c/tags/item/feathers.json b/neoforge/src/main/resources/data/c/tags/item/feathers.json deleted file mode 100644 index 9540a42..0000000 --- a/neoforge/src/main/resources/data/c/tags/item/feathers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:feather" - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/c/tags/item/mushroom_caps.json b/neoforge/src/main/resources/data/c/tags/item/mushroom_caps.json deleted file mode 100644 index 9a51b34..0000000 --- a/neoforge/src/main/resources/data/c/tags/item/mushroom_caps.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block" - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/c/tags/item/mushrooms.json b/neoforge/src/main/resources/data/c/tags/item/mushrooms.json deleted file mode 100644 index 0b6b094..0000000 --- a/neoforge/src/main/resources/data/c/tags/item/mushrooms.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom", - "minecraft:red_mushroom" - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/c/tags/item/nuggets/gold.json b/neoforge/src/main/resources/data/c/tags/item/nuggets/gold.json deleted file mode 100644 index 2fe99bd..0000000 --- a/neoforge/src/main/resources/data/c/tags/item/nuggets/gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:gold_nugget" - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json b/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json deleted file mode 100644 index 1bc045f..0000000 --- a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/ender_helmet.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:ender_helmet" - ] - }, - "criteria": { - "has_ender_pearl": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:ender_pearl" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:ender_helmet" - } - } - }, - "requirements": [ - [ - "has_ender_pearl", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json b/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json deleted file mode 100644 index 58f838f..0000000 --- a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mining_hat.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:mining_hat" - ] - }, - "criteria": { - "has_gold_ingot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:ingots/gold" - } - ] - } - }, - "has_glowstone_dust": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:dusts/glowstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:mining_hat" - } - } - }, - "requirements": [ - [ - "has_gold_ingot", - "has_glowstone_dust", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json b/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json deleted file mode 100644 index 6a73016..0000000 --- a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/mushroom_hat.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:mushroom_hat" - ] - }, - "criteria": { - "has_mushroom_cap_block": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:mushroom_caps" - } - ] - } - }, - "has_mushroom": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:mushrooms" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:mushroom_hat" - } - } - }, - "requirements": [ - [ - "has_mushroom_cap_block", - "has_mushroom", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json b/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json deleted file mode 100644 index c2d454d..0000000 --- a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/postman_hat.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:postman_hat" - ] - }, - "criteria": { - "has_lapis_lazuli": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:gems/lapis" - } - ] - } - }, - "has_gold_nugget": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:nuggets/gold" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:postman_hat" - } - } - }, - "requirements": [ - [ - "has_lapis_lazuli", - "has_gold_nugget", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json b/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json deleted file mode 100644 index 104d4df..0000000 --- a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/stocking_cap.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:stocking_cap" - ] - }, - "criteria": { - "has_string": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:strings" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:stocking_cap" - } - } - }, - "requirements": [ - [ - "has_string", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json b/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json deleted file mode 100644 index 7d71e15..0000000 --- a/neoforge/src/main/resources/data/usefulhats/advancement/recipes/combat/wing_helmet.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "usefulhats:wing_helmet" - ] - }, - "criteria": { - "has_feather": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:feathers" - } - ] - } - }, - "has_phantom_membrane": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:phantom_membrane" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "usefulhats:wing_helmet" - } - } - }, - "requirements": [ - [ - "has_feather", - "has_phantom_membrane", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json b/neoforge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json deleted file mode 100644 index 7eb7526..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/aquanaut_helmet.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "#O#", - "#G#" - ], - "key": { - "#": { - "item": "minecraft:turtle_scute" - }, - "O": { - "item": "minecraft:turtle_helmet" - }, - "G": { - "tag": "c:glass_panes" - } - }, - "result": { - "id": "usefulhats:aquanaut_helmet" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/ender_helmet.json b/neoforge/src/main/resources/data/usefulhats/recipe/ender_helmet.json deleted file mode 100644 index 02f51ce..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/ender_helmet.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "###", - "# #" - ], - "key": { - "#": { - "item": "minecraft:ender_pearl" - } - }, - "result": { - "id": "usefulhats:ender_helmet" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/halo.json b/neoforge/src/main/resources/data/usefulhats/recipe/halo.json deleted file mode 100644 index 2d6f978..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/halo.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - " # ", - "#O#", - " # " - ], - "key": { - "O": { - "item": "minecraft:nether_star" - }, - "#": { - "tag": "c:dusts/glowstone" - } - }, - "result": { - "id": "usefulhats:halo" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/mining_hat.json b/neoforge/src/main/resources/data/usefulhats/recipe/mining_hat.json deleted file mode 100644 index 0caef28..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/mining_hat.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "#O#", - "# #" - ], - "key": { - "#": { - "tag": "c:ingots/gold" - }, - "O": { - "tag": "c:dusts/glowstone" - } - }, - "result": { - "id": "usefulhats:mining_hat" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json b/neoforge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json deleted file mode 100644 index b32f62d..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/mushroom_hat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "###", - "# #" - ], - "key": { - "#": { - "tag": "c:mushroom_caps" - } - }, - "result": { - "id": "usefulhats:mushroom_hat" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/postman_hat.json b/neoforge/src/main/resources/data/usefulhats/recipe/postman_hat.json deleted file mode 100644 index 5865771..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/postman_hat.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "#O#", - "# #" - ], - "key": { - "#": { - "tag": "c:gems/lapis" - }, - "O": { - "tag": "c:nuggets/gold" - } - }, - "result": { - "id": "usefulhats:postman_hat" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/stocking_cap.json b/neoforge/src/main/resources/data/usefulhats/recipe/stocking_cap.json deleted file mode 100644 index 0a1f24c..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/stocking_cap.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "###", - "# #" - ], - "key": { - "#": { - "tag": "c:strings" - } - }, - "result": { - "id": "usefulhats:stocking_cap" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/usefulhats/recipe/wing_helmet.json b/neoforge/src/main/resources/data/usefulhats/recipe/wing_helmet.json deleted file mode 100644 index 4b1a247..0000000 --- a/neoforge/src/main/resources/data/usefulhats/recipe/wing_helmet.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "F#F", - "# #" - ], - "key": { - "#": { - "item": "minecraft:phantom_membrane" - }, - "F": { - "tag": "c:feathers" - } - }, - "result": { - "id": "usefulhats:wing_helmet" - } -} \ No newline at end of file