diff --git a/Crafting/data/ruaserver/advancements/recipes/custom.json b/Crafting/data/ruaserver/advancements/recipes/custom.json deleted file mode 100644 index ec3432f..0000000 --- a/Crafting/data/ruaserver/advancements/recipes/custom.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "parent": "ruaserver:root", - "rewards": { - "recipes": [ - "ruaserver:custom/elytra", - "ruaserver:custom/diamond_horse_armor", - "ruaserver:custom/enchanted_golden_apple", - "ruaserver:custom/golden_horse_armor", - "ruaserver:custom/iron_horse_armor", - "ruaserver:custom/saddle", - "ruaserver:custom/shulker_shell" - ] - }, - "criteria": { - "has_planks": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:planks" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": [ - "ruaserver:custom/elytra", - "ruaserver:custom/diamond_horse_armor", - "ruaserver:custom/enchanted_golden_apple", - "ruaserver:custom/golden_horse_armor", - "ruaserver:custom/iron_horse_armor", - "ruaserver:custom/saddle", - "ruaserver:custom/shulker_shell" - ] - } - } - }, - "requirements": [ - [ - "has_planks", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/Crafting/data/ruaserver/advancements/recipes/fast_crafting.json b/Crafting/data/ruaserver/advancements/recipes/fast_crafting.json deleted file mode 100644 index 0686d97..0000000 --- a/Crafting/data/ruaserver/advancements/recipes/fast_crafting.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent": "ruaserver:root", - "rewards": { - "recipes": [ - "ruaserver:fast_crafting/bone_block", - "ruaserver:fast_crafting/box", - "ruaserver:fast_crafting/chest_minecart_1", - "ruaserver:fast_crafting/chest_minecart_2", - "ruaserver:fast_crafting/furnace_minecart", - "ruaserver:fast_crafting/hopper", - "ruaserver:fast_crafting/hopper_minecart", - "ruaserver:fast_crafting/tnt_minecart", - "ruaserver:fast_crafting/." - ] - }, - "criteria": { - "has_planks": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:planks" - } - ] - } - }, - "has_the_recipes": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": [ - "ruaserver:fast_crafting/bone_block", - "ruaserver:fast_crafting/box", - "ruaserver:fast_crafting/chest_minecart_1", - "ruaserver:fast_crafting/chest_minecart_2", - "ruaserver:fast_crafting/furnace_minecart", - "ruaserver:fast_crafting/hopper", - "ruaserver:fast_crafting/hopper_minecart", - "ruaserver:fast_crafting/tnt_minecart", - "ruaserver:fast_crafting/." - ] - } - } - }, - "requirements": [ - [ - "has_planks", - "has_the_recipes" - ] - ] -} \ No newline at end of file diff --git a/README.md b/README.md index 7b17f40..1249b4c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,44 @@ -# Datapack -Datapack for RUA server +# RUA 服务器用数据包 Minecraft Datapack for RUA Server +## 自定义合成 Custom Recipes +### 1. 钻石/铁/金马铠 Diamond/Iron/Golden Horse Armor +![dhorsearmor](images/DiamondHorseArmor.png) +![ihorsearmor](images/IronHorseArmor.png) +![ghorsearmor](images/GoldHorseArmor.png) +### 2. 鞘翅 Elytra +![elytra](images/Elytra.png) +### 3. 附魔金苹果 Enchanted Golden Apple +![EGA](images/EnchantedGoldenApple.png) +### 4. 鞍 Saddle +![saddle](images/Saddle.png) +### 5. 潜影壳 Shulker Shell +![shulkershell](images/ShulkerShell.png) +### 6. +蛛网、线互相合成 Cobweb & String +![string](images/String.png) +![web](images/Web.png) +### 7. +潮涌之心 Heart of the sea +![HotS](images/HeartOfTheSea.png) +### 8. +石英块 Quartz Block +![quartz](images/QuartzBlocks.png) +### 9. +三叉戟 Trident +![trident](images/Trident.png) + +### 10. +弓箭 Arrow +![arrow](images/Arrow.png) +![arrow](images/ArrowByThree.png) + +## 快速合成 Fast Crafting +### 1. 骨头 -> 骨块 Bone -> Bone Block (无序 Unshaped) +![boneBlock](images/BoneBlock.png) +### 2. 各式原木 -> 箱子 All Logs -> Chest (无序 Unshaped) +![chest](images/Box.png) +### 3. 各式矿车 All kinds Minecarts +![tminecart](images/TNTMinecart.png) +![hminecart](images/HopperMinecart.png) +![cminecart1](images/ChestMinecart1.png) +![cminecart2](images/ChestMinecart2.png) +### 4. 原木 + 铁 -> 漏斗 Logs + iron -> Hopper +![hopper](images/Hopper.png) + +## 自定义掉落 Custom Loot +### 1. 守卫者可以掉落海绵 Guardian drops Sponge diff --git a/data/minecraft/loot_tables/entities/guardian.json b/data/minecraft/loot_tables/entities/guardian.json new file mode 100644 index 0000000..c48012a --- /dev/null +++ b/data/minecraft/loot_tables/entities/guardian.json @@ -0,0 +1,114 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0.0, + "max": 2.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:looting_enchant", + "count": { + "min": 0.0, + "max": 1.0 + } + } + ], + "name": "minecraft:prismarine_shard" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "weight": 3, + "functions": [ + { + "function": "minecraft:looting_enchant", + "count": { + "min": 0.0, + "max": 1.0 + } + }, + { + "function": "minecraft:furnace_smelt", + "conditions": [ + { + "condition": "minecraft:entity_properties", + "predicate": { + "flags": { + "is_on_fire": true + } + }, + "entity": "this" + } + ] + } + ], + "name": "minecraft:cod" + }, + { + "type": "minecraft:item", + "weight": 2, + "functions": [ + { + "function": "minecraft:looting_enchant", + "count": { + "min": 0.0, + "max": 1.0 + } + } + ], + "name": "minecraft:prismarine_crystals" + }, + { + "type": "minecraft:empty" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:wet_sponge" + } + ], + "conditions": [ + { + "condition": "minecraft:killed_by_player" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:loot_table", + "name": "minecraft:gameplay/fishing/fish" + } + ], + "conditions": [ + { + "condition": "minecraft:killed_by_player" + }, + { + "condition": "minecraft:random_chance_with_looting", + "chance": 0.025, + "looting_multiplier": 0.01 + } + ] + } + ] + } \ No newline at end of file diff --git a/data/minecraft/tags/functions/load.json b/data/minecraft/tags/functions/load.json new file mode 100644 index 0000000..207d9bb --- /dev/null +++ b/data/minecraft/tags/functions/load.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ruaserver:announce/install" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/functions/tick.json new file mode 100644 index 0000000..387abd4 --- /dev/null +++ b/data/minecraft/tags/functions/tick.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ruaserver:announce/main" + ] +} \ No newline at end of file diff --git a/Crafting/data/ruaserver/advancements/root.json b/data/ruaserver/advancements/root.json similarity index 100% rename from Crafting/data/ruaserver/advancements/root.json rename to data/ruaserver/advancements/root.json diff --git a/data/ruaserver/functions/announce/install.mcfunction b/data/ruaserver/functions/announce/install.mcfunction new file mode 100644 index 0000000..7ad5250 --- /dev/null +++ b/data/ruaserver/functions/announce/install.mcfunction @@ -0,0 +1,3 @@ +# 创建两个计分板检测退出次数和在线时间 +scoreboard objectives add logout minecraft.custom:leave_game +scoreboard objectives add Online minecraft.custom:play_one_minute \ No newline at end of file diff --git a/data/ruaserver/functions/announce/main.mcfunction b/data/ruaserver/functions/announce/main.mcfunction new file mode 100644 index 0000000..dde9341 --- /dev/null +++ b/data/ruaserver/functions/announce/main.mcfunction @@ -0,0 +1,9 @@ +# 在线时间为 100 后显示通知 +execute as @a[scores={Online=100}] at @s run tellraw @s [{"text":"欢迎来到RUA服务器，这使你充满了决心","color":"gold","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"open_url","value":"https://ruabbs.com"},"hoverEvent":{"action":"show_text","value":"点击此处打开 RUA 论坛"}}] +# 设置在线时间为 200 避免多次显示 +execute as @a[scores={Online=100}] at @s run scoreboard players set @s Online 200 + +# 在线时间为 100 或更大，并且退出过一次或更多次服务器，则显示通知 +execute as @a[scores={Online=100.., Logout=1..}] at @s run tellraw @s [{"text":"欢迎来到RUA服务器，这使你充满了决心","color":"gold","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"open_url","value":"https://ruabbs.com"},"hoverEvent":{"action":"show_text","value":"点击此处打开 RUA 论坛"}}] +# 重置退出次数为 0，所以为什么要设置退出一次或更多啊233 +execute as @a[scores={Online=100.., Logout=1..}] at @s run scoreboard players set @s Logout 0 \ No newline at end of file diff --git a/data/ruaserver/functions/announce/uninstall.mcfunction b/data/ruaserver/functions/announce/uninstall.mcfunction new file mode 100644 index 0000000..33371c5 --- /dev/null +++ b/data/ruaserver/functions/announce/uninstall.mcfunction @@ -0,0 +1,3 @@ +# 删除 Logout 和 online 两个计分板 +scoreboard objectives remove Logout +scoreboard objectives remove Online \ No newline at end of file diff --git a/data/ruaserver/functions/scoreboard/install.mcfunction b/data/ruaserver/functions/scoreboard/install.mcfunction new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/data/ruaserver/functions/scoreboard/install.mcfunction @@ -0,0 +1 @@ + diff --git a/data/ruaserver/functions/scoreboard/main.mcfunction b/data/ruaserver/functions/scoreboard/main.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/ruaserver/functions/scoreboard/uninstall.mcfunction b/data/ruaserver/functions/scoreboard/uninstall.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/ruaserver/recipes/custom/arrow.json b/data/ruaserver/recipes/custom/arrow.json new file mode 100644 index 0000000..d22c250 --- /dev/null +++ b/data/ruaserver/recipes/custom/arrow.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " i ", + " s ", + " f " + ], + "key": { + "f": { + "item": "minecraft:feather" + }, + "i": { + "item": "minecraft:iron_ingot" + }, + "s": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:arrow", + "count": 3 + }, + "group": "arrow" +} \ No newline at end of file diff --git a/data/ruaserver/recipes/custom/arrow_by_three.json b/data/ruaserver/recipes/custom/arrow_by_three.json new file mode 100644 index 0000000..4c29fe8 --- /dev/null +++ b/data/ruaserver/recipes/custom/arrow_by_three.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "iii", + "sss", + "fff" + ], + "key": { + "f": { + "item": "minecraft:feather" + }, + "i": { + "item": "minecraft:iron_ingot" + }, + "s": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:arrow", + "count": 9 + }, + "group": "arrow" +} \ No newline at end of file diff --git a/Crafting/data/ruaserver/recipes/custom/diamond_horse_armor.json b/data/ruaserver/recipes/custom/diamond_horse_armor.json similarity index 100% rename from Crafting/data/ruaserver/recipes/custom/diamond_horse_armor.json rename to data/ruaserver/recipes/custom/diamond_horse_armor.json diff --git a/Crafting/data/ruaserver/recipes/custom/elytra.json b/data/ruaserver/recipes/custom/elytra.json similarity index 100% rename from Crafting/data/ruaserver/recipes/custom/elytra.json rename to data/ruaserver/recipes/custom/elytra.json diff --git a/Crafting/data/ruaserver/recipes/custom/enchanted_golden_apple.json b/data/ruaserver/recipes/custom/enchanted_golden_apple.json similarity index 100% rename from Crafting/data/ruaserver/recipes/custom/enchanted_golden_apple.json rename to data/ruaserver/recipes/custom/enchanted_golden_apple.json diff --git a/Crafting/data/ruaserver/recipes/custom/golden_horse_armor.json b/data/ruaserver/recipes/custom/golden_horse_armor.json similarity index 100% rename from Crafting/data/ruaserver/recipes/custom/golden_horse_armor.json rename to data/ruaserver/recipes/custom/golden_horse_armor.json diff --git a/data/ruaserver/recipes/custom/heart_of_the_sea.json b/data/ruaserver/recipes/custom/heart_of_the_sea.json new file mode 100644 index 0000000..b24fb63 --- /dev/null +++ b/data/ruaserver/recipes/custom/heart_of_the_sea.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DdD", + "dbd", + "DdD" + ], + "key": { + "D": { + "item": "minecraft:diamond" + }, + "b": { + "item": "minecraft:beacon" + }, + "d": { + "item": "minecraft:diamond_block" + } + }, + "result": { + "item": "minecraft:heart_of_the_sea", + "count": 1 + } +} \ No newline at end of file diff --git a/Crafting/data/ruaserver/recipes/custom/iron_horse_armor.json b/data/ruaserver/recipes/custom/iron_horse_armor.json similarity index 100% rename from Crafting/data/ruaserver/recipes/custom/iron_horse_armor.json rename to data/ruaserver/recipes/custom/iron_horse_armor.json diff --git a/data/ruaserver/recipes/custom/quartz_blocks.json b/data/ruaserver/recipes/custom/quartz_blocks.json new file mode 100644 index 0000000..2b7d362 --- /dev/null +++ b/data/ruaserver/recipes/custom/quartz_blocks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "bbb", + "bgb", + "bbb" + ], + "key": { + "b": { + "item": "minecraft:bone_block" + }, + "g": { + "item": "minecraft:glass" + } + }, + "result": { + "item": "minecraft:quartz_block", + "count": 8 + } +} \ No newline at end of file diff --git a/Crafting/data/ruaserver/recipes/custom/saddle.json b/data/ruaserver/recipes/custom/saddle.json similarity index 91% rename from Crafting/data/ruaserver/recipes/custom/saddle.json rename to data/ruaserver/recipes/custom/saddle.json index 91d0fa6..09f78d8 100644 --- a/Crafting/data/ruaserver/recipes/custom/saddle.json +++ b/data/ruaserver/recipes/custom/saddle.json @@ -16,6 +16,5 @@ "result": { "item": "minecraft:saddle", "count": 1 - }, - "group": "ruaserver" + } } diff --git a/Crafting/data/ruaserver/recipes/custom/shulker_shell.json b/data/ruaserver/recipes/custom/shulker_shell.json similarity index 100% rename from Crafting/data/ruaserver/recipes/custom/shulker_shell.json rename to data/ruaserver/recipes/custom/shulker_shell.json diff --git a/data/ruaserver/recipes/custom/string.json b/data/ruaserver/recipes/custom/string.json new file mode 100644 index 0000000..406a8af --- /dev/null +++ b/data/ruaserver/recipes/custom/string.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:cobweb" + } + ], + "result": { + "item": "minecraft:string", + "count": 9 + } +} \ No newline at end of file diff --git a/data/ruaserver/recipes/custom/trident.json b/data/ruaserver/recipes/custom/trident.json new file mode 100644 index 0000000..64449ee --- /dev/null +++ b/data/ruaserver/recipes/custom/trident.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "iii", + "sbs", + " b " + ], + "key": { + "b": { + "item": "minecraft:bamboo" + }, + "i": { + "item": "minecraft:iron_sword" + }, + "s": { + "item": "minecraft:string" + } + }, + "result": { + "item": "minecraft:trident", + "count": 1 + } +} \ No newline at end of file diff --git a/data/ruaserver/recipes/custom/web.json b/data/ruaserver/recipes/custom/web.json new file mode 100644 index 0000000..091f925 --- /dev/null +++ b/data/ruaserver/recipes/custom/web.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sss", + "sss", + "sss" + ], + "key": { + "s": { + "item": "minecraft:string" + } + }, + "result": { + "item": "minecraft:cobweb", + "count": 1 + } +} \ No newline at end of file diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/bone_block.json b/data/ruaserver/recipes/fast_crafting/bone_block.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/bone_block.json rename to data/ruaserver/recipes/fast_crafting/bone_block.json diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/box.json b/data/ruaserver/recipes/fast_crafting/box.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/box.json rename to data/ruaserver/recipes/fast_crafting/box.json diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/chest_minecart_1.json b/data/ruaserver/recipes/fast_crafting/chest_minecart_1.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/chest_minecart_1.json rename to data/ruaserver/recipes/fast_crafting/chest_minecart_1.json diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/chest_minecart_2.json b/data/ruaserver/recipes/fast_crafting/chest_minecart_2.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/chest_minecart_2.json rename to data/ruaserver/recipes/fast_crafting/chest_minecart_2.json diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/furnace_minecart.json b/data/ruaserver/recipes/fast_crafting/furnace_minecart.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/furnace_minecart.json rename to data/ruaserver/recipes/fast_crafting/furnace_minecart.json diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/hopper.json b/data/ruaserver/recipes/fast_crafting/hopper.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/hopper.json rename to data/ruaserver/recipes/fast_crafting/hopper.json diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/hopper_minecart.json b/data/ruaserver/recipes/fast_crafting/hopper_minecart.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/hopper_minecart.json rename to data/ruaserver/recipes/fast_crafting/hopper_minecart.json diff --git a/Crafting/data/ruaserver/recipes/fast_crafting/tnt_minecart.json b/data/ruaserver/recipes/fast_crafting/tnt_minecart.json similarity index 100% rename from Crafting/data/ruaserver/recipes/fast_crafting/tnt_minecart.json rename to data/ruaserver/recipes/fast_crafting/tnt_minecart.json diff --git a/images/Arrow.png b/images/Arrow.png new file mode 100644 index 0000000..8c42d9f Binary files /dev/null and b/images/Arrow.png differ diff --git a/images/ArrowByThree.png b/images/ArrowByThree.png new file mode 100644 index 0000000..8e786b3 Binary files /dev/null and b/images/ArrowByThree.png differ diff --git a/images/BoneBlock.png b/images/BoneBlock.png new file mode 100644 index 0000000..5dc537f Binary files /dev/null and b/images/BoneBlock.png differ diff --git a/images/Box.png b/images/Box.png new file mode 100644 index 0000000..f13016d Binary files /dev/null and b/images/Box.png differ diff --git a/images/ChestMinecart1.png b/images/ChestMinecart1.png new file mode 100644 index 0000000..9ed16f8 Binary files /dev/null and b/images/ChestMinecart1.png differ diff --git a/images/ChestMinecart2.png b/images/ChestMinecart2.png new file mode 100644 index 0000000..e223fdb Binary files /dev/null and b/images/ChestMinecart2.png differ diff --git a/images/DiamondHorseArmor.png b/images/DiamondHorseArmor.png new file mode 100644 index 0000000..d7f356a Binary files /dev/null and b/images/DiamondHorseArmor.png differ diff --git a/images/Elytra.png b/images/Elytra.png new file mode 100644 index 0000000..bdf98d2 Binary files /dev/null and b/images/Elytra.png differ diff --git a/images/EnchantedGoldenApple.png b/images/EnchantedGoldenApple.png new file mode 100644 index 0000000..07cb032 Binary files /dev/null and b/images/EnchantedGoldenApple.png differ diff --git a/images/FurnaceMinecart.png b/images/FurnaceMinecart.png new file mode 100644 index 0000000..0f8afad Binary files /dev/null and b/images/FurnaceMinecart.png differ diff --git a/images/GoldHorseArmor.png b/images/GoldHorseArmor.png new file mode 100644 index 0000000..e257df0 Binary files /dev/null and b/images/GoldHorseArmor.png differ diff --git a/images/HeartOfTheSea.png b/images/HeartOfTheSea.png new file mode 100644 index 0000000..208530c Binary files /dev/null and b/images/HeartOfTheSea.png differ diff --git a/images/Hopper.png b/images/Hopper.png new file mode 100644 index 0000000..5c0ebae Binary files /dev/null and b/images/Hopper.png differ diff --git a/images/HopperMinecart.png b/images/HopperMinecart.png new file mode 100644 index 0000000..5be66ca Binary files /dev/null and b/images/HopperMinecart.png differ diff --git a/images/IronHorseArmor.png b/images/IronHorseArmor.png new file mode 100644 index 0000000..95f519e Binary files /dev/null and b/images/IronHorseArmor.png differ diff --git a/images/QuartzBlocks.png b/images/QuartzBlocks.png new file mode 100644 index 0000000..f634b56 Binary files /dev/null and b/images/QuartzBlocks.png differ diff --git a/images/Saddle.png b/images/Saddle.png new file mode 100644 index 0000000..4411456 Binary files /dev/null and b/images/Saddle.png differ diff --git a/images/ShulkerShell.png b/images/ShulkerShell.png new file mode 100644 index 0000000..8cd6a18 Binary files /dev/null and b/images/ShulkerShell.png differ diff --git a/images/String.png b/images/String.png new file mode 100644 index 0000000..bd95471 Binary files /dev/null and b/images/String.png differ diff --git a/images/TNTMinecart.png b/images/TNTMinecart.png new file mode 100644 index 0000000..823a5f0 Binary files /dev/null and b/images/TNTMinecart.png differ diff --git a/images/Trident.png b/images/Trident.png new file mode 100644 index 0000000..3d0e417 Binary files /dev/null and b/images/Trident.png differ diff --git a/images/Web.png b/images/Web.png new file mode 100644 index 0000000..0049c17 Binary files /dev/null and b/images/Web.png differ diff --git a/Crafting/pack.mcmeta b/pack.mcmeta similarity index 100% rename from Crafting/pack.mcmeta rename to pack.mcmeta