From fe17296d0803f3b61b18d7c56d1fe2cee16a059a Mon Sep 17 00:00:00 2001 From: ACGaming <4818419+ACGaming@users.noreply.github.com> Date: Sun, 6 Oct 2024 10:38:07 +0200 Subject: [PATCH] Re-implement opt-in stick variants --- .../progwml6/natura/common/config/Config.java | 3 + .../natura/library/datafixes/ItemIDFixer.java | 1 - .../natura/oredict/NaturaOredict.java | 2 + .../natura/shared/CommonsClientProxy.java | 17 ++--- .../progwml6/natura/shared/NaturaCommons.java | 68 ++++++++++++++---- .../assets/natura/blockstates/sticks.json | 22 ++++++ .../nether/sticks/bloodwood_sticks.json | 25 +++++++ .../nether/sticks/darkwood_sticks.json | 25 +++++++ .../nether/sticks/fusewood_sticks.json | 25 +++++++ .../nether/sticks/ghostwood_sticks.json | 25 +++++++ .../overworld/sticks/amaranth_sticks.json | 25 +++++++ .../overworld/sticks/eucalyptus_sticks.json | 25 +++++++ .../overworld/sticks/hopseed_sticks.json | 25 +++++++ .../overworld/sticks/maple_sticks.json | 25 +++++++ .../overworld/sticks/redwood_sticks.json | 25 +++++++ .../overworld/sticks/sakura_sticks.json | 25 +++++++ .../overworld/sticks/silverbell_sticks.json | 25 +++++++ .../overworld/sticks/tiger_sticks.json | 25 +++++++ .../overworld/sticks/willow_sticks.json | 25 +++++++ .../textures/items/sticks/amaranth_stick.png | Bin 0 -> 106 bytes .../textures/items/sticks/bloodwood_stick.png | Bin 0 -> 106 bytes .../textures/items/sticks/darkwood_stick.png | Bin 0 -> 106 bytes .../items/sticks/eucalyptus_stick.png | Bin 0 -> 107 bytes .../textures/items/sticks/fusewood_stick.png | Bin 0 -> 106 bytes .../textures/items/sticks/ghostwood_stick.png | Bin 0 -> 106 bytes .../textures/items/sticks/hopseed_stick.png | Bin 0 -> 106 bytes .../textures/items/sticks/maple_stick.png | Bin 0 -> 106 bytes .../textures/items/sticks/redwood_stick.png | Bin 0 -> 106 bytes .../textures/items/sticks/sakura_stick.png | Bin 0 -> 106 bytes .../items/sticks/silverbell_stick.png | Bin 0 -> 107 bytes .../textures/items/sticks/tiger_stick.png | Bin 0 -> 159 bytes .../textures/items/sticks/willow_stick.png | Bin 0 -> 106 bytes 32 files changed, 416 insertions(+), 22 deletions(-) create mode 100644 src/main/resources/assets/natura/blockstates/sticks.json create mode 100644 src/main/resources/assets/natura/recipes/nether/sticks/bloodwood_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/nether/sticks/darkwood_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/nether/sticks/fusewood_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/nether/sticks/ghostwood_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/amaranth_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/eucalyptus_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/hopseed_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/maple_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/redwood_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/sakura_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/silverbell_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/tiger_sticks.json create mode 100644 src/main/resources/assets/natura/recipes/overworld/sticks/willow_sticks.json create mode 100644 src/main/resources/assets/natura/textures/items/sticks/amaranth_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/bloodwood_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/darkwood_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/eucalyptus_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/fusewood_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/ghostwood_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/hopseed_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/maple_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/redwood_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/sakura_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/silverbell_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/tiger_stick.png create mode 100644 src/main/resources/assets/natura/textures/items/sticks/willow_stick.png diff --git a/src/main/java/com/progwml6/natura/common/config/Config.java b/src/main/java/com/progwml6/natura/common/config/Config.java index df7a12a3..030fbee7 100644 --- a/src/main/java/com/progwml6/natura/common/config/Config.java +++ b/src/main/java/com/progwml6/natura/common/config/Config.java @@ -150,6 +150,7 @@ public static boolean syncConfig() generateGlowshroomtree = configFile.get(ENABLE_DISABLE, "Generate Glowshroom Trees", generateGlowshroomtree).getBoolean(generateGlowshroomtree); dropCotton = configFile.get(ENABLE_DISABLE, "Drop cotton seeds from grass", dropCotton).getBoolean(dropCotton); dropBarley = configFile.get(ENABLE_DISABLE, "Drop barley seeds from grass", dropBarley).getBoolean(dropBarley); + enableStickVariants = configFile.get(ENABLE_DISABLE, "Enable stick variants", enableStickVariants).getBoolean(enableStickVariants); try { Class.forName("chococraft.common.ModChocoCraft"); @@ -444,6 +445,8 @@ public static boolean syncConfig() public static boolean dropBarley = true; public static boolean dropCotton = true; + public static boolean enableStickVariants = false; + public static int[] overworldWorldGenBlacklist = new int[] {}; public static int[] netherWorldGenBlacklist = new int[] {}; diff --git a/src/main/java/com/progwml6/natura/library/datafixes/ItemIDFixer.java b/src/main/java/com/progwml6/natura/library/datafixes/ItemIDFixer.java index 6ccad474..1accf9cf 100644 --- a/src/main/java/com/progwml6/natura/library/datafixes/ItemIDFixer.java +++ b/src/main/java/com/progwml6/natura/library/datafixes/ItemIDFixer.java @@ -28,7 +28,6 @@ public class ItemIDFixer implements IFixableData // Initialize the item mappings ITEM_NAME_MAPPINGS.put(new ResourceLocation(Natura.modID, "empty_bowls"), new ResourceLocation("minecraft", "bowl")); ITEM_NAME_MAPPINGS.put(new ResourceLocation(Natura.modID, "soups"), new ResourceLocation("minecraft", "mushroom_stew")); - ITEM_NAME_MAPPINGS.put(new ResourceLocation(Natura.modID, "sticks"), new ResourceLocation("minecraft", "stick")); } /** diff --git a/src/main/java/com/progwml6/natura/oredict/NaturaOredict.java b/src/main/java/com/progwml6/natura/oredict/NaturaOredict.java index b9178041..88d1de06 100644 --- a/src/main/java/com/progwml6/natura/oredict/NaturaOredict.java +++ b/src/main/java/com/progwml6/natura/oredict/NaturaOredict.java @@ -58,6 +58,8 @@ private static void registerCommons() { oredict(NaturaCommons.sulfurPowder, "dustSulphur"); oredict(NaturaCommons.sulfurPowder, "dustSulfur"); + + oredict(NaturaCommons.sticks, "stickWood"); } private static void registerOverworld() { diff --git a/src/main/java/com/progwml6/natura/shared/CommonsClientProxy.java b/src/main/java/com/progwml6/natura/shared/CommonsClientProxy.java index 28e86115..451d748a 100644 --- a/src/main/java/com/progwml6/natura/shared/CommonsClientProxy.java +++ b/src/main/java/com/progwml6/natura/shared/CommonsClientProxy.java @@ -1,15 +1,11 @@ package com.progwml6.natura.shared; +import com.progwml6.natura.common.ClientProxy; +import com.progwml6.natura.common.config.Config; + import static com.progwml6.natura.common.ModelRegisterUtil.registerItemBlockMeta; import static com.progwml6.natura.common.ModelRegisterUtil.registerItemModel; -import static com.progwml6.natura.shared.NaturaCommons.berryMedley; -import static com.progwml6.natura.shared.NaturaCommons.boneMealBag; -import static com.progwml6.natura.shared.NaturaCommons.clouds; -import static com.progwml6.natura.shared.NaturaCommons.edibles; -import static com.progwml6.natura.shared.NaturaCommons.glowshroom_stew; -import static com.progwml6.natura.shared.NaturaCommons.materials; -import static com.progwml6.natura.shared.NaturaCommons.seed_bags; -import com.progwml6.natura.common.ClientProxy; +import static com.progwml6.natura.shared.NaturaCommons.*; public class CommonsClientProxy extends ClientProxy { @@ -28,6 +24,11 @@ protected void registerModels() edibles.registerItemModels(); seed_bags.registerItemModels(); + if (Config.enableStickVariants) + { + sticks.registerItemModels(); + } + registerItemModel(berryMedley); registerItemModel(boneMealBag); registerItemModel(glowshroom_stew); diff --git a/src/main/java/com/progwml6/natura/shared/NaturaCommons.java b/src/main/java/com/progwml6/natura/shared/NaturaCommons.java index ab2af041..317f271e 100644 --- a/src/main/java/com/progwml6/natura/shared/NaturaCommons.java +++ b/src/main/java/com/progwml6/natura/shared/NaturaCommons.java @@ -1,18 +1,7 @@ package com.progwml6.natura.shared; -import org.apache.logging.log4j.Logger; - import com.google.common.eventbus.Subscribe; -import com.progwml6.natura.Natura; -import com.progwml6.natura.common.CommonProxy; -import com.progwml6.natura.common.NaturaPulse; -import com.progwml6.natura.library.Util; -import com.progwml6.natura.shared.block.clouds.BlockCloud; -import com.progwml6.natura.shared.item.bags.ItemBoneBag; -import com.progwml6.natura.shared.item.bags.ItemSeedBag; -import com.progwml6.natura.shared.item.food.ItemNaturaEdible; -import com.progwml6.natura.shared.item.food.ItemNaturaEdibleSoup; - +import org.apache.logging.log4j.Logger; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.BlockNetherWart; @@ -29,6 +18,17 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; + +import com.progwml6.natura.Natura; +import com.progwml6.natura.common.CommonProxy; +import com.progwml6.natura.common.NaturaPulse; +import com.progwml6.natura.common.config.Config; +import com.progwml6.natura.library.Util; +import com.progwml6.natura.shared.block.clouds.BlockCloud; +import com.progwml6.natura.shared.item.bags.ItemBoneBag; +import com.progwml6.natura.shared.item.bags.ItemSeedBag; +import com.progwml6.natura.shared.item.food.ItemNaturaEdible; +import com.progwml6.natura.shared.item.food.ItemNaturaEdibleSoup; import slimeknights.mantle.item.ItemMetaDynamic; import slimeknights.mantle.pulsar.pulse.Pulse; @@ -54,6 +54,7 @@ public class NaturaCommons extends NaturaPulse public static ItemNaturaEdible edibles; public static ItemSeedBag seed_bags; public static ItemBoneBag boneMealBag; + public static ItemMetaDynamic sticks; // Material Itemstacks public static ItemStack barley; @@ -96,7 +97,21 @@ public class NaturaCommons extends NaturaPulse public static ItemStack carrots_seed_bag; public static ItemStack potatoes_seed_bag; public static ItemStack nether_wart_seed_bag; - + + //Wood Sticks + public static ItemStack maple_stick; + public static ItemStack silverbell_stick; + public static ItemStack amaranth_stick; + public static ItemStack tiger_stick; + public static ItemStack willow_stick; + public static ItemStack eucalyptus_stick; + public static ItemStack hopseed_stick; + public static ItemStack sakura_stick; + public static ItemStack redwood_stick; + public static ItemStack ghostwood_stick; + public static ItemStack darkwood_stick; + public static ItemStack fusewood_stick; + public static ItemStack bloodwood_stick; //@formatter:on @SubscribeEvent @@ -132,6 +147,12 @@ public void registerItems(Register event) ghostwoodFletching = materials.addMeta(5, "ghostwood_fletching"); blueDye = materials.addMeta(8, "blue_dye"); + if (Config.enableStickVariants) + { + sticks = registerItem(registry, new ItemMetaDynamic(), "sticks"); + sticks.setCreativeTab(Natura.TAB); + } + if (isEntitiesLoaded()) { impLeather = materials.addMeta(6, "imp_leather"); @@ -170,6 +191,27 @@ public void registerItems(Register event) nether_wart_seed_bag = seed_bags.addMeta(3, "nether_wart_seed_bag", Blocks.NETHER_WART.getDefaultState().withProperty(BlockNetherWart.AGE, Integer.valueOf(0))); boneMealBag = registerItem(registry, new ItemBoneBag(), "bonemeal_bag"); + + if (isOverworldLoaded() && Config.enableStickVariants) + { + maple_stick = sticks.addMeta(0, "maple_stick"); + silverbell_stick = sticks.addMeta(1, "silverbell_stick"); + amaranth_stick = sticks.addMeta(2, "amaranth_stick"); + tiger_stick = sticks.addMeta(3, "tiger_stick"); + willow_stick = sticks.addMeta(4, "willow_stick"); + eucalyptus_stick = sticks.addMeta(5, "eucalyptus_stick"); + hopseed_stick = sticks.addMeta(6, "hopseed_stick"); + sakura_stick = sticks.addMeta(7, "sakura_stick"); + redwood_stick = sticks.addMeta(8, "redwood_stick"); + } + + if (isNetherLoaded() && Config.enableStickVariants) + { + ghostwood_stick = sticks.addMeta(9, "ghostwood_stick"); + darkwood_stick = sticks.addMeta(10, "darkwood_stick"); + fusewood_stick = sticks.addMeta(11, "fusewood_stick"); + bloodwood_stick = sticks.addMeta(12, "bloodwood_stick"); + } } @SubscribeEvent diff --git a/src/main/resources/assets/natura/blockstates/sticks.json b/src/main/resources/assets/natura/blockstates/sticks.json new file mode 100644 index 00000000..39270d49 --- /dev/null +++ b/src/main/resources/assets/natura/blockstates/sticks.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-item", + "model": "forge:item-layer" + }, + "variants": { + "maple_stick": [{ "textures": { "layer0": "natura:items/sticks/maple_stick" }}], + "silverbell_stick": [{ "textures": { "layer0": "natura:items/sticks/silverbell_stick" }}], + "amaranth_stick": [{ "textures": { "layer0": "natura:items/sticks/amaranth_stick" }}], + "tiger_stick": [{ "textures": { "layer0": "natura:items/sticks/tiger_stick" }}], + "willow_stick": [{ "textures": { "layer0": "natura:items/sticks/willow_stick" }}], + "eucalyptus_stick": [{ "textures": { "layer0": "natura:items/sticks/eucalyptus_stick" }}], + "hopseed_stick": [{ "textures": { "layer0": "natura:items/sticks/hopseed_stick" }}], + "sakura_stick": [{ "textures": { "layer0": "natura:items/sticks/sakura_stick" }}], + "redwood_stick": [{ "textures": { "layer0": "natura:items/sticks/redwood_stick" }}], + "ghostwood_stick": [{ "textures": { "layer0": "natura:items/sticks/ghostwood_stick" }}], + "darkwood_stick": [{ "textures": { "layer0": "natura:items/sticks/darkwood_stick" }}], + "fusewood_stick": [{ "textures": { "layer0": "natura:items/sticks/fusewood_stick" }}], + "bloodwood_stick": [{ "textures": { "layer0": "natura:items/sticks/bloodwood_stick" }}] + } +} diff --git a/src/main/resources/assets/natura/recipes/nether/sticks/bloodwood_sticks.json b/src/main/resources/assets/natura/recipes/nether/sticks/bloodwood_sticks.json new file mode 100644 index 00000000..776cdba7 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/nether/sticks/bloodwood_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaNether" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:nether_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:nether_planks", + "data": 1 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 12 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/nether/sticks/darkwood_sticks.json b/src/main/resources/assets/natura/recipes/nether/sticks/darkwood_sticks.json new file mode 100644 index 00000000..4b0f103f --- /dev/null +++ b/src/main/resources/assets/natura/recipes/nether/sticks/darkwood_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaNether" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:nether_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:nether_planks", + "data": 2 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 10 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/nether/sticks/fusewood_sticks.json b/src/main/resources/assets/natura/recipes/nether/sticks/fusewood_sticks.json new file mode 100644 index 00000000..55dd3293 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/nether/sticks/fusewood_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaNether" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:nether_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:nether_planks", + "data": 3 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 11 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/nether/sticks/ghostwood_sticks.json b/src/main/resources/assets/natura/recipes/nether/sticks/ghostwood_sticks.json new file mode 100644 index 00000000..3861cf07 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/nether/sticks/ghostwood_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaNether" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:nether_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:nether_planks", + "data": 0 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/amaranth_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/amaranth_sticks.json new file mode 100644 index 00000000..afca453d --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/amaranth_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 2 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/eucalyptus_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/eucalyptus_sticks.json new file mode 100644 index 00000000..d82cdb29 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/eucalyptus_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 5 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/hopseed_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/hopseed_sticks.json new file mode 100644 index 00000000..080495c2 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/hopseed_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 6 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/maple_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/maple_sticks.json new file mode 100644 index 00000000..a98da7b7 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/maple_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 0 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/redwood_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/redwood_sticks.json new file mode 100644 index 00000000..c182b51b --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/redwood_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 8 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 8 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/sakura_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/sakura_sticks.json new file mode 100644 index 00000000..5a41f165 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/sakura_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 7 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 7 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/silverbell_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/silverbell_sticks.json new file mode 100644 index 00000000..f3c432e1 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/silverbell_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 1 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/tiger_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/tiger_sticks.json new file mode 100644 index 00000000..826ead44 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/tiger_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 3 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/recipes/overworld/sticks/willow_sticks.json b/src/main/resources/assets/natura/recipes/overworld/sticks/willow_sticks.json new file mode 100644 index 00000000..b65b8e13 --- /dev/null +++ b/src/main/resources/assets/natura/recipes/overworld/sticks/willow_sticks.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "natura:is_pulse_loaded", + "pulse_name": "NaturaOverworld" + } + ], + "type": "minecraft:crafting_shaped", + "group": "natura:overworld_sticks", + "pattern": [ + "A ", + " A" + ], + "key": { + "A": { + "item": "natura:overworld_planks", + "data": 4 + } + }, + "result": { + "item": "natura:sticks", + "count": 4, + "data": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/natura/textures/items/sticks/amaranth_stick.png b/src/main/resources/assets/natura/textures/items/sticks/amaranth_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..9432a8f954d1f4755c40d342d7d2a9918d4055cf GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr_~T6C@@bh`aT5|Fi`k z>o=LE-+DGVo#E&#<}HWabLAM#Ca;xbagaKB&4-hL!DNlCe#&{j-$2a_p00i_>zopr E05gsu;s5{u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/natura/textures/items/sticks/bloodwood_stick.png b/src/main/resources/assets/natura/textures/items/sticks/bloodwood_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..6b2890f3461f3278df98b3d5f93f0e6c1eb969d9 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr_~T6C@@n_(wgkx3~Xa zzsdCd<>`v&8M;jU14X5`R)q22dR_Sd^i~xW^Q!&FYcym0@Tdl>FVdQ&MBb@ E0M{iSvj6}9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/natura/textures/items/sticks/ghostwood_stick.png b/src/main/resources/assets/natura/textures/items/sticks/ghostwood_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..322bd3dfc1a2f6f19ee1f06a63bad9d0de56cdbb GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr_~T6C@@nC@4JG-_~}l zev|2Z`}%n{%o^8hs=vJnobBFlHYJ;lae~_>(_kis&;q~L|CsB40W~vty85}Sb4q9e E0Mz3l8vpmdKI;Vst E09$4xLI3~& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/natura/textures/items/sticks/maple_stick.png b/src/main/resources/assets/natura/textures/items/sticks/maple_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..356a3047b9581865d0a94c1b1717d3570d6d2c6d GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr_~T6C@@jq-}fh-zxv& z|CDSy)5A?R%o^ABEQ`y&@=P$n_~tA}h9who&Q4)qVC?XFwjpH40-$CFPgg&ebxsLQ E05ZEHCjbBd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/natura/textures/items/sticks/redwood_stick.png b/src/main/resources/assets/natura/textures/items/sticks/redwood_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..3a88d4bec8b3f4e14ec4ab5ab89e13764345dcb5 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr_~T6C@@jxX-%#zjLD4 z|C85hs$JzP*#g%5tO@_L;;iz4v`wbX3?9liXK6Ar+)aqeztf$)38FVdQ&MBb@ E01f9M6951J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/natura/textures/items/sticks/silverbell_stick.png b/src/main/resources/assets/natura/textures/items/sticks/silverbell_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..b7daf18590183d6f1ecbfdc038b8d511f702302d GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`MxHK?Ar_~T6C@@j{F}7we`KWL z|C87L{5s70iDyB?=eNgiyXVR=noV9S$>Jb&@|q7P1B1kd^gB!xh=`|<1J#m?K3TH!ddTKe@=ckzRAe8sWNV* zVCA{C)@{8j4S$|9yLwH<|MMD~zW=w3COuIN3`m$bcb_IBgZgi$-sGat-9Q@|JYD@< J);T3K0RS_xKAQjl literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/natura/textures/items/sticks/willow_stick.png b/src/main/resources/assets/natura/textures/items/sticks/willow_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..96e8093b5544c706efac049a528a7a50d86604ff GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr_~T6C@@bxZwPF|E`s9 z>NlCXPx(19o#E)L*vD(#bLAM#Ca;xbagaKB&4-hL!79Se?VViM3!r8OPgg&ebxsLQ E04x3>i2wiq literal 0 HcmV?d00001