From 6c44432c1afbfb6c22eba3f58919480c28da2300 Mon Sep 17 00:00:00 2001 From: PiTheGuy Date: Sat, 11 Jun 2022 14:14:44 -0500 Subject: [PATCH] Added missing recipes and prepared for release --- Mod Changelog.md | 55 +++++++++---------- build.gradle | 2 +- .../recipes/magic_action_blocks.json | 3 +- .../advancements/recipes/magic_fuel.json | 25 +++++++++ .../magicmod/recipes/magic_energizer.json | 28 ++++++++++ .../data/magicmod/recipes/magic_fuel.json | 28 ++++++++++ 6 files changed, 110 insertions(+), 31 deletions(-) create mode 100644 src/main/resources/data/magicmod/advancements/recipes/magic_fuel.json create mode 100644 src/main/resources/data/magicmod/recipes/magic_energizer.json create mode 100644 src/main/resources/data/magicmod/recipes/magic_fuel.json diff --git a/Mod Changelog.md b/Mod Changelog.md index 4b64d30..fde4856 100644 --- a/Mod Changelog.md +++ b/Mod Changelog.md @@ -1,32 +1,29 @@ -## Magic Shelter -- Using this item on a block spawns a mostly obsidian structure around the player to protect them -- The second floor has a chest with loot containing magic powder, crystals, nuggets, cores, and gems, as well as a chance to get one of 2 new enchantments _(see below for more details)_ -- Only places if there's ground directly beneath the player, and there's enough space +## Magic Miner +- Automatically mines blocks +- Requires fuel from a nearby Magic Energizer _(see below)_ +- Can be upgraded with the new upgrades _(see below)_ +- Only mines blocks best mined with a pickaxe or shovel +- Automatically stops when inventory fills up - Crafted as follows: -- ![Magic Shelter Recipe](https://user-images.githubusercontent.com/55959311/166120665-a00db5b7-b3d7-4e55-b10d-91f33d196d9f.png) -## Magic Finder Enchantment -- New treasure enchantment -- Can be applied to tools (pickaxe, axe, and shovel) -- Max level of 3 -- Found in Magic Shelter loot chests -- Grants a 10% chance per level to drop a magic powder when a block is mined (2% on insta-mineable blocks) -- **WARNING: Doesn't work on vanilla tools!** -## Veinminer Enchantment -- New treasure enchantment -- Can be applied to pickaxes -- Max level of 3 -- Found in Magic Shelter loot chests -- Automatically breaks block of the same type in an area around any block broken, similar to the Veinminer mod -- Affected area grows with enchantment level (3x3 for level 1, 5x5 for level 2, etc.) -- Only works if you're using the right tool -- **WARNING: Doesn't work on vanilla tools!** -## Magic Spike -- New spike-shaped block that deals 10x fall damage when fallen on -- Useful for mob farms and traps +![Magic Miner Recipe](https://user-images.githubusercontent.com/55959311/173133628-b3f1781d-6e90-49d6-81e5-3f84761622f0.png) +## Magic Logger +- Works the same as the Magic Miner except mines logs and leaves instead +- Also mines blocks above the logger instead of below - Crafted as follows: -- ![Magic Spike Recipe](https://user-images.githubusercontent.com/55959311/166122283-da78b9cc-5f50-437b-af34-4444bca5d73a.png) +![Magic Logger Recipe](https://user-images.githubusercontent.com/55959311/173133439-5413f25c-c309-4f6d-ae58-f5af78d9ba8c.png) +## Magic Energizer +- Powers Magic Miners and Magic Loggers within 4 blocks +- Requires Magic Fuel _(see below)_ to operate +- Crafted as follows: +![Magic Energizer Recipe](https://user-images.githubusercontent.com/55959311/173197590-180a986c-c4ff-412d-92f5-2ae64016f887.png) +## Magic Fuel +- Used to power Magic Energizers +- Crafted as follows: +![Magic Fuel Recipe](https://user-images.githubusercontent.com/55959311/173133307-903e84f9-265a-42fe-9692-687b7fde4de0.png) +## Magic Gear +- Used to craft Magic Loggers, Miners, and Energizers +- Found in Magic Shelter chests ## Other Changes and Bug Fixes -- Added a close sound for the magic crate -- Magic Pearls now deal a lot less damage -- Reduced cooldown for Magic Pearls -- Fortune now affects magic ore drops \ No newline at end of file +- Updated mod to 1.18 (1.19 coming soon) +- Added Deepslate Magic Ore as a deepslate counterpart to Magic Ore +- Tall grass no longer prevents the Magic Shelter from placing \ No newline at end of file diff --git a/build.gradle b/build.gradle index f00d858..cd5878f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: 'net.minecraftforge.gradle' -version = '2.10-dev' +version = '2.10' group = 'com.pitheguy.magicmod' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'magicmod' diff --git a/src/main/resources/data/magicmod/advancements/recipes/magic_action_blocks.json b/src/main/resources/data/magicmod/advancements/recipes/magic_action_blocks.json index 0f5f817..a03f707 100644 --- a/src/main/resources/data/magicmod/advancements/recipes/magic_action_blocks.json +++ b/src/main/resources/data/magicmod/advancements/recipes/magic_action_blocks.json @@ -3,7 +3,8 @@ "rewards": { "recipes": [ "magicmod:magic_miner", - "magicmod:magic_logger" + "magicmod:magic_logger", + "magicmod:magic_energizer" ] }, "criteria": { diff --git a/src/main/resources/data/magicmod/advancements/recipes/magic_fuel.json b/src/main/resources/data/magicmod/advancements/recipes/magic_fuel.json new file mode 100644 index 0000000..d3fefcc --- /dev/null +++ b/src/main/resources/data/magicmod/advancements/recipes/magic_fuel.json @@ -0,0 +1,25 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "magicmod:magic_fuel" + ] + }, + "criteria": { + "has_magic_nugget": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "magicmod:magic_nugget" + } + ] + } + } + }, + "requirements": [ + [ + "has_magic_nugget" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmod/recipes/magic_energizer.json b/src/main/resources/data/magicmod/recipes/magic_energizer.json new file mode 100644 index 0000000..4688926 --- /dev/null +++ b/src/main/resources/data/magicmod/recipes/magic_energizer.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": + [ + " G ", + "GFG", + " G " + ], + + "key": + { + "G": + { + "item": "magicmod:magic_gear" + }, + "F": + { + "item": "magicmod:magic_fuel" + } + }, + + "result": + { + "item": "magicmod:magic_energizer", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/magicmod/recipes/magic_fuel.json b/src/main/resources/data/magicmod/recipes/magic_fuel.json new file mode 100644 index 0000000..e68eb0d --- /dev/null +++ b/src/main/resources/data/magicmod/recipes/magic_fuel.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": + [ + "NCN", + "C C", + "NCN" + ], + + "key": + { + "N": + { + "item": "magicmod:magic_nugget" + }, + "C": + { + "item": "minecraft:coal" + } + }, + + "result": + { + "item": "magicmod:magic_fuel", + "count": 16 + } +} \ No newline at end of file