From f4f5ee91ade43eeda25acd26c3f09dede407f481 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Wed, 24 Nov 2021 10:57:31 -0600 Subject: [PATCH] first pass at item model gens --- src/generated/resources/.cache/cache | 325 +++++++++++------- .../blockstates/lamp_controller.json | 30 ++ .../models/item/advanced_coil.json | 6 + .../models/item/advanced_leaf_blower.json | 6 + .../models/item/basic_coil.json | 6 + .../models/item/bats_wing.json | 6 + .../models/item/black_quartz.json | 6 + .../models/item/canola_seeds.json | 6 + .../models/item/coffee_beans.json | 6 + .../models/item/coffee_cup.json | 6 + .../models/item/coffee_seeds.json | 6 + .../models/item/crafter_on_a_stick.json | 6 + .../models/item/crystallized_canola_seed.json | 6 + .../models/item/diamatine_aiot.json | 6 + .../models/item/diamatine_crystal.json | 6 + .../models/item/diamatine_crystal_shard.json | 6 + .../models/item/diamond_aiot.json | 6 + .../models/item/double_battery.json | 6 + .../actuallyadditions/models/item/dough.json | 6 + .../models/item/drill_core.json | 6 + .../models/item/emeradic_aiot.json | 6 + .../models/item/emeradic_crystal.json | 6 + .../models/item/emeradic_crystal_shard.json | 6 + .../models/item/empowered_canola_seed.json | 6 + .../item/empowered_diamatine_crystal.json | 6 + .../item/empowered_emeradic_crystal.json | 6 + .../models/item/empowered_enori_crystal.json | 6 + .../models/item/empowered_palis_crystal.json | 6 + .../item/empowered_restonia_crystal.json | 6 + .../models/item/empowered_void_crystal.json | 6 + .../models/item/empty_cup.json | 6 + .../models/item/ender_star.json | 6 + .../models/item/engineers_goggles.json | 6 + .../item/engineers_goggles_advanced.json | 6 + .../models/item/enori_aiot.json | 6 + .../models/item/enori_crystal.json | 6 + .../models/item/enori_crystal_shard.json | 6 + .../models/item/fertilizer.json | 6 + .../actuallyadditions/models/item/filter.json | 6 + .../models/item/flax_seeds.json | 6 + .../models/item/gold_aiot.json | 6 + .../models/item/hairy_ball.json | 6 + .../models/item/handheld_filler.json | 6 + .../models/item/iron_aiot.json | 6 + .../actuallyadditions/models/item/knife.json | 6 + .../models/item/lamp_controller.json | 3 + .../item/laser_upgrade_invisibility.json | 6 + .../models/item/laser_upgrade_range.json | 6 + .../models/item/laser_wrench.json | 6 + .../models/item/leaf_blower.json | 6 + .../actuallyadditions/models/item/lens.json | 6 + .../models/item/lens_of_color.json | 6 + .../models/item/netherite_aiot.json | 6 + .../models/item/palis_aiot.json | 6 + .../models/item/palis_crystal.json | 6 + .../models/item/palis_crystal_shard.json | 6 + .../models/item/paper_cone.json | 6 + .../models/item/phantom_connector.json | 6 + .../models/item/player_probe.json | 6 + .../models/item/quadruple_battery.json | 6 + .../models/item/quartz_aiot.json | 6 + .../models/item/quintuple_battery.json | 6 + .../models/item/resonant_rice.json | 6 + .../models/item/restonia_aiot.json | 6 + .../models/item/restonia_crystal.json | 6 + .../models/item/restonia_crystal_shard.json | 6 + .../models/item/rice_dough.json | 6 + .../models/item/rice_seeds.json | 6 + .../models/item/rice_slimeball.json | 6 + .../actuallyadditions/models/item/ring.json | 6 + .../models/item/ring_of_growth.json | 6 + .../models/item/ring_of_magnetizing.json | 6 + .../models/item/single_battery.json | 6 + .../models/item/solidified_experience.json | 6 + .../models/item/stone_aiot.json | 6 + .../models/item/teleport_staff.json | 6 + .../models/item/tiny_charcoal.json | 6 + .../models/item/tiny_coal.json | 6 + .../models/item/travelers_sack.json | 6 + .../models/item/triple_battery.json | 6 + .../models/item/void_aiot.json | 6 + .../models/item/void_crystal.json | 6 + .../models/item/void_crystal_shard.json | 6 + .../models/item/void_sack.json | 6 + .../models/item/water_bowl.json | 6 + .../models/item/wings_of_the_bats.json | 6 + .../models/item/wooden_aiot.json | 6 + .../actuallyadditions/models/item/worm.json | 6 + ...{coil_advanced.json => advanced_coil.json} | 4 +- .../recipes/{coil.json => basic_coil.json} | 2 +- .../recipes/battery_box.json | 2 +- .../actuallyadditions/recipes/booklet.json | 2 +- .../recipes/diamatine_aiot.json | 23 ++ ...stal_diamatine.json => diamatine_axe.json} | 2 +- ...al_diamatine.json => diamatine_boots.json} | 2 +- ...al_diamatine.json => diamatine_chest.json} | 2 +- ...l_diamatine.json => diamatine_helmet.json} | 2 +- ...stal_diamatine.json => diamatine_hoe.json} | 2 +- ...diamatine.json => diamatine_leggings.json} | 2 +- ..._diamatine.json => diamatine_pickaxe.json} | 2 +- ...l_diamatine.json => diamatine_shovel.json} | 2 +- ...al_diamatine.json => diamatine_sword.json} | 2 +- .../{diamond_paxel.json => diamond_aiot.json} | 2 +- .../recipes/disenchanting_lens.json | 35 -- .../recipes/display_stand.json | 2 +- ...attery_double.json => double_battery.json} | 6 +- .../data/actuallyadditions/recipes/drill.json | 2 +- .../actuallyadditions/recipes/drill_core.json | 2 +- .../recipes/drill_upgrade_block_placing.json | 2 +- .../recipes/drill_upgrade_five_by_five.json | 4 +- .../recipes/drill_upgrade_fortune_ii.json | 2 +- .../recipes/drill_upgrade_silk_touch.json | 2 +- .../recipes/drill_upgrade_speed_iii.json | 4 +- .../recipes/drill_upgrade_three_by_three.json | 2 +- .../recipes/emeradic_aiot.json | 23 ++ ...rystal_emeradic.json => emeradic_axe.json} | 2 +- ...stal_emeradic.json => emeradic_boots.json} | 2 +- ...stal_emeradic.json => emeradic_chest.json} | 2 +- ...tal_emeradic.json => emeradic_helmet.json} | 2 +- ...rystal_emeradic.json => emeradic_hoe.json} | 2 +- ...l_emeradic.json => emeradic_leggings.json} | 2 +- ...al_emeradic.json => emeradic_pickaxe.json} | 2 +- ...tal_emeradic.json => emeradic_shovel.json} | 2 +- ...stal_emeradic.json => emeradic_sword.json} | 2 +- .../actuallyadditions/recipes/empowerer.json | 2 +- .../recipes/empowering/diamatine.json | 2 +- .../recipes/empowering/emeradic.json | 2 +- .../recipes/empowering/empowered_canola.json | 8 +- .../recipes/empowering/enori.json | 2 +- .../recipes/empowering/palis.json | 2 +- .../recipes/empowering/restonia.json | 2 +- .../recipes/empowering/void.json | 2 +- ...er_goggles.json => engineers_goggles.json} | 2 +- ...d.json => engineers_goggles_advanced.json} | 6 +- .../actuallyadditions/recipes/enori_aiot.json | 23 ++ ...{axe_crystal_enori.json => enori_axe.json} | 2 +- ...ts_crystal_enori.json => enori_boots.json} | 2 +- ...st_crystal_enori.json => enori_chest.json} | 2 +- ...m_crystal_enori.json => enori_helmet.json} | 2 +- ...{hoe_crystal_enori.json => enori_hoe.json} | 2 +- ...crystal_enori.json => enori_leggings.json} | 2 +- ..._crystal_enori.json => enori_pickaxe.json} | 2 +- ...l_crystal_enori.json => enori_shovel.json} | 2 +- ...rd_crystal_enori.json => enori_sword.json} | 2 +- .../{gold_paxel.json => gold_aiot.json} | 2 +- ...filling_wand.json => handheld_filler.json} | 8 +- .../{iron_paxel.json => iron_aiot.json} | 2 +- .../recipes/item_viewer.json | 2 +- .../laser/crystallized_canola_seed.json | 2 +- .../recipes/laser/damage_lens.json | 10 - .../actuallyadditions/recipes/laser/lens.json | 2 +- .../recipes/laser/lens_of_certain_death.json | 10 + .../{color_lens.json => lens_of_color.json} | 2 +- ...sion_lens.json => lens_of_detonation.json} | 4 +- .../recipes/laser_relay.json | 2 +- .../recipes/laser_relay_extreme.json | 2 +- .../recipes/laser_relay_item_advanced.json | 2 +- .../recipes/laser_upgrade_invisibility.json | 2 +- .../recipes/laser_upgrade_range.json | 2 +- .../recipes/laser_wrench.json | 2 +- .../recipes/leaf_blower.json | 2 +- .../recipes/lens_of_disenchanting.json | 35 ++ ...mage_lens.json => lens_of_the_killer.json} | 4 +- ...ining_lens.json => lens_of_the_miner.json} | 2 +- ...therite_paxel.json => netherite_aiot.json} | 2 +- .../actuallyadditions/recipes/palis_aiot.json | 23 ++ ...{axe_crystal_palis.json => palis_axe.json} | 2 +- ...ts_crystal_palis.json => palis_boots.json} | 2 +- ...st_crystal_palis.json => palis_chest.json} | 2 +- ...m_crystal_palis.json => palis_helmet.json} | 2 +- ...{hoe_crystal_palis.json => palis_hoe.json} | 2 +- ...crystal_palis.json => palis_leggings.json} | 2 +- ..._crystal_palis.json => palis_pickaxe.json} | 2 +- ...l_crystal_palis.json => palis_shovel.json} | 2 +- ...rd_crystal_palis.json => palis_sword.json} | 2 +- .../recipes/paxel_crystal_diamatine.json | 23 -- .../recipes/paxel_crystal_emeradic.json | 23 -- .../recipes/paxel_crystal_enori.json | 23 -- .../recipes/paxel_crystal_palis.json | 23 -- .../recipes/paxel_crystal_restonia.json | 23 -- .../recipes/paxel_crystal_void.json | 23 -- ..._quadruple.json => quadruple_battery.json} | 8 +- .../{quartz_paxel.json => quartz_aiot.json} | 2 +- ..._quintuple.json => quintuple_battery.json} | 8 +- .../recipes/restonia_aiot.json | 23 ++ ...rystal_restonia.json => restonia_axe.json} | 2 +- ...stal_restonia.json => restonia_boots.json} | 2 +- ...stal_restonia.json => restonia_chest.json} | 2 +- ...tal_restonia.json => restonia_helmet.json} | 2 +- ...rystal_restonia.json => restonia_hoe.json} | 2 +- ...l_restonia.json => restonia_leggings.json} | 2 +- ...al_restonia.json => restonia_pickaxe.json} | 2 +- ...tal_restonia.json => restonia_shovel.json} | 2 +- ...stal_restonia.json => restonia_sword.json} | 2 +- .../actuallyadditions/recipes/rice_slime.json | 2 +- .../recipes/rice_slime_potion.json | 2 +- .../recipes/shock_suppressor.json | 4 +- .../{battery.json => single_battery.json} | 4 +- .../{stone_paxel.json => stone_aiot.json} | 2 +- .../{tele_staff.json => teleport_staff.json} | 6 +- .../recipes/{bag.json => travelers_sack.json} | 2 +- ...attery_triple.json => triple_battery.json} | 8 +- .../recipes/vertical_digger.json | 2 +- .../actuallyadditions/recipes/void_aiot.json | 23 ++ .../{axe_crystal_void.json => void_axe.json} | 2 +- ...oots_crystal_void.json => void_boots.json} | 2 +- ...hest_crystal_void.json => void_chest.json} | 2 +- ...elm_crystal_void.json => void_helmet.json} | 2 +- .../{hoe_crystal_void.json => void_hoe.json} | 2 +- ...s_crystal_void.json => void_leggings.json} | 2 +- ...xe_crystal_void.json => void_pickaxe.json} | 2 +- .../recipes/{void_bag.json => void_sack.json} | 4 +- ...vel_crystal_void.json => void_shovel.json} | 2 +- ...word_crystal_void.json => void_sword.json} | 2 +- .../recipes/wings_of_the_bats.json | 2 +- .../{wooden_paxel.json => wooden_aiot.json} | 2 +- .../data/BlockRecipeGenerator.java | 14 +- .../data/EmpoweringRecipeGenerator.java | 8 +- .../data/ItemModelGenerator.java | 3 +- .../data/ItemRecipeGenerator.java | 130 +++---- .../data/LaserRecipeGenerator.java | 13 +- .../mod/blocks/ActuallyBlocks.java | 8 +- .../mod/items/ActuallyItems.java | 250 ++++++++------ .../mod/items/ItemWingsOfTheBats.java | 2 +- .../{cup_with_coffee.png => coffee_cup.png} | Bin ..._on_a_stick.png => crafter_on_a_stick.png} | Bin ..._shard.png => diamatine_crystal_shard.png} | Bin ...l_shard.png => emeradic_crystal_shard.png} | Bin ...al.png => empowered_diamatine_crystal.png} | Bin ...=> empowered_diamatine_crystal.png.mcmeta} | 0 ...tal.png => empowered_emeradic_crystal.png} | Bin ... => empowered_emeradic_crystal.png.mcmeta} | 0 ...rystal.png => empowered_enori_crystal.png} | Bin ...eta => empowered_enori_crystal.png.mcmeta} | 0 ...rystal.png => empowered_palis_crystal.png} | Bin ...eta => empowered_palis_crystal.png.mcmeta} | 0 ...tal.png => empowered_restonia_crystal.png} | Bin ... => empowered_restonia_crystal.png.mcmeta} | 0 ...crystal.png => empowered_void_crystal.png} | Bin ...meta => empowered_void_crystal.png.mcmeta} | 0 ...red.png => engineers_goggles_advanced.png} | Bin ...stal_shard.png => enori_crystal_shard.png} | Bin .../item/{item_filter.png => filter.png} | Bin .../item/{fur_ball.png => hairy_ball.png} | Bin ...ity.png => laser_upgrade_invisibility.png} | Bin ...fier_range.png => laser_upgrade_range.png} | Bin ...stal_shard.png => palis_crystal_shard.png} | Bin ...l_shard.png => restonia_crystal_shard.png} | Bin ...ystal_shard.png => void_crystal_shard.png} | Bin .../{bowl_of_water.png => water_bowl.png} | Bin 250 files changed, 1307 insertions(+), 637 deletions(-) create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_coil.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_leaf_blower.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/basic_coil.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/bats_wing.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/canola_seeds.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/coffee_beans.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/coffee_cup.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/coffee_seeds.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crafter_on_a_stick.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystallized_canola_seed.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_shard.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/double_battery.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/dough.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_core.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_shard.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_canola_seed.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_diamatine_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_emeradic_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_enori_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_palis_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_restonia_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_void_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empty_cup.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ender_star.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles_advanced.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_shard.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/fertilizer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/filter.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/flax_seeds.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/gold_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/hairy_ball.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/handheld_filler.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/iron_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/knife.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lamp_controller.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_invisibility.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_range.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_wrench.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/leaf_blower.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lens.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lens_of_color.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_shard.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/paper_cone.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/phantom_connector.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/player_probe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quadruple_battery.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quintuple_battery.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/resonant_rice.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_shard.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/rice_dough.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/rice_seeds.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/rice_slimeball.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_growth.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_magnetizing.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/single_battery.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/solidified_experience.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/teleport_staff.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/tiny_charcoal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/tiny_coal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/travelers_sack.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/triple_battery.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_crystal.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_crystal_shard.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_sack.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/water_bowl.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/wings_of_the_bats.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/worm.json rename src/generated/resources/data/actuallyadditions/recipes/{coil_advanced.json => advanced_coil.json} (68%) rename src/generated/resources/data/actuallyadditions/recipes/{coil.json => basic_coil.json} (85%) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/diamatine_aiot.json rename src/generated/resources/data/actuallyadditions/recipes/{axe_crystal_diamatine.json => diamatine_axe.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{boots_crystal_diamatine.json => diamatine_boots.json} (76%) rename src/generated/resources/data/actuallyadditions/recipes/{chest_crystal_diamatine.json => diamatine_chest.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{helm_crystal_diamatine.json => diamatine_helmet.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{hoe_crystal_diamatine.json => diamatine_hoe.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{pants_crystal_diamatine.json => diamatine_leggings.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{pickaxe_crystal_diamatine.json => diamatine_pickaxe.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{shovel_crystal_diamatine.json => diamatine_shovel.json} (80%) rename src/generated/resources/data/actuallyadditions/recipes/{sword_crystal_diamatine.json => diamatine_sword.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{diamond_paxel.json => diamond_aiot.json} (88%) delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/disenchanting_lens.json rename src/generated/resources/data/actuallyadditions/recipes/{battery_double.json => double_battery.json} (65%) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/emeradic_aiot.json rename src/generated/resources/data/actuallyadditions/recipes/{axe_crystal_emeradic.json => emeradic_axe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{boots_crystal_emeradic.json => emeradic_boots.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{chest_crystal_emeradic.json => emeradic_chest.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{helm_crystal_emeradic.json => emeradic_helmet.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{hoe_crystal_emeradic.json => emeradic_hoe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{pants_crystal_emeradic.json => emeradic_leggings.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{pickaxe_crystal_emeradic.json => emeradic_pickaxe.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{shovel_crystal_emeradic.json => emeradic_shovel.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{sword_crystal_emeradic.json => emeradic_sword.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{engineer_goggles.json => engineers_goggles.json} (85%) rename src/generated/resources/data/actuallyadditions/recipes/{engineer_goggles_advanced.json => engineers_goggles_advanced.json} (54%) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/enori_aiot.json rename src/generated/resources/data/actuallyadditions/recipes/{axe_crystal_enori.json => enori_axe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{boots_crystal_enori.json => enori_boots.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{chest_crystal_enori.json => enori_chest.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{helm_crystal_enori.json => enori_helmet.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{hoe_crystal_enori.json => enori_hoe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{pants_crystal_enori.json => enori_leggings.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{pickaxe_crystal_enori.json => enori_pickaxe.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{shovel_crystal_enori.json => enori_shovel.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{sword_crystal_enori.json => enori_sword.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{gold_paxel.json => gold_aiot.json} (88%) rename src/generated/resources/data/actuallyadditions/recipes/{filling_wand.json => handheld_filler.json} (60%) rename src/generated/resources/data/actuallyadditions/recipes/{iron_paxel.json => iron_aiot.json} (88%) delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/laser/damage_lens.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_certain_death.json rename src/generated/resources/data/actuallyadditions/recipes/laser/{color_lens.json => lens_of_color.json} (74%) rename src/generated/resources/data/actuallyadditions/recipes/laser/{explosion_lens.json => lens_of_detonation.json} (50%) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/lens_of_disenchanting.json rename src/generated/resources/data/actuallyadditions/recipes/{more_damage_lens.json => lens_of_the_killer.json} (65%) rename src/generated/resources/data/actuallyadditions/recipes/{mining_lens.json => lens_of_the_miner.json} (92%) rename src/generated/resources/data/actuallyadditions/recipes/{netherite_paxel.json => netherite_aiot.json} (88%) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/palis_aiot.json rename src/generated/resources/data/actuallyadditions/recipes/{axe_crystal_palis.json => palis_axe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{boots_crystal_palis.json => palis_boots.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{chest_crystal_palis.json => palis_chest.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{helm_crystal_palis.json => palis_helmet.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{hoe_crystal_palis.json => palis_hoe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{pants_crystal_palis.json => palis_leggings.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{pickaxe_crystal_palis.json => palis_pickaxe.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{shovel_crystal_palis.json => palis_shovel.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{sword_crystal_palis.json => palis_sword.json} (82%) delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_diamatine.json delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_emeradic.json delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_enori.json delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_palis.json delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_restonia.json delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_void.json rename src/generated/resources/data/actuallyadditions/recipes/{battery_quadruple.json => quadruple_battery.json} (52%) rename src/generated/resources/data/actuallyadditions/recipes/{quartz_paxel.json => quartz_aiot.json} (89%) rename src/generated/resources/data/actuallyadditions/recipes/{battery_quintuple.json => quintuple_battery.json} (51%) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/restonia_aiot.json rename src/generated/resources/data/actuallyadditions/recipes/{axe_crystal_restonia.json => restonia_axe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{boots_crystal_restonia.json => restonia_boots.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{chest_crystal_restonia.json => restonia_chest.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{helm_crystal_restonia.json => restonia_helmet.json} (77%) rename src/generated/resources/data/actuallyadditions/recipes/{hoe_crystal_restonia.json => restonia_hoe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{pants_crystal_restonia.json => restonia_leggings.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{pickaxe_crystal_restonia.json => restonia_pickaxe.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{shovel_crystal_restonia.json => restonia_shovel.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{sword_crystal_restonia.json => restonia_sword.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{battery.json => single_battery.json} (74%) rename src/generated/resources/data/actuallyadditions/recipes/{stone_paxel.json => stone_aiot.json} (88%) rename src/generated/resources/data/actuallyadditions/recipes/{tele_staff.json => teleport_staff.json} (65%) rename src/generated/resources/data/actuallyadditions/recipes/{bag.json => travelers_sack.json} (87%) rename src/generated/resources/data/actuallyadditions/recipes/{battery_triple.json => triple_battery.json} (52%) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/void_aiot.json rename src/generated/resources/data/actuallyadditions/recipes/{axe_crystal_void.json => void_axe.json} (83%) rename src/generated/resources/data/actuallyadditions/recipes/{boots_crystal_void.json => void_boots.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{chest_crystal_void.json => void_chest.json} (79%) rename src/generated/resources/data/actuallyadditions/recipes/{helm_crystal_void.json => void_helmet.json} (78%) rename src/generated/resources/data/actuallyadditions/recipes/{hoe_crystal_void.json => void_hoe.json} (83%) rename src/generated/resources/data/actuallyadditions/recipes/{pants_crystal_void.json => void_leggings.json} (79%) rename src/generated/resources/data/actuallyadditions/recipes/{pickaxe_crystal_void.json => void_pickaxe.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{void_bag.json => void_sack.json} (73%) rename src/generated/resources/data/actuallyadditions/recipes/{shovel_crystal_void.json => void_shovel.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{sword_crystal_void.json => void_sword.json} (82%) rename src/generated/resources/data/actuallyadditions/recipes/{wooden_paxel.json => wooden_aiot.json} (88%) rename src/main/resources/assets/actuallyadditions/textures/item/{cup_with_coffee.png => coffee_cup.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{crafting_table_on_a_stick.png => crafter_on_a_stick.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{light_blue_crystal_shard.png => diamatine_crystal_shard.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{green_crystal_shard.png => emeradic_crystal_shard.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{diamatine_empowered_crystal.png => empowered_diamatine_crystal.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{diamatine_empowered_crystal.png.mcmeta => empowered_diamatine_crystal.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{emeradic_empowered_crystal.png => empowered_emeradic_crystal.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{emeradic_empowered_crystal.png.mcmeta => empowered_emeradic_crystal.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{enori_empowered_crystal.png => empowered_enori_crystal.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{enori_empowered_crystal.png.mcmeta => empowered_enori_crystal.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{palis_empowered_crystal.png => empowered_palis_crystal.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{palis_empowered_crystal.png.mcmeta => empowered_palis_crystal.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{restonia_empowered_crystal.png => empowered_restonia_crystal.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{restonia_empowered_crystal.png.mcmeta => empowered_restonia_crystal.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{void_empowered_crystal.png => empowered_void_crystal.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{void_empowered_crystal.png.mcmeta => empowered_void_crystal.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{engineers_goggles_infrared.png => engineers_goggles_advanced.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{white_crystal_shard.png => enori_crystal_shard.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{item_filter.png => filter.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{fur_ball.png => hairy_ball.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{laser_relay_modifier_invisibility.png => laser_upgrade_invisibility.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{laser_relay_modifier_range.png => laser_upgrade_range.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{blue_crystal_shard.png => palis_crystal_shard.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{red_crystal_shard.png => restonia_crystal_shard.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{black_crystal_shard.png => void_crystal_shard.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{bowl_of_water.png => water_bowl.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index b59cf97c4..b23e6b8ff 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -133,9 +133,14 @@ fa0040bf5801821cde761a2b959235756aa004e9 assets/actuallyadditions/models/block/p bf348e13cbaf0532bc254c9efa92350ae8b0023c assets/actuallyadditions/models/block/rice.json 292e546009c16dc7d5e38b4faa8ce84baaaa2242 assets/actuallyadditions/models/block/void_crystal_block.json 83da16f21abc2ec8361ecc3b1bda2852d48dbd97 assets/actuallyadditions/models/block/wood_casing.json +0753c814deb4cc275d0fce0b87ec12ba1b12c0eb assets/actuallyadditions/models/item/advanced_coil.json +637043b066b31f811a9ed94de66d965333f35dd3 assets/actuallyadditions/models/item/advanced_leaf_blower.json c2e3b2291b34f85eab9907c9266c6198d8478001 assets/actuallyadditions/models/item/atomic_reconstructor.json +8c837329c79dd9f611a860f32b0184674ad8fb3c assets/actuallyadditions/models/item/basic_coil.json +bbd32f2ac5a2a55332aa9b73fd06aa1462fdd29a assets/actuallyadditions/models/item/bats_wing.json 50f7c08aa8725f8c33c54290d58b65cb293f9529 assets/actuallyadditions/models/item/battery_box.json 44c0a208ef528d296e7532a834d6563d7cd90922 assets/actuallyadditions/models/item/bio_reactor.json +08f5dfde00eed3a0686cfd09efae9b08c3d1a28a assets/actuallyadditions/models/item/black_quartz.json 37d49b21bf16128d58a5d63d742508891a114ece assets/actuallyadditions/models/item/black_quartz_block.json 50075e8e8b428b161113d45d583f6eae5e8360f3 assets/actuallyadditions/models/item/black_quartz_pillar_block.json 5614453539110f6214c52d47c12aa1ce05447d53 assets/actuallyadditions/models/item/black_quartz_pillar_slab.json @@ -147,6 +152,7 @@ ea2f5b2bf99670f4df05889ab67c73686a26a58b assets/actuallyadditions/models/item/bl 3679056a9aee03821a997a2616b8808af7bfe4b7 assets/actuallyadditions/models/item/breaker.json f3282e55e71d26a32cee1287881ac2d5e91c30a8 assets/actuallyadditions/models/item/canola.json 08c70d561c219bb4c6d21b5f56192df81f054e0a assets/actuallyadditions/models/item/canola_press.json +0507025fadef30e363cbc825265576c782880f7b assets/actuallyadditions/models/item/canola_seeds.json b0f7c3915b646ccd27ca6ff40517e19e2a0fb7ef assets/actuallyadditions/models/item/canolaoil.json 36179c5cc77dc38364a1931f2fabbf846ef9c39d assets/actuallyadditions/models/item/chiseled_black_quartz_block.json 27c8ed9e39b600161a6a327db0ac53e10acc13bb assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json @@ -154,30 +160,59 @@ b0f7c3915b646ccd27ca6ff40517e19e2a0fb7ef assets/actuallyadditions/models/item/ca 59e1e2bddb67512960f5011fa4926d0dcd32b58c assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json bbf723238f6536295339f0b0b5b052cf89b92d5b assets/actuallyadditions/models/item/coal_generator.json 73511866d0c115d75f18e160ba5a09e714bd4769 assets/actuallyadditions/models/item/coffee.json +1d676d4abc4c67c3da2d15499ecb585f436f3893 assets/actuallyadditions/models/item/coffee_beans.json +28fc61074cb1a60ef5904e4bba7f6ad3c42b55fd assets/actuallyadditions/models/item/coffee_cup.json 082ecd5232059fadaa447a99a623437e3adab3ef assets/actuallyadditions/models/item/coffee_machine.json +6765c06218d8940c06daeff92aeb44516ac6ff4a assets/actuallyadditions/models/item/coffee_seeds.json +7698ec0e672b1209e6a664dfee5c3bbaa1a612c7 assets/actuallyadditions/models/item/crafter_on_a_stick.json 1e7e61701473dbf3dfc18bb5b9fa7be91b443dd8 assets/actuallyadditions/models/item/crusher.json aeacd7ca465c19d6cbcef25e61023397c4472ab3 assets/actuallyadditions/models/item/crusher_double.json +3a9cfcb0a3bec43f6556b3bdab09731758a36cc2 assets/actuallyadditions/models/item/crystallized_canola_seed.json da3b2fa50416d61d8b3683ee74f9572b36f4fea3 assets/actuallyadditions/models/item/crystaloil.json +ec0cdeb022c4e0bc43c0fd5d3e3e758361f7ebe2 assets/actuallyadditions/models/item/diamatine_aiot.json +71adfaafb36d576dd765201c529acfc0658066ce assets/actuallyadditions/models/item/diamatine_crystal.json 491736b20e628a539c9bb2472d499c03cdbc3760 assets/actuallyadditions/models/item/diamatine_crystal_block.json 297827c231b1ef558dc89085993b270014730c51 assets/actuallyadditions/models/item/diamatine_crystal_cluster.json +000679e52c9ef83a874d53c2df83d4f79db4b2f0 assets/actuallyadditions/models/item/diamatine_crystal_shard.json +6f5307c394a079b45f70e8f08cc3e370aeca5f52 assets/actuallyadditions/models/item/diamond_aiot.json 57d05111bf8aa9c36234a4dbaecaa9fe86126331 assets/actuallyadditions/models/item/display_stand.json +830e1315602d6dd7ccc4b38860895ce4790c145c assets/actuallyadditions/models/item/double_battery.json +e854b0c11915e363f5c7e9052ac3afa2bca0a47a assets/actuallyadditions/models/item/dough.json +a4bce6204f1a53bd4ddf84480ce057d795d4cff7 assets/actuallyadditions/models/item/drill_core.json ef9ec5b31db12805460edb62f611c67973ac18ba assets/actuallyadditions/models/item/dropper.json +4b8852132e20b7dd8e00a9c34e20c3a2c11d9a23 assets/actuallyadditions/models/item/emeradic_aiot.json +98dbddad6525f949e17613d12047d18537f841fa assets/actuallyadditions/models/item/emeradic_crystal.json 083818321ae732cb35a63b5cc78c99df16d649f4 assets/actuallyadditions/models/item/emeradic_crystal_block.json 282f140a42261eaabd2096e3562d7919faf331a0 assets/actuallyadditions/models/item/emeradic_crystal_cluster.json +23c126fbe081d6eba753aa26dfe70b6753562453 assets/actuallyadditions/models/item/emeradic_crystal_shard.json +687455af97a8ed03a26c457c86e3c5ef89052b06 assets/actuallyadditions/models/item/empowered_canola_seed.json +76c232f0aca82d81b1cbe48a1710ba68a9e274ef assets/actuallyadditions/models/item/empowered_diamatine_crystal.json d7948c3ad4bf22f0efa6e669de7a559c27b52aae assets/actuallyadditions/models/item/empowered_diamatine_crystal_block.json +1d291b8168aec5663da7fab21ba2895b6c31dad8 assets/actuallyadditions/models/item/empowered_emeradic_crystal.json cfabdb67ce0ccaaea437cfbbac68f0e0c8e7d890 assets/actuallyadditions/models/item/empowered_emeradic_crystal_block.json +3a339996daf88347e2abf829eb9f7d0e1915ed32 assets/actuallyadditions/models/item/empowered_enori_crystal.json 42bfc556aa4e9f0861855b4eee58397b75bd85f8 assets/actuallyadditions/models/item/empowered_enori_crystal_block.json +0670cc4d0a2ab1561ea68603a078cf50f5cf2431 assets/actuallyadditions/models/item/empowered_palis_crystal.json d019c764e87de9f1856dc8d12b880d874e215fac assets/actuallyadditions/models/item/empowered_palis_crystal_block.json +7155b098b6f6bf5fe03f6546dd00217d8fa02721 assets/actuallyadditions/models/item/empowered_restonia_crystal.json f7c65e8d77b723f4fd5b7349c7f8ec23f2e6440b assets/actuallyadditions/models/item/empowered_restonia_crystal_block.json +9b80be9493b12d8a5c05469055204128df718901 assets/actuallyadditions/models/item/empowered_void_crystal.json c70272562c084ce2a04933ca04e270f9b3493cf4 assets/actuallyadditions/models/item/empowered_void_crystal_block.json 485a85b7176f60fce7286293767107c51649e488 assets/actuallyadditions/models/item/empoweredoil.json 88457aa73c273fb512b5c4103a1183e93dcec412 assets/actuallyadditions/models/item/empowerer.json +8c5fb751f1795df8cec1100368b153ab02d003d4 assets/actuallyadditions/models/item/empty_cup.json 0d0fd6b7df3a378a58cd35168fb0e1c3d54c6b03 assets/actuallyadditions/models/item/ender_casing.json 5afcb323c7e19f36edfcb8cd33652a6f75aa7c49 assets/actuallyadditions/models/item/ender_pearl_block.json +ae5bd154f7863b88fab008caca78867dd4d29aa5 assets/actuallyadditions/models/item/ender_star.json 9d011453796b6a4aa0ac86679fe27fad6b0e3337 assets/actuallyadditions/models/item/energizer.json df3d37e900946dc1198f04c837de897089528847 assets/actuallyadditions/models/item/enervator.json +accc66e54be6fcc7b86a7ce166ed15a5dd24e2fe assets/actuallyadditions/models/item/engineers_goggles.json +16e04b03519bf74512b27670eba0be85159be60d assets/actuallyadditions/models/item/engineers_goggles_advanced.json +4ce9cdeb273ad2dae586c9d5c97cd1d78aa64e95 assets/actuallyadditions/models/item/enori_aiot.json +ce947ce66c2f81aa41e5659b6341d44c07705525 assets/actuallyadditions/models/item/enori_crystal.json 8111195e2a23422d407f962d588e9cda39f3a0ce assets/actuallyadditions/models/item/enori_crystal_block.json c3af20ba50f5e6db6a5f13bc94c5b85646e938fa assets/actuallyadditions/models/item/enori_crystal_cluster.json +56a05bd6769e0d392a2532da911254e5cf0d05c5 assets/actuallyadditions/models/item/enori_crystal_shard.json 547a18a0434aa8526dce6ab2727bc05674480611 assets/actuallyadditions/models/item/ethetic_green_block.json 29c5b35219bfb4bb1276297b0c92d235a39c9d2b assets/actuallyadditions/models/item/ethetic_green_slab.json 661f1b449d78ea517012204f1c2a47bd0f892fca assets/actuallyadditions/models/item/ethetic_green_stairs.json @@ -189,15 +224,23 @@ c3af20ba50f5e6db6a5f13bc94c5b85646e938fa assets/actuallyadditions/models/item/en 8bcb533ef0b7c42b3218e2cf52c752fef283c267 assets/actuallyadditions/models/item/farmer.json d4338f09f71dd9bc75babcb7cebba80ab57eee01 assets/actuallyadditions/models/item/feeder.json bb4fc4a881ec4b949fb657b112826731988cdaf8 assets/actuallyadditions/models/item/fermenting_barrel.json +60ad6e5930b80fc07c18e367e73472627ec4fb3e assets/actuallyadditions/models/item/fertilizer.json +66dfca0e0ef8e04d76acddab3efbd294d3588d38 assets/actuallyadditions/models/item/filter.json bc83a5a96df045a0c005637ec1cb8f0e66de69a5 assets/actuallyadditions/models/item/firework_box.json b84a9d002727c49cbf74b81108e4dd4098e39ade assets/actuallyadditions/models/item/flax.json +a09cf83500fa2357cd5be2cb896014dfb4310ac9 assets/actuallyadditions/models/item/flax_seeds.json 1e296d34f5c206b7a741df29a7e1f3718f583267 assets/actuallyadditions/models/item/fluid_collector.json 9197cf2c197f5116a5fc98fd58b5766677ef76e8 assets/actuallyadditions/models/item/fluid_placer.json +668a71327161393ba5b3bbe236e8158ebec5585d assets/actuallyadditions/models/item/gold_aiot.json cb44cc7dc93b234b6173bdf4d5152eb639c945b0 assets/actuallyadditions/models/item/greenhouse_glass.json +5190164f6f3a4907439ab7893ba0f5b17dd4b44f assets/actuallyadditions/models/item/hairy_ball.json +0d5a4fcc37d925f2adc52d7d3ddda708871dc4b8 assets/actuallyadditions/models/item/handheld_filler.json 340d0e0eca2fe4be4577a40ba9f530186828cd4b assets/actuallyadditions/models/item/heat_collector.json +5513baa5bd2d53702880a1ab6bb23d7159ebbd89 assets/actuallyadditions/models/item/iron_aiot.json a4bc0e00bec22d8a0da612b6dfe4dba7688a2758 assets/actuallyadditions/models/item/iron_casing.json 32974ab97db39decad106e89e5c051d79e87624c assets/actuallyadditions/models/item/item_viewer.json f18d781df4b1659ee8e38313db97360e5bbfe813 assets/actuallyadditions/models/item/item_viewer_hopping.json +d676c5b6ddcc920059a70e8107faa0dbf023b05c assets/actuallyadditions/models/item/knife.json 1e3d4970b8a5ed46ed72deedc5c38d8347658d2f assets/actuallyadditions/models/item/lamp_black.json 8b730988dfb2cb6caa448647d245f9a4160c4247 assets/actuallyadditions/models/item/lamp_blue.json 42df4aeb9a27d43da2c3a47cafd4f3fac1f3c0fa assets/actuallyadditions/models/item/lamp_brown.json @@ -221,15 +264,27 @@ fe3c77543d11ac86cf7f25f46140ec1a86421145 assets/actuallyadditions/models/item/la 96b5e768b5d813ba6d278322301b64002ec8c296 assets/actuallyadditions/models/item/laser_relay_fluids.json 32268082e079a09d791ef953bae0288119a94bb8 assets/actuallyadditions/models/item/laser_relay_item.json e9236fdb3ac03dceaa8697b26a6762ed983265da assets/actuallyadditions/models/item/laser_relay_item_advanced.json +60fdbe643d98fae2576671d36d4e43d42fcfc566 assets/actuallyadditions/models/item/laser_upgrade_invisibility.json +9f2437da8116f1631aa2040b9a4e50fc00e47484 assets/actuallyadditions/models/item/laser_upgrade_range.json +8836b8954db2778b1a9ac3baca9baed4b41e9f47 assets/actuallyadditions/models/item/laser_wrench.json f3866a691bfbeccf2f0ce2c77e07eae3b5e4d8c5 assets/actuallyadditions/models/item/lava_factory_casing.json 2220fec34569b35a5c3ff06bde4edbb87b673b96 assets/actuallyadditions/models/item/lava_factory_controller.json +b4cd7ab571dc72bb2588984258d23fb9c9fd82e7 assets/actuallyadditions/models/item/leaf_blower.json c7fdd35353e69e5df8437757520e96083682470a assets/actuallyadditions/models/item/leaf_generator.json +6db963902c4d6aa4f652a70390d5b1fb7da5b320 assets/actuallyadditions/models/item/lens.json +fad02970d504f675d2f20a70839108d04130e2b9 assets/actuallyadditions/models/item/lens_of_color.json 55ce74cb71c0db54712382cd61f2c27214201c94 assets/actuallyadditions/models/item/long_range_breaker.json +abf136ca89e5d896fd9ae6f89d0113d5793b3b1c assets/actuallyadditions/models/item/netherite_aiot.json cec09548b75f7f3e2079e75e1aaf5253e2f318ba assets/actuallyadditions/models/item/oil_generator.json +0dc90f8c2d8cc17f4859d196c4ab22caf52e7bd1 assets/actuallyadditions/models/item/palis_aiot.json +2efd31a4444f9ee02724c541f3935b3dca0060d1 assets/actuallyadditions/models/item/palis_crystal.json cd1128cdfd0de67aed5e2f18fbc04252300758d1 assets/actuallyadditions/models/item/palis_crystal_block.json d504e45345c3edde0c3ce18df5c49bbf8638c91d assets/actuallyadditions/models/item/palis_crystal_cluster.json +7532d0658f9d7d266ebaa9b4e19ab1f8fa40b3df assets/actuallyadditions/models/item/palis_crystal_shard.json +03fa340861a47433fcf4d70e617e7cf359c98d19 assets/actuallyadditions/models/item/paper_cone.json a0e9339d3e9cdd9dcb28e5053f4017c6f13ee22d assets/actuallyadditions/models/item/phantom_booster.json b5470f03099362062e21d0d9dcb045da8d7b29d4 assets/actuallyadditions/models/item/phantom_breaker.json +ce0155d7e30e1170cc4e0cbd2cef6d9287073765 assets/actuallyadditions/models/item/phantom_connector.json 545dbd33d3afa630cf5f5a8aefaa43bf16372529 assets/actuallyadditions/models/item/phantom_energyface.json 8f1697d57a2cdd6144d7bc5f10ac9636ab325d61 assets/actuallyadditions/models/item/phantom_itemface.json 77f8324fd0fc9192a894cbb129b41968571869fb assets/actuallyadditions/models/item/phantom_liquiface.json @@ -237,34 +292,54 @@ d9739be2a8b1709805d1076ff524933b054482d4 assets/actuallyadditions/models/item/ph ead41eb85786ee32e480cd9e63b5f261150782ec assets/actuallyadditions/models/item/phantom_redstoneface.json 9851fbdbd1e175f5ddbc85b07d3a9f6a2540ea51 assets/actuallyadditions/models/item/placer.json 983248f2dae457870e042a9a220434a1572fe78f assets/actuallyadditions/models/item/player_interface.json +9321683e08cd6615f2f0950625607eb81e9d0c26 assets/actuallyadditions/models/item/player_probe.json 070e1d9e4bfb52dffc7d2bbf02f504374d97c502 assets/actuallyadditions/models/item/powered_furnace.json +5bd39a6929e7aae1ea79ae43886375a87c99ede8 assets/actuallyadditions/models/item/quadruple_battery.json +0f44823c6679515075a2dab5136e0b252eb8f9d9 assets/actuallyadditions/models/item/quartz_aiot.json +7f7a44a1afcbfbe63bc55be016a81dc265515b24 assets/actuallyadditions/models/item/quintuple_battery.json d8cf56e92afa1ea98eead8af208cc6281c815ede assets/actuallyadditions/models/item/ranged_collector.json 12b62d8ed574812fb48d32e416b3c9f4ebf70ec8 assets/actuallyadditions/models/item/refinedcanolaoil.json +a607d6e415c04d4aa4128446c3dbb40b9aafc5d5 assets/actuallyadditions/models/item/resonant_rice.json +68d8873d46bfbe65112f29bc4b1159e586d6705f assets/actuallyadditions/models/item/restonia_aiot.json +44330b1183805e9e9961cedf7f5693e833c45509 assets/actuallyadditions/models/item/restonia_crystal.json e1ac2543ec64ac16a79eb40ece195c260911d9bb assets/actuallyadditions/models/item/restonia_crystal_block.json b7162b0c606ec8d39ebf2012fc0316a390f23c6d assets/actuallyadditions/models/item/restonia_crystal_cluster.json +abb3269b59d79295ac25bc1d89eb223ea0ee454a assets/actuallyadditions/models/item/restonia_crystal_shard.json f456241999745258c54b26e50aed4fdd2a995d9e assets/actuallyadditions/models/item/rice.json +01fab8eae5a0823bbafd4834dce65a8a427de320 assets/actuallyadditions/models/item/rice_dough.json +dcfcded1a57642706d6fc9bc7bdcf5338b18d183 assets/actuallyadditions/models/item/rice_seeds.json +18087d4ee31e7ced9db334fe0036acd890f2f974 assets/actuallyadditions/models/item/rice_slimeball.json +f8563b3660b69decda6e510e589c55ae568e941e assets/actuallyadditions/models/item/ring.json +c48d9fe3a0051a30496348f7dc22dc142be3a063 assets/actuallyadditions/models/item/ring_of_growth.json +6d2c70e9d473147c72b70fbea292f90dd50ab5c2 assets/actuallyadditions/models/item/ring_of_magnetizing.json 8334f0d8c5364b930a8d674cfe86f8b4461b03f3 assets/actuallyadditions/models/item/shock_suppressor.json +ef7f9a92f8b47c3de7f732172f7bb0d996b38718 assets/actuallyadditions/models/item/single_battery.json +90f07fa285908351a3a486bcab320352b4697500 assets/actuallyadditions/models/item/solidified_experience.json +1ba6c5a40ec762bae26cbca11afea7a76a24f85c assets/actuallyadditions/models/item/stone_aiot.json +1905e7a72f7b8dfebbe177105540c57d9b365385 assets/actuallyadditions/models/item/teleport_staff.json +35d62238b8fadb4bff4c99162b85710a6809e924 assets/actuallyadditions/models/item/tiny_charcoal.json +dabc22d7872bd1ee124e387b8d5c7fc36d1856fc assets/actuallyadditions/models/item/tiny_coal.json ab1238b9d05cf387edf8f82d984eff7e8f050390 assets/actuallyadditions/models/item/tiny_torch.json +f6c37b58efbc2db0451fc7f373979635be37358a assets/actuallyadditions/models/item/travelers_sack.json +181f54a35065333fef383f61d837b83d57dfbf5f assets/actuallyadditions/models/item/triple_battery.json 15e8675d650eb7639154dc7730207c33c8c05f29 assets/actuallyadditions/models/item/vertical_digger.json +9c0b2c0b89a809f2e0f30ac70a51e70d46bbef07 assets/actuallyadditions/models/item/void_aiot.json +a42cb031c408a93ddbf94a5b7f1b496b3cc18086 assets/actuallyadditions/models/item/void_crystal.json 5ecd8ffdb80cd831e4997489e1126cf62dcfe554 assets/actuallyadditions/models/item/void_crystal_block.json 637116b594ddef84e14b6fb0e8bcc1a562bb2bdf assets/actuallyadditions/models/item/void_crystal_cluster.json +2f41506237d3707d2f87b6b37df2e03467091d8b assets/actuallyadditions/models/item/void_crystal_shard.json +1c0eb44eca6ed5e0b36dcd783f81b4e3557ff5b4 assets/actuallyadditions/models/item/void_sack.json +1e696d711eb5de97f86aa70c53e915369deb38fb assets/actuallyadditions/models/item/water_bowl.json +4309a1169749dc7b9e79ba5a37c4f4f7a8206dea assets/actuallyadditions/models/item/wings_of_the_bats.json f68d37fcdaf57ec06518d5974cbf540e6c45d271 assets/actuallyadditions/models/item/wood_casing.json +f657eabc7321de0b05cf92d9ebdd6f5215a685b5 assets/actuallyadditions/models/item/wooden_aiot.json +7f8e5e703d9244222706c52d7b24b299e07cb2db assets/actuallyadditions/models/item/worm.json 0b1ab8963077c90a5104b516eab36e56c8a07057 assets/actuallyadditions/models/item/xp_solidifier.json +64711e28d6fb7579f1ba2fed4a46440e213a2fac data/actuallyadditions/recipes/advanced_coil.json a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json -df2c79e474e102a0bf80ee90a753fbe3690110e5 data/actuallyadditions/recipes/axe_crystal_diamatine.json -8d4e7233566d4764348c7c21178553bdc79efb32 data/actuallyadditions/recipes/axe_crystal_emeradic.json -8380559f44c68dc59df3ee49088b5d90f0dd1eae data/actuallyadditions/recipes/axe_crystal_enori.json -bcd33f946a14c6f1268e582553813eb33fa77b70 data/actuallyadditions/recipes/axe_crystal_palis.json -c4b5c2ec54d0574a3d723918d441ccf921fe9fd8 data/actuallyadditions/recipes/axe_crystal_restonia.json -d956afb749e00866d90690b75d45a4f95c84436d data/actuallyadditions/recipes/axe_crystal_void.json 7055f56220327a93e05330d3ba779d360c79c41d data/actuallyadditions/recipes/axe_quartz.json -09eb4183f184b9aa9accee9730ce4d5791419736 data/actuallyadditions/recipes/bag.json -b67491a2ec8cef7e75efaf0203674983a747d566 data/actuallyadditions/recipes/battery.json -f9108fa890420196301ebc0fa439c57bf8549c69 data/actuallyadditions/recipes/battery_box.json -4d572f81b8dbeba7f2cc6f3596cf7f6fbb9523e3 data/actuallyadditions/recipes/battery_double.json -e4f5b57ade04e248d249763199d9d98ca23cec81 data/actuallyadditions/recipes/battery_quadruple.json -a9003404e465716ce6b60c0773e3b2624999a82d data/actuallyadditions/recipes/battery_quintuple.json -29f9bfaded1f33d158f323dc599223bbb0cf111a data/actuallyadditions/recipes/battery_triple.json +3d899eb727ee209cce77eae52985ea8ed1fc2455 data/actuallyadditions/recipes/basic_coil.json +a4b4ff66a1d3387791b1bd72e461cdc62558a054 data/actuallyadditions/recipes/battery_box.json 5ba46742bff7dbc31c3ef64a4b3ab021df4e1c79 data/actuallyadditions/recipes/black_quartz_pillar_slab.json 141bfc11e38b358e2c53f59e816509a25b61bccd data/actuallyadditions/recipes/black_quartz_pillar_stair.json c6cb7541b7390b0af525b3b6854a943e461b1a03 data/actuallyadditions/recipes/black_quartz_pillar_wall.json @@ -272,57 +347,73 @@ c6cb7541b7390b0af525b3b6854a943e461b1a03 data/actuallyadditions/recipes/black_qu f1d41941b332faf0b495353f27ea83287643e044 data/actuallyadditions/recipes/black_quartz_stair.json c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_quartz_wall.json 26ac845ea63340266591b88f0008dfe7c84d901f data/actuallyadditions/recipes/bone_crusher.json -038b6c9ba24b9402bff35769c1374acd9a08f0cd data/actuallyadditions/recipes/booklet.json -4103e5edd4c924b64f0178199d3e740afc1d5ad2 data/actuallyadditions/recipes/boots_crystal_diamatine.json -4d05ab0a223ddf1413c4bfd5c0488b2bffe4373c data/actuallyadditions/recipes/boots_crystal_emeradic.json -94227895a32c5be178d8af8d3f539f9b65bef1c1 data/actuallyadditions/recipes/boots_crystal_enori.json -859916e733524b70a0c0af5154c02c9512796f67 data/actuallyadditions/recipes/boots_crystal_palis.json -114246e64cfd2bb67df5c537bb456ec60d244aa0 data/actuallyadditions/recipes/boots_crystal_restonia.json -8b36911b7f1e61d2e927ebb2710a021765f97915 data/actuallyadditions/recipes/boots_crystal_void.json +398ad1cb070aa294671f0294515fc7695042fd05 data/actuallyadditions/recipes/booklet.json 9840b640a62e061baaecc74efd1e7455c59b35e9 data/actuallyadditions/recipes/boots_quartz.json -e06f2408081b7bd71698004c33c955c18ab2662f data/actuallyadditions/recipes/chest_crystal_diamatine.json -1dfaddf3e61a1273d28bb3947225079f7f3b852d data/actuallyadditions/recipes/chest_crystal_emeradic.json -72bea01768f615b1b1ab21a3b1b8de9e3406565a data/actuallyadditions/recipes/chest_crystal_enori.json -cfa936773bd2f3c28ed45ba9991410ba10c04c3a data/actuallyadditions/recipes/chest_crystal_palis.json -687d92ac05450f1a30be8a48d4dbf782f831957a data/actuallyadditions/recipes/chest_crystal_restonia.json -e7dcfc5395569766bfd1b3feb262d6f67f1049ab data/actuallyadditions/recipes/chest_crystal_void.json 696e9cc478fd04fd21565b9513317cf9f124d4bd data/actuallyadditions/recipes/chest_quartz.json 7dc02da1ff58eb4ff48e305437d4857c31cbd5c9 data/actuallyadditions/recipes/chiseled_black_quartz_slab.json bf1b5de98f29c2dabe25a143c8e63d2c0cd6ea72 data/actuallyadditions/recipes/chiseled_black_quartz_stair.json 9d779585266046738b4bcf7447b918ec09b65f95 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json -28400bc7711c32b54b79c4cf2d326519bce93dd6 data/actuallyadditions/recipes/coil.json -60eb7e071ec9788ad1aece1586ace51ea55a191f data/actuallyadditions/recipes/coil_advanced.json 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json -2322b56481d2e98558b3b121b414f7ef92d8d9a8 data/actuallyadditions/recipes/diamond_paxel.json -efb338fccd70a7386e6bdc1d7af22c72aa50a4fb data/actuallyadditions/recipes/disenchanting_lens.json -e58e81dd83975ee1f52ead19066d111832ac0b73 data/actuallyadditions/recipes/display_stand.json -e9db40aecc85f4080919328d0d333e52201e51cb data/actuallyadditions/recipes/drill.json -65a8aaa6d7d3a28a2febc24c60e56428bea2b837 data/actuallyadditions/recipes/drill_core.json -755edb6da32d0e3a4636b3d28983bf755da1bcf2 data/actuallyadditions/recipes/drill_upgrade_block_placing.json -49365730228d813fbecd192788a9084ca6b003a2 data/actuallyadditions/recipes/drill_upgrade_five_by_five.json +bbd4aaaa994eadfc1a6e9dff8ae1f3b39ed3bcf8 data/actuallyadditions/recipes/diamatine_aiot.json +4fea2c334ed0e5a3ee2d93d570a576d230637242 data/actuallyadditions/recipes/diamatine_axe.json +4a7fe43b6202d8e46c1c9dd16fd1ea7039c25d4a data/actuallyadditions/recipes/diamatine_boots.json +4f071a22f4540741306c399d97d0034c68aaf66b data/actuallyadditions/recipes/diamatine_chest.json +71e45854f6545e5d1294a7213187f39af58626cd data/actuallyadditions/recipes/diamatine_helmet.json +b66e72e6b81ef7d2f80b62fb93fe6de713bb60a8 data/actuallyadditions/recipes/diamatine_hoe.json +b1e0a6df05d27df901dc8a1ebd2cde5a59f42d28 data/actuallyadditions/recipes/diamatine_leggings.json +54f54ae9ca18b40ac02f5f1397e4356d59849b56 data/actuallyadditions/recipes/diamatine_pickaxe.json +463d7701fab5cff34b5457e988f7e7dbec30a635 data/actuallyadditions/recipes/diamatine_shovel.json +3fbeb63bb1536f856ae741eeb5f10eb583629b52 data/actuallyadditions/recipes/diamatine_sword.json +293cecfa94d22e62bd817a3964e82dca4479d44d data/actuallyadditions/recipes/diamond_aiot.json +abb220fb19dea7cf9afcd30fbe533d21b7c4e9c0 data/actuallyadditions/recipes/display_stand.json +f3465f5a05a931f4e5933508c2bc56de9c9eafe5 data/actuallyadditions/recipes/double_battery.json +ef62734da6e9390059172de27f7a7f1f5dae507d data/actuallyadditions/recipes/drill.json +87c4d75a0dec26318530fec94b00c0e05727b3db data/actuallyadditions/recipes/drill_core.json +b39949bb1fcfa2bba60108fec687234c2bba659f data/actuallyadditions/recipes/drill_upgrade_block_placing.json +aa86730bb0446a79eea7bf52aaa24ea7d4630d91 data/actuallyadditions/recipes/drill_upgrade_five_by_five.json 6385d8e13209de4fb34f18d6ff6b6c0cd5b83c30 data/actuallyadditions/recipes/drill_upgrade_fortune.json -1a5462f85b035368c0e5adac0a68b9786a280f78 data/actuallyadditions/recipes/drill_upgrade_fortune_ii.json -164bf40afae4cd13ec1f59416d4b292b916328c0 data/actuallyadditions/recipes/drill_upgrade_silk_touch.json +2f73931a790fba13650aeb6919fb63d94b455ce7 data/actuallyadditions/recipes/drill_upgrade_fortune_ii.json +478b6bb23ae6c109f9b80b70ca709858e3d5da26 data/actuallyadditions/recipes/drill_upgrade_silk_touch.json 4439771fc5a7c8b8bd6007fb42641df6f7faf66c data/actuallyadditions/recipes/drill_upgrade_speed.json d8b99c7f215d465fc850a1194592d013534a4f13 data/actuallyadditions/recipes/drill_upgrade_speed_ii.json -904fea248e94ca5f6f5e8c8b0a86cbb58a7fcdb2 data/actuallyadditions/recipes/drill_upgrade_speed_iii.json -e486645f290728de9a6ed7e33c52cb6aa59f15d1 data/actuallyadditions/recipes/drill_upgrade_three_by_three.json -7dda4aacecfa2287bbb8ddde3d1a9418630bd578 data/actuallyadditions/recipes/empowerer.json -7d5c7b23ae26a61998599eea16ec9b16eb85e014 data/actuallyadditions/recipes/empowering/diamatine.json +238aaff35e5be0de757ffa4a1fea021b6914744e data/actuallyadditions/recipes/drill_upgrade_speed_iii.json +3567c0f3b64bf514df969a0cbb10d531b61f81ee data/actuallyadditions/recipes/drill_upgrade_three_by_three.json +bad317b38717985505d6fb4f622d871c9ed7f029 data/actuallyadditions/recipes/emeradic_aiot.json +7655465b0da88635db1531e01fbd3ea77e41fac7 data/actuallyadditions/recipes/emeradic_axe.json +faf99d8b3ac12cfc426dcedf9c16e63fafab554f data/actuallyadditions/recipes/emeradic_boots.json +ee4d8ffe2467a197b3914efe289b82d7cfd7e5b8 data/actuallyadditions/recipes/emeradic_chest.json +a891132714505afe9970921d13ae4dcf5735b032 data/actuallyadditions/recipes/emeradic_helmet.json +37adeb7114707c95781b8ca3194febd55afa8fe9 data/actuallyadditions/recipes/emeradic_hoe.json +ab1369f2881dfa95909d59d212cf7826c6e5a5b9 data/actuallyadditions/recipes/emeradic_leggings.json +058c21d55449bf139d494a1678e99b1310c8f043 data/actuallyadditions/recipes/emeradic_pickaxe.json +9444b2e5ad09b36c8afb7cb9db55d61b8d330651 data/actuallyadditions/recipes/emeradic_shovel.json +80d7c7ff9c6f52c026430aa900e4483045ba5022 data/actuallyadditions/recipes/emeradic_sword.json +c1db85574a99e9e45e1ca2dd1703cc53d4699469 data/actuallyadditions/recipes/empowerer.json +954a9e18ac635eba114922203c0af8daf7aaa39f data/actuallyadditions/recipes/empowering/diamatine.json 539b7277fb268425ac6302a0ab9c53076f4b3096 data/actuallyadditions/recipes/empowering/diamatine_block.json -b1d924ad70b2610e969cbc1c050a1ea511b28df8 data/actuallyadditions/recipes/empowering/emeradic.json +466bb9c977d91a7a43fdb77589a7618a727e86a7 data/actuallyadditions/recipes/empowering/emeradic.json 1228197667cccd15d8e35fadac0ac7582decbae5 data/actuallyadditions/recipes/empowering/emeradic_block.json -e451efbed03164bb396e93509303808f3f491d66 data/actuallyadditions/recipes/empowering/empowered_canola.json -ec7b3aee79b43aac2aa54d211c3bd612282ba107 data/actuallyadditions/recipes/empowering/enori.json +0fa5a05c622d7e6541368e8c0d1d8f7d8c0aed5e data/actuallyadditions/recipes/empowering/empowered_canola.json +213cd0104647e820a59001c970e0e529fc8aeb0a data/actuallyadditions/recipes/empowering/enori.json b857d3d08f386b2f39bfe0d0f859ed09e626f617 data/actuallyadditions/recipes/empowering/enori_block.json -b6ba00e1b63fa9a83078e250106910e1c7ffa8c0 data/actuallyadditions/recipes/empowering/palis.json +27f284d2e2d0121468d73dd60ffa5f25e8858920 data/actuallyadditions/recipes/empowering/palis.json 1e902cc67bb7bd65b7f6961c927071d47aca9a75 data/actuallyadditions/recipes/empowering/palis_block.json -d4bd8997ccd0540f717f420dab6190d1beca3083 data/actuallyadditions/recipes/empowering/restonia.json +db1b6e924352a7e097a5675bbf2a27888c6cbded data/actuallyadditions/recipes/empowering/restonia.json 1b59c946f4cfbfc9bc3a2e7562105cd3a0d09d69 data/actuallyadditions/recipes/empowering/restonia_block.json -141e2c09092abd099fac833b9be526bcb33f145a data/actuallyadditions/recipes/empowering/void.json +74a9dc2b89805e5c232fa66da8db8e96af0b0703 data/actuallyadditions/recipes/empowering/void.json d112aa7267600c2a55f5efb617cb574aaa56502e data/actuallyadditions/recipes/empowering/void_block.json -f4d47f3dbd7f20c539567efb8520ab2196a8bef8 data/actuallyadditions/recipes/engineer_goggles.json -3bcb439db08c2b931bec7d623c2b24738e515c0d data/actuallyadditions/recipes/engineer_goggles_advanced.json +3ade772cd50a533137dc1d27a2b060b85e525d8a data/actuallyadditions/recipes/engineers_goggles.json +f2c63622c99c5ff552e5ce408956d3fe40582e43 data/actuallyadditions/recipes/engineers_goggles_advanced.json +3f80260e5f00883491a0808a60d54072e9a14784 data/actuallyadditions/recipes/enori_aiot.json +e3fa7fb582968d3f8e5d707da657f72be19e6719 data/actuallyadditions/recipes/enori_axe.json +c8ba8497d2b5c05d507ae7ec8d427373191f23b9 data/actuallyadditions/recipes/enori_boots.json +9df7f47f17e572faeb804ce87325bfbddda80226 data/actuallyadditions/recipes/enori_chest.json +0d2ff55ae187e3404a3530d9eac1733a4b801240 data/actuallyadditions/recipes/enori_helmet.json +bb5831701eececa9ae24f3f62b16fe061bbe92e2 data/actuallyadditions/recipes/enori_hoe.json +b396710a504104df8287efca06def328ce043334 data/actuallyadditions/recipes/enori_leggings.json +6d5af75fdfa0b09a46585d837a4ec4c03424ab08 data/actuallyadditions/recipes/enori_pickaxe.json +6ccbfeb135b27aa009f579b36d04dd035f329373 data/actuallyadditions/recipes/enori_shovel.json +e4311b14ec6c3adec8b470f1e59e4f9fde7fa2ab data/actuallyadditions/recipes/enori_sword.json 80df7dd9bc05ca5666c4945d632f9bfdb4cd6191 data/actuallyadditions/recipes/ethetic_green_slab.json 76aab0f5fb24fb96fe6c2a64a4d216b75cbae28c data/actuallyadditions/recipes/ethetic_green_stairs.json e4d34fc15b29b452172b3c89b989570de83e20cc data/actuallyadditions/recipes/ethetic_green_wall.json @@ -330,28 +421,15 @@ e4d34fc15b29b452172b3c89b989570de83e20cc data/actuallyadditions/recipes/ethetic_ c5ef6af5b4a1c108a1995e29f4889df68e4b1ee5 data/actuallyadditions/recipes/ethetic_white_stairs.json 1b15143d70ee7861ef1097e153b7d5713f7ed72a data/actuallyadditions/recipes/ethetic_white_wall.json 2d997a2f34d94b7199793d603e22d9b0421b3df9 data/actuallyadditions/recipes/farmer.json -bd842a93d1eab6346b738722dc5aa41b891c3c8c data/actuallyadditions/recipes/filling_wand.json 255265eb6b031195d086e58ea91c3a2d5e22f9f1 data/actuallyadditions/recipes/filter.json 6ed420df34b5b17fcef2ad2c3f4fb4ed35bf739d data/actuallyadditions/recipes/firework_box.json -56be6cceb7f85e70588f74aa05f5e2c5b074a391 data/actuallyadditions/recipes/gold_paxel.json -41e2bfb4fd6283406209609d9071c9988dbc380a data/actuallyadditions/recipes/helm_crystal_diamatine.json -28b79dd9f3996d78a91e94bbb9f3664c1e6a793c data/actuallyadditions/recipes/helm_crystal_emeradic.json -7e2c7bf2312b17ce76169400b1c0422f3f928d47 data/actuallyadditions/recipes/helm_crystal_enori.json -343e5f8fb7fc0c17f8f92f38250a019ef30e3581 data/actuallyadditions/recipes/helm_crystal_palis.json -91334fc541821c8645052760d7dfe0e7fa52408f data/actuallyadditions/recipes/helm_crystal_restonia.json -7efdeff74f66fdbfef57df8aa49b6c18691a36f0 data/actuallyadditions/recipes/helm_crystal_void.json +7faeab31bd3d1e7a935a3f36d82cdd54466a72e4 data/actuallyadditions/recipes/gold_aiot.json +e86bd38ee24e97ed93d4b133af3850594e7b45de data/actuallyadditions/recipes/handheld_filler.json 70fae569768590dbb504c2f9c1be30fc215a0410 data/actuallyadditions/recipes/helm_quartz.json -f47e47ad27ee299ea47f18350f59fa870312b263 data/actuallyadditions/recipes/hoe_crystal_diamatine.json -47822d1bc7c992cae4ba5245f359c93acad54039 data/actuallyadditions/recipes/hoe_crystal_emeradic.json -ed22493423d02258df8a2bd429c593e14cc26465 data/actuallyadditions/recipes/hoe_crystal_enori.json -b513ae435b77afae4159a1fc77c5a9bf6f3b3ca1 data/actuallyadditions/recipes/hoe_crystal_palis.json -c8a9dc8de43add518374a1d537953fa374e73bbb data/actuallyadditions/recipes/hoe_crystal_restonia.json -c41d47824ee68089d4cdb7c919eaa18244e084b4 data/actuallyadditions/recipes/hoe_crystal_void.json 770bd7b359f455847ccf8e599227f9cdd053fe09 data/actuallyadditions/recipes/hoe_quartz.json -ae7a39e78ecfcbd01f573626f7eb7c3f152ad928 data/actuallyadditions/recipes/iron_paxel.json -19e3a5622aa95ee772fe73613a6195b5211a6c17 data/actuallyadditions/recipes/item_viewer.json +a65757e5037582adc3b69b21b533af3f045c0eb8 data/actuallyadditions/recipes/iron_aiot.json +ad12750777cb66c3e9f1943a83bcd83c0fe635d1 data/actuallyadditions/recipes/item_viewer.json 4a13de3f3dc0874020c283ecf29eaea2fdf13693 data/actuallyadditions/recipes/item_viewer_hopping.json -f74f604e20ed5a18f52ae8db8f4ddf8ed45f6cc1 data/actuallyadditions/recipes/laser/color_lens.json 64c7d859937622662bb7e029c0e6f1d62d45d3be data/actuallyadditions/recipes/laser/crystalize_diamatine_crystal.json 47add6ccc4dea960cd57fefc6081e6cd781225c2 data/actuallyadditions/recipes/laser/crystalize_diamatine_crystal_block.json 0888ceaedf3303126f9f0c7cb2cad2139a25bd81 data/actuallyadditions/recipes/laser/crystalize_emeradic_crystal.json @@ -364,77 +442,84 @@ eb3c897762aa2093fba5f2915cd6fcdebab3155d data/actuallyadditions/recipes/laser/cr 3d5a372fe62e5f0cab1cb95cafd3d26f98f429e2 data/actuallyadditions/recipes/laser/crystalize_restonia_crystal_block.json e896f65c335f164ee90908e6c44256e79536c6fc data/actuallyadditions/recipes/laser/crystalize_void_crystal.json ff88021e8f20f7899e57dd39cb837b44cb1c4169 data/actuallyadditions/recipes/laser/crystalize_void_crystal_block.json -da830ed0c3cd2a5394e5239d4dc1d359375f2eae data/actuallyadditions/recipes/laser/crystallized_canola_seed.json -8469182d30227475dc8ec0ee4d6167d74ebba460 data/actuallyadditions/recipes/laser/damage_lens.json +82956316d8a178fab9ff145bf5c7bd1aff121c81 data/actuallyadditions/recipes/laser/crystallized_canola_seed.json 8e41dd7c26223f939bef9ab8e67fa6681c0baf3a data/actuallyadditions/recipes/laser/ethetic_green_block.json 4078a2f4fafab1ccbc568870be410f15ce7f3baf data/actuallyadditions/recipes/laser/ethetic_white_block.json -371c74ae0d2408c94d15e1933f3c4111693b08fa data/actuallyadditions/recipes/laser/explosion_lens.json 4d1595d4d38781b0ae769667161b471ffc8fcaed data/actuallyadditions/recipes/laser/laser_relay.json a9716317aefab25b018be62d1b97e99d376d0a79 data/actuallyadditions/recipes/laser/laser_relay_fluids.json 27646d551a4a2004341f11720b95b455b9d9ffd6 data/actuallyadditions/recipes/laser/laser_relay_item.json d6f0843cf0a6ae5db0df5e9b4d6e1e02d4dd5eea data/actuallyadditions/recipes/laser/leather.json -343172d77619853d5666ba93e4f9599a5e7c6758 data/actuallyadditions/recipes/laser/lens.json +23f3b24015fcc2e1929ca06a36c85dcd93c9623d data/actuallyadditions/recipes/laser/lens.json +606e99fe6ad318e289850d25f13e3cb398c2fc10 data/actuallyadditions/recipes/laser/lens_of_certain_death.json +a12dafc249c4288679cf33bdc6112bbf1199d9fb data/actuallyadditions/recipes/laser/lens_of_color.json +faeaa7c378aae5db5b5c88b5fdba581c8eae8ef4 data/actuallyadditions/recipes/laser/lens_of_detonation.json 732aa97f2091aba89866265fa85f0af03c055891 data/actuallyadditions/recipes/laser/nether_wart.json e53142fdf926f6d0e4d4c440a89447cf0da8ebfd data/actuallyadditions/recipes/laser/prismarine_shard.json 005bbccc7e7c1b2ff2b284f6f22c53ef0dd75e94 data/actuallyadditions/recipes/laser/soul_sand.json -7887d6a8164dd41efbee54134065c55832e5ee01 data/actuallyadditions/recipes/laser_relay.json +a8936b53ca3d14003e610077c47ae4e30cb490a7 data/actuallyadditions/recipes/laser_relay.json 62f45115182193b9f6a45095e30f6b0764dc59be data/actuallyadditions/recipes/laser_relay_advanced.json -48f1826fae7adb662321ae26486e76e6a59a64c7 data/actuallyadditions/recipes/laser_relay_extreme.json -8973c67f90b7286edd6d919009438fcdbc5737e5 data/actuallyadditions/recipes/laser_relay_item_advanced.json -61ce69346b83ce79e6b4a607042af7cd1604fcdb data/actuallyadditions/recipes/laser_upgrade_invisibility.json -520f4a912583821aef34847c42abecc722468cf3 data/actuallyadditions/recipes/laser_upgrade_range.json -9928e9585f5541b8ad2883ed30aeb26c68038526 data/actuallyadditions/recipes/laser_wrench.json +d25889210fa5d51a38cb67457ed0371d7c15b828 data/actuallyadditions/recipes/laser_relay_extreme.json +643664b30944d61a79500f85b3f4fcd07a3fb50a data/actuallyadditions/recipes/laser_relay_item_advanced.json +9d2be3b8c2a8283f1775a80bb284bb8e0eb4dc1e data/actuallyadditions/recipes/laser_upgrade_invisibility.json +76350b31fd88f2eca84948302dba177d8d881180 data/actuallyadditions/recipes/laser_upgrade_range.json +4f62b97df15de5efd608b1d78156956e044347b7 data/actuallyadditions/recipes/laser_wrench.json f2692c35f23f12a2468dd84a1e66c1c9219a7048 data/actuallyadditions/recipes/laser_wrench_nbt.json -85d205af387f30fb7facbe5a71994e9ba660c79b data/actuallyadditions/recipes/leaf_blower.json +e51e98b13f1949ce31485b93133568792745243c data/actuallyadditions/recipes/leaf_blower.json ec31df01057ad65de89068b01f96b3fb9f837bb4 data/actuallyadditions/recipes/lens.json -e5c6af558dd96721d5e31cb8ed2683cc3792578f data/actuallyadditions/recipes/mining_lens.json -b0740ff7855ffa08c394caf0c852b6782ebc5b90 data/actuallyadditions/recipes/more_damage_lens.json -eb85ed35a9a1eb784a8d792235b34f34e92b4722 data/actuallyadditions/recipes/netherite_paxel.json -3de1f9ab823d71dfcb9c75af5abdbbeabe782f3c data/actuallyadditions/recipes/pants_crystal_diamatine.json -5a4985618453406c5e535611cf3dbb8d833cfdc8 data/actuallyadditions/recipes/pants_crystal_emeradic.json -1711f7c7c87a7a23d03aef97920322c16736d346 data/actuallyadditions/recipes/pants_crystal_enori.json -4fb4f271722d47a2494db818345fef4b70f7a9dd data/actuallyadditions/recipes/pants_crystal_palis.json -422a230e2899d9c21b286496f169d49ef711e303 data/actuallyadditions/recipes/pants_crystal_restonia.json -3b9709cfcc5a5e14d813982dda5c7248421d9db1 data/actuallyadditions/recipes/pants_crystal_void.json +634680e59ff81f293e3c44fd871e84fca96336ea data/actuallyadditions/recipes/lens_of_disenchanting.json +9a958fc55ca0f759841f9813a8449639e175bbcc data/actuallyadditions/recipes/lens_of_the_killer.json +1d560167a16962d870f0a4bf0cf9e74ac1431b3c data/actuallyadditions/recipes/lens_of_the_miner.json +7821b149dc37caa85b587a0276307f1b5cefaa03 data/actuallyadditions/recipes/netherite_aiot.json +2e2b1a33e5ecfb72a818d2e4ba8fe083f49b041c data/actuallyadditions/recipes/palis_aiot.json +21106732cd37767564077f5f0d0de9cc651ada83 data/actuallyadditions/recipes/palis_axe.json +4b57919de5f51bad0e32b50ce9bbb1d5ca66f473 data/actuallyadditions/recipes/palis_boots.json +984d58c00f929001e9e1d38aac88722f855a3741 data/actuallyadditions/recipes/palis_chest.json +b9e7384e2fd997539dfc6850d6f95a1075c054b8 data/actuallyadditions/recipes/palis_helmet.json +e7bed5bf5e7c7a28d27e131ca78fa34a2ef2b9b5 data/actuallyadditions/recipes/palis_hoe.json +b0b8c23e30fa6890c6cb3b4bcb0c21170e6e6cfd data/actuallyadditions/recipes/palis_leggings.json +30e05bdfb1edfcbdcf6b8a6b08723f5100cc3b73 data/actuallyadditions/recipes/palis_pickaxe.json +c91d538c767c582f8dbd9008c59d2069b253d85b data/actuallyadditions/recipes/palis_shovel.json +34f63da2e20810935ec211fb1a5e7cfc5d6d19e3 data/actuallyadditions/recipes/palis_sword.json 758d6f5eb78f8c51edbf50520207e25fae2c3956 data/actuallyadditions/recipes/pants_quartz.json -20129d4b9640f333583c997daf1c9d2c4e8aef3e data/actuallyadditions/recipes/paxel_crystal_diamatine.json -6c7f061fa61f2611871ada6580a3a2523f812cfa data/actuallyadditions/recipes/paxel_crystal_emeradic.json -4e1af5c1565350d773a1339c432cf5ad077fa3ce data/actuallyadditions/recipes/paxel_crystal_enori.json -5ae187f1b20d85b514fe5af5813688f6f9eb0d2a data/actuallyadditions/recipes/paxel_crystal_palis.json -25303dacc24c6f43cee92f1905098e80acd06fc2 data/actuallyadditions/recipes/paxel_crystal_restonia.json -9d7831f6a47e7ea013302dec29896ce6fcaa10f4 data/actuallyadditions/recipes/paxel_crystal_void.json 4590b472dcb90700ea525a3c6ac3f325458fab19 data/actuallyadditions/recipes/phantom_connector.json -9e0726d1dc22fa18f2816217f0aa139a2344f8ce data/actuallyadditions/recipes/pickaxe_crystal_diamatine.json -0eba3e088e17403e0671179ef45558d830837632 data/actuallyadditions/recipes/pickaxe_crystal_emeradic.json -cd638747424e06316da6dbb2c5deb1f86f5280b8 data/actuallyadditions/recipes/pickaxe_crystal_enori.json -6449cdedf3a930212adea06d51af2f84a898782a data/actuallyadditions/recipes/pickaxe_crystal_palis.json -13adfff99562502402bfd1a46cf3697062720af9 data/actuallyadditions/recipes/pickaxe_crystal_restonia.json -9426a0e1ba253febd9e0d92bcb8f1d386d648537 data/actuallyadditions/recipes/pickaxe_crystal_void.json 651e953fb75005cae3875b80c710111b2063d298 data/actuallyadditions/recipes/pickaxe_quartz.json -76a335a42f8e0eb78eca832ca7ac6bc40ecc1b26 data/actuallyadditions/recipes/quartz_paxel.json -973e1671c14850775627c1edf0335920fcc686a8 data/actuallyadditions/recipes/rice_slime.json -4bc1e43585856f6289558b91ac2cc2e09ae483e9 data/actuallyadditions/recipes/rice_slime_potion.json -0d3ae7456ea506f8706b96bb54402e0d677ffbac data/actuallyadditions/recipes/shock_suppressor.json -079f871518b70207476443860ffbb996d2706556 data/actuallyadditions/recipes/shovel_crystal_diamatine.json -54becb8c67bf9cf9bd1c84054c348032aba14d54 data/actuallyadditions/recipes/shovel_crystal_emeradic.json -16c237b506e1c6939610a809484d1ede9de60d1e data/actuallyadditions/recipes/shovel_crystal_enori.json -93338e71c49b59f5cad1695b6b9092727e61b7df data/actuallyadditions/recipes/shovel_crystal_palis.json -5d6f97b01a2d4a9edddcb6413836fc4411ed5c22 data/actuallyadditions/recipes/shovel_crystal_restonia.json -a1239f5077424dd74cdc389f7004986cd4b4cd5b data/actuallyadditions/recipes/shovel_crystal_void.json +68e7d4bd5e6ea852ef57ff5032d922a9a703fd77 data/actuallyadditions/recipes/quadruple_battery.json +f324a61d01222af796b76c18bbaca72df7b32a1b data/actuallyadditions/recipes/quartz_aiot.json +6797b2f74af9eb67a8ea6bdfa198cab7052db2a0 data/actuallyadditions/recipes/quintuple_battery.json +a43458d6498aed37aa8d8d62bfda5edade6e8ee0 data/actuallyadditions/recipes/restonia_aiot.json +6a81d06737e33b6d4803c10ad5972a657711b88e data/actuallyadditions/recipes/restonia_axe.json +4a198096a65a9a334c8bb7d23b9c7fa3c3f47f3f data/actuallyadditions/recipes/restonia_boots.json +c2b11da5d689cb22356820802db47eab03695a67 data/actuallyadditions/recipes/restonia_chest.json +592466458c18cfbb24aa03ef90563d0b5814a573 data/actuallyadditions/recipes/restonia_helmet.json +0c087ab0fc24f33bede93ff250784d8227596969 data/actuallyadditions/recipes/restonia_hoe.json +a63b57c27d8548ddd13d64d18b098d4f5c127a30 data/actuallyadditions/recipes/restonia_leggings.json +87f43655f63c5d1e3c9be16f7d5275e3ea7cc502 data/actuallyadditions/recipes/restonia_pickaxe.json +83d666f84f4b152982b908c8d3ec70afaee1a5d2 data/actuallyadditions/recipes/restonia_shovel.json +0557f47a88a4ea5566ec350ce89daa3b1248d233 data/actuallyadditions/recipes/restonia_sword.json +5b104e2c32eafdf802743d0e8d4c1a7e14071668 data/actuallyadditions/recipes/rice_slime.json +85d2537a973d520c9eaaf2f15109c265faa2df3a data/actuallyadditions/recipes/rice_slime_potion.json +d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_suppressor.json f1c767de96e510e34af65d40164103f35cc3f2fc data/actuallyadditions/recipes/shovel_quartz.json -8e0371dd623dce37c98a85924d3d3bd0f79dd6bb data/actuallyadditions/recipes/stone_paxel.json -ae24e9fed3a8aeaaca759b18eb27fa1aeb0e8c34 data/actuallyadditions/recipes/sword_crystal_diamatine.json -af2eff6ccd4c543b683815348b89422616bbd572 data/actuallyadditions/recipes/sword_crystal_emeradic.json -9ecb5ef57ad8aa037b87ff2b9ab8bddaa83dec73 data/actuallyadditions/recipes/sword_crystal_enori.json -0e2a3b3ff54362a669e226e84e738c0b65c49915 data/actuallyadditions/recipes/sword_crystal_palis.json -05ff7c567fca290c2246432ebb75f4cff7e61195 data/actuallyadditions/recipes/sword_crystal_restonia.json -46d57a046b549deac3aeab87df2cf22a6ef719eb data/actuallyadditions/recipes/sword_crystal_void.json +655fab699bb97ec252deb61d91fbef6f4738fe1c data/actuallyadditions/recipes/single_battery.json +8ebd738f3968564e22ba6841eb821e5064c78588 data/actuallyadditions/recipes/stone_aiot.json 6e59e0a3ef8eac77dc6523d2eadcd5acdc3e70d6 data/actuallyadditions/recipes/sword_quartz.json -ae5b4370205971633793b9f8b7f092afc76379d2 data/actuallyadditions/recipes/tele_staff.json +bc7a41d9f36cc43e146e0b727b6f439cc0d29343 data/actuallyadditions/recipes/teleport_staff.json bdf7dbf563485903e444400d341e56d0bf308481 data/actuallyadditions/recipes/tiny_torch.json -3e4977db87569275ec6aa2ef9a29ebc398a87ae4 data/actuallyadditions/recipes/vertical_digger.json -3d687620cb39920220cf4b1a2ae4ff51e3ebd869 data/actuallyadditions/recipes/void_bag.json -42e35f3a33d3d3ad09bcfa4b6971ef5340a1783c data/actuallyadditions/recipes/wings_of_the_bats.json -d779af99d8fe44ae5f1d43728fc7311b14657779 data/actuallyadditions/recipes/wooden_paxel.json +b1761a179c6a6a45cc5a8246680d65c45651911d data/actuallyadditions/recipes/travelers_sack.json +aac4c1515b4751f768da8b374aa3e0299ff8c760 data/actuallyadditions/recipes/triple_battery.json +54d64e82e95c22167b1a281cda38c30daa2c3c15 data/actuallyadditions/recipes/vertical_digger.json +f46b86ca16cf25043322489c3395b90940eed604 data/actuallyadditions/recipes/void_aiot.json +abbd86e0bc48510a70807d96ba98a2eb56d68937 data/actuallyadditions/recipes/void_axe.json +98016acf226a9ad674c62bdf7243127a7f5443ba data/actuallyadditions/recipes/void_boots.json +aba6e81369355292b8a7009675d5b283dd2a4161 data/actuallyadditions/recipes/void_chest.json +124352af6ac72f70382ab9ef1de05b4a612231c7 data/actuallyadditions/recipes/void_helmet.json +79cc40b6570b631d65f77f7fa062efff1c49cf85 data/actuallyadditions/recipes/void_hoe.json +efa2bc5337d5b4c0843f01eed22b7d25df72dcbe data/actuallyadditions/recipes/void_leggings.json +9faa34d5c7370ed8403de445dd47ee7fd0f93038 data/actuallyadditions/recipes/void_pickaxe.json +171ba8265e3578776d8cba1dda8a72033eeb3de4 data/actuallyadditions/recipes/void_sack.json +923ad700ae88e8dd4174db7bb0fa019dc872f953 data/actuallyadditions/recipes/void_shovel.json +e70c181f8b01b51148f00cb8cb943a40ceb01dd1 data/actuallyadditions/recipes/void_sword.json +17503be947b6e654606f28e6d07d197eb91abc88 data/actuallyadditions/recipes/wings_of_the_bats.json +5d0b3e0b27c0a7f82438fd24673866ce087d47f0 data/actuallyadditions/recipes/wooden_aiot.json a18f00e11fa55ff1b767eeab7a4756c2e0e93429 data/actuallyadditions/tags/items/coffee_beans.json 8c1e24d7377b6bdf64c13643d94c3826ac925c25 data/actuallyadditions/tags/items/tiny_coals.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller.json new file mode 100644 index 000000000..08d5c46ac --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/lamp_controller", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/lamp_controller" + }, + "facing=north": { + "model": "actuallyadditions:block/lamp_controller", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/lamp_controller", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/lamp_controller", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/lamp_controller", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_coil.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_coil.json new file mode 100644 index 000000000..76482c24f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_coil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_coil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_leaf_blower.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_leaf_blower.json new file mode 100644 index 000000000..1459da8f1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_leaf_blower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_leaf_blower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/basic_coil.json b/src/generated/resources/assets/actuallyadditions/models/item/basic_coil.json new file mode 100644 index 000000000..467dc1e0f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/basic_coil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/basic_coil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/bats_wing.json b/src/generated/resources/assets/actuallyadditions/models/item/bats_wing.json new file mode 100644 index 000000000..483bb494f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/bats_wing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/bats_wing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz.json new file mode 100644 index 000000000..4f1f865a3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/canola_seeds.json b/src/generated/resources/assets/actuallyadditions/models/item/canola_seeds.json new file mode 100644 index 000000000..b35665011 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/canola_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/canola_seeds" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/coffee_beans.json b/src/generated/resources/assets/actuallyadditions/models/item/coffee_beans.json new file mode 100644 index 000000000..9bf12b359 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/coffee_beans.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/coffee_beans" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/coffee_cup.json b/src/generated/resources/assets/actuallyadditions/models/item/coffee_cup.json new file mode 100644 index 000000000..3e587e586 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/coffee_cup.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/coffee_cup" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/coffee_seeds.json b/src/generated/resources/assets/actuallyadditions/models/item/coffee_seeds.json new file mode 100644 index 000000000..3c4ae6c87 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/coffee_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/coffee_seeds" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crafter_on_a_stick.json b/src/generated/resources/assets/actuallyadditions/models/item/crafter_on_a_stick.json new file mode 100644 index 000000000..840e69db6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crafter_on_a_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/crafter_on_a_stick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystallized_canola_seed.json b/src/generated/resources/assets/actuallyadditions/models/item/crystallized_canola_seed.json new file mode 100644 index 000000000..60c9a9fe9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystallized_canola_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/crystallized_canola_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_aiot.json new file mode 100644 index 000000000..cc6bd3ac1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal.json new file mode 100644 index 000000000..e04afe210 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_shard.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_shard.json new file mode 100644 index 000000000..6ad82f3af --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_crystal_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json new file mode 100644 index 000000000..e39682168 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamond_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/double_battery.json b/src/generated/resources/assets/actuallyadditions/models/item/double_battery.json new file mode 100644 index 000000000..12ee08a13 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/double_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/double_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/dough.json b/src/generated/resources/assets/actuallyadditions/models/item/dough.json new file mode 100644 index 000000000..f3befb6ab --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/dough.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/dough" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_core.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_core.json new file mode 100644 index 000000000..9ef1049e6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_core.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_core" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_aiot.json new file mode 100644 index 000000000..9830e8ac8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal.json new file mode 100644 index 000000000..f048e8ec9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_shard.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_shard.json new file mode 100644 index 000000000..2b01be3d9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_crystal_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_canola_seed.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_canola_seed.json new file mode 100644 index 000000000..7fb35801d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_canola_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empowered_canola_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_diamatine_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_diamatine_crystal.json new file mode 100644 index 000000000..37368b04a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_diamatine_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empowered_diamatine_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_emeradic_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_emeradic_crystal.json new file mode 100644 index 000000000..f31118acc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_emeradic_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empowered_emeradic_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_enori_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_enori_crystal.json new file mode 100644 index 000000000..6fa1678ab --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_enori_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empowered_enori_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_palis_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_palis_crystal.json new file mode 100644 index 000000000..09ada5fc0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_palis_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empowered_palis_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_restonia_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_restonia_crystal.json new file mode 100644 index 000000000..fe2ac6cda --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_restonia_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empowered_restonia_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_void_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_void_crystal.json new file mode 100644 index 000000000..9dbfa48b0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_void_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empowered_void_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empty_cup.json b/src/generated/resources/assets/actuallyadditions/models/item/empty_cup.json new file mode 100644 index 000000000..1cf6647c7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empty_cup.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/empty_cup" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ender_star.json b/src/generated/resources/assets/actuallyadditions/models/item/ender_star.json new file mode 100644 index 000000000..1d63146ef --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ender_star.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ender_star" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles.json b/src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles.json new file mode 100644 index 000000000..712136c92 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/engineers_goggles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles_advanced.json b/src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles_advanced.json new file mode 100644 index 000000000..c938de50a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/engineers_goggles_advanced.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/engineers_goggles_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_aiot.json new file mode 100644 index 000000000..fbbfb5d87 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal.json new file mode 100644 index 000000000..62ea28437 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_shard.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_shard.json new file mode 100644 index 000000000..d334fff5e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_crystal_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/fertilizer.json b/src/generated/resources/assets/actuallyadditions/models/item/fertilizer.json new file mode 100644 index 000000000..351654a30 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/fertilizer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/fertilizer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/filter.json b/src/generated/resources/assets/actuallyadditions/models/item/filter.json new file mode 100644 index 000000000..93f54ef22 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/filter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/filter" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/flax_seeds.json b/src/generated/resources/assets/actuallyadditions/models/item/flax_seeds.json new file mode 100644 index 000000000..1fef9641d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/flax_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/flax_seeds" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/gold_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/gold_aiot.json new file mode 100644 index 000000000..ef5cbb64b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/gold_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/gold_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/hairy_ball.json b/src/generated/resources/assets/actuallyadditions/models/item/hairy_ball.json new file mode 100644 index 000000000..8f3dff885 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/hairy_ball.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/hairy_ball" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/handheld_filler.json b/src/generated/resources/assets/actuallyadditions/models/item/handheld_filler.json new file mode 100644 index 000000000..5310c0b6b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/handheld_filler.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/handheld_filler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/iron_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/iron_aiot.json new file mode 100644 index 000000000..e76346eec --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/iron_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/iron_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/knife.json b/src/generated/resources/assets/actuallyadditions/models/item/knife.json new file mode 100644 index 000000000..0bbc031bf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/knife.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/knife" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_controller.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_controller.json new file mode 100644 index 000000000..6bf5a6610 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_controller" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_invisibility.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_invisibility.json new file mode 100644 index 000000000..8188fffb4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_invisibility.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/laser_upgrade_invisibility" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_range.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_range.json new file mode 100644 index 000000000..9482ca81e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_upgrade_range.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/laser_upgrade_range" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_wrench.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_wrench.json new file mode 100644 index 000000000..93e37bf8e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_wrench.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/laser_wrench" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/leaf_blower.json b/src/generated/resources/assets/actuallyadditions/models/item/leaf_blower.json new file mode 100644 index 000000000..792d21aa4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/leaf_blower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/leaf_blower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lens.json b/src/generated/resources/assets/actuallyadditions/models/item/lens.json new file mode 100644 index 000000000..b59183eb9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lens.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/lens" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lens_of_color.json b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_color.json new file mode 100644 index 000000000..2b39bc235 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_color.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/lens_of_color" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json new file mode 100644 index 000000000..9b8027a06 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/netherite_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_aiot.json new file mode 100644 index 000000000..7398af334 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal.json new file mode 100644 index 000000000..b6a28078a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_shard.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_shard.json new file mode 100644 index 000000000..72c709587 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_crystal_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/paper_cone.json b/src/generated/resources/assets/actuallyadditions/models/item/paper_cone.json new file mode 100644 index 000000000..5601162ab --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/paper_cone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/paper_cone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_connector.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_connector.json new file mode 100644 index 000000000..2cd77bc6e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_connector.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/phantom_connector" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/player_probe.json b/src/generated/resources/assets/actuallyadditions/models/item/player_probe.json new file mode 100644 index 000000000..b9d90857d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/player_probe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/player_probe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quadruple_battery.json b/src/generated/resources/assets/actuallyadditions/models/item/quadruple_battery.json new file mode 100644 index 000000000..f965a9e52 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quadruple_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quadruple_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_aiot.json new file mode 100644 index 000000000..b9808e5ff --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quintuple_battery.json b/src/generated/resources/assets/actuallyadditions/models/item/quintuple_battery.json new file mode 100644 index 000000000..d9ad27431 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quintuple_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quintuple_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/resonant_rice.json b/src/generated/resources/assets/actuallyadditions/models/item/resonant_rice.json new file mode 100644 index 000000000..f26d3d258 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/resonant_rice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/resonant_rice" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json new file mode 100644 index 000000000..5f228de89 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal.json new file mode 100644 index 000000000..e6ceaa8b5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_shard.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_shard.json new file mode 100644 index 000000000..0a7749390 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_crystal_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/rice_dough.json b/src/generated/resources/assets/actuallyadditions/models/item/rice_dough.json new file mode 100644 index 000000000..4094d1655 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/rice_dough.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/rice_dough" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/rice_seeds.json b/src/generated/resources/assets/actuallyadditions/models/item/rice_seeds.json new file mode 100644 index 000000000..5b794f283 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/rice_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/rice_seeds" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/rice_slimeball.json b/src/generated/resources/assets/actuallyadditions/models/item/rice_slimeball.json new file mode 100644 index 000000000..ae4230b97 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/rice_slimeball.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/rice_slimeball" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring.json b/src/generated/resources/assets/actuallyadditions/models/item/ring.json new file mode 100644 index 000000000..0966402c5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_growth.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_growth.json new file mode 100644 index 000000000..81aa92a20 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_growth.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_growth" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_magnetizing.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_magnetizing.json new file mode 100644 index 000000000..0d1c7a930 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_magnetizing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_magnetizing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/single_battery.json b/src/generated/resources/assets/actuallyadditions/models/item/single_battery.json new file mode 100644 index 000000000..bc474f02f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/single_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/single_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/solidified_experience.json b/src/generated/resources/assets/actuallyadditions/models/item/solidified_experience.json new file mode 100644 index 000000000..a876780be --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/solidified_experience.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/solidified_experience" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json new file mode 100644 index 000000000..2d243dbf5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/stone_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/teleport_staff.json b/src/generated/resources/assets/actuallyadditions/models/item/teleport_staff.json new file mode 100644 index 000000000..442ae2499 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/teleport_staff.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/teleport_staff" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/tiny_charcoal.json b/src/generated/resources/assets/actuallyadditions/models/item/tiny_charcoal.json new file mode 100644 index 000000000..0d6928a34 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/tiny_charcoal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/tiny_charcoal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/tiny_coal.json b/src/generated/resources/assets/actuallyadditions/models/item/tiny_coal.json new file mode 100644 index 000000000..51e7e13a7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/tiny_coal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/tiny_coal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/travelers_sack.json b/src/generated/resources/assets/actuallyadditions/models/item/travelers_sack.json new file mode 100644 index 000000000..b6ec0d688 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/travelers_sack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/travelers_sack" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/triple_battery.json b/src/generated/resources/assets/actuallyadditions/models/item/triple_battery.json new file mode 100644 index 000000000..11d90ed03 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/triple_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/triple_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json new file mode 100644 index 000000000..efd10a435 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_crystal.json b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal.json new file mode 100644 index 000000000..3a7bcdd36 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_shard.json b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_shard.json new file mode 100644 index 000000000..853cab59f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_crystal_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_sack.json b/src/generated/resources/assets/actuallyadditions/models/item/void_sack.json new file mode 100644 index 000000000..91e45c5fe --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_sack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_sack" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/water_bowl.json b/src/generated/resources/assets/actuallyadditions/models/item/water_bowl.json new file mode 100644 index 000000000..3b6cf510b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/water_bowl.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/water_bowl" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/wings_of_the_bats.json b/src/generated/resources/assets/actuallyadditions/models/item/wings_of_the_bats.json new file mode 100644 index 000000000..3cdfc12c8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/wings_of_the_bats.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/wings_of_the_bats" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json new file mode 100644 index 000000000..441f77605 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/wooden_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/worm.json b/src/generated/resources/assets/actuallyadditions/models/item/worm.json new file mode 100644 index 000000000..d829dbecc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/worm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/worm" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/coil_advanced.json b/src/generated/resources/data/actuallyadditions/recipes/advanced_coil.json similarity index 68% rename from src/generated/resources/data/actuallyadditions/recipes/coil_advanced.json rename to src/generated/resources/data/actuallyadditions/recipes/advanced_coil.json index a82b31221..35166a959 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/coil_advanced.json +++ b/src/generated/resources/data/actuallyadditions/recipes/advanced_coil.json @@ -7,13 +7,13 @@ ], "key": { "C": { - "item": "actuallyadditions:coil" + "item": "actuallyadditions:basic_coil" }, "G": { "item": "minecraft:gold_nugget" } }, "result": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/coil.json b/src/generated/resources/data/actuallyadditions/recipes/basic_coil.json similarity index 85% rename from src/generated/resources/data/actuallyadditions/recipes/coil.json rename to src/generated/resources/data/actuallyadditions/recipes/basic_coil.json index 016282197..4633a2985 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/coil.json +++ b/src/generated/resources/data/actuallyadditions/recipes/basic_coil.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:coil" + "item": "actuallyadditions:basic_coil" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/battery_box.json b/src/generated/resources/data/actuallyadditions/recipes/battery_box.json index e1d245b34..8f4bcdbd0 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/battery_box.json +++ b/src/generated/resources/data/actuallyadditions/recipes/battery_box.json @@ -8,7 +8,7 @@ "item": "actuallyadditions:enervator" }, { - "item": "actuallyadditions:coil" + "item": "actuallyadditions:basic_coil" } ], "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/booklet.json b/src/generated/resources/data/actuallyadditions/recipes/booklet.json index c52b61e5d..2ce2f3afb 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/booklet.json +++ b/src/generated/resources/data/actuallyadditions/recipes/booklet.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "actuallyadditions:canola_seed" + "item": "actuallyadditions:canola_seeds" }, { "item": "minecraft:paper" diff --git a/src/generated/resources/data/actuallyadditions/recipes/diamatine_aiot.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_aiot.json new file mode 100644 index 000000000..8ba0b1f1d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_aiot.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:diamatine_axe" + }, + { + "item": "actuallyadditions:diamatine_pickaxe" + }, + { + "item": "actuallyadditions:diamatine_sword" + }, + { + "item": "actuallyadditions:diamatine_shovel" + }, + { + "item": "actuallyadditions:diamatine_hoe" + } + ], + "result": { + "item": "actuallyadditions:diamatine_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_axe.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/axe_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_axe.json index e310d1dfc..6e681b1eb 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:axe_crystal_diamatine" + "item": "actuallyadditions:diamatine_axe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_boots.json similarity index 76% rename from src/generated/resources/data/actuallyadditions/recipes/boots_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_boots.json index a35bc0d67..7a319bf8e 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_boots.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:boots_crystal_diamatine" + "item": "actuallyadditions:diamatine_boots" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_chest.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/chest_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_chest.json index e0fda371d..3e01d1d2b 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_chest.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:chest_crystal_diamatine" + "item": "actuallyadditions:diamatine_chest" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_helmet.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/helm_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_helmet.json index 2e6154190..3631fed79 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_helmet.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:helm_crystal_diamatine" + "item": "actuallyadditions:diamatine_helmet" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_hoe.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_hoe.json index 3d81e22bc..1cdaeba26 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:hoe_crystal_diamatine" + "item": "actuallyadditions:diamatine_hoe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_leggings.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/pants_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_leggings.json index 2a672ab90..5c91519d2 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_leggings.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:pants_crystal_diamatine" + "item": "actuallyadditions:diamatine_leggings" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_pickaxe.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_pickaxe.json index 1570f3ceb..d9e4f3170 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:pickaxe_crystal_diamatine" + "item": "actuallyadditions:diamatine_pickaxe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_shovel.json similarity index 80% rename from src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_shovel.json index a9e4a7a4d..abfaa1f89 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:shovel_crystal_diamatine" + "item": "actuallyadditions:diamatine_shovel" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_sword.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/sword_crystal_diamatine.json rename to src/generated/resources/data/actuallyadditions/recipes/diamatine_sword.json index 12e235fa4..eb58133b0 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:sword_crystal_diamatine" + "item": "actuallyadditions:diamatine_sword" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/diamond_paxel.json b/src/generated/resources/data/actuallyadditions/recipes/diamond_aiot.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/diamond_paxel.json rename to src/generated/resources/data/actuallyadditions/recipes/diamond_aiot.json index d277d32a1..997320949 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/diamond_paxel.json +++ b/src/generated/resources/data/actuallyadditions/recipes/diamond_aiot.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "actuallyadditions:diamond_paxel" + "item": "actuallyadditions:diamond_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/disenchanting_lens.json b/src/generated/resources/data/actuallyadditions/recipes/disenchanting_lens.json deleted file mode 100644 index 738e6bfac..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/disenchanting_lens.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:lens" - }, - { - "item": "minecraft:enchanting_table" - }, - { - "item": "actuallyadditions:diamatine_empowered_crystal" - }, - { - "item": "actuallyadditions:diamatine_empowered_crystal" - }, - { - "item": "actuallyadditions:diamatine_empowered_crystal" - }, - { - "item": "actuallyadditions:diamatine_empowered_crystal" - }, - { - "item": "actuallyadditions:diamatine_empowered_crystal" - }, - { - "item": "actuallyadditions:diamatine_empowered_crystal" - }, - { - "item": "actuallyadditions:diamatine_empowered_crystal" - } - ], - "result": { - "item": "actuallyadditions:disenchanting_lens" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/display_stand.json b/src/generated/resources/data/actuallyadditions/recipes/display_stand.json index 1d7c9b59f..2427b9e6f 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/display_stand.json +++ b/src/generated/resources/data/actuallyadditions/recipes/display_stand.json @@ -7,7 +7,7 @@ ], "key": { "R": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" }, "E": { "item": "actuallyadditions:ethetic_green_block" diff --git a/src/generated/resources/data/actuallyadditions/recipes/battery_double.json b/src/generated/resources/data/actuallyadditions/recipes/double_battery.json similarity index 65% rename from src/generated/resources/data/actuallyadditions/recipes/battery_double.json rename to src/generated/resources/data/actuallyadditions/recipes/double_battery.json index 0741d6020..b074319b4 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/battery_double.json +++ b/src/generated/resources/data/actuallyadditions/recipes/double_battery.json @@ -7,17 +7,17 @@ ], "key": { "R": { - "item": "actuallyadditions:battery", + "item": "actuallyadditions:single_battery", "type": "actuallyadditions:nbt_target" }, "I": { "item": "actuallyadditions:enori_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { - "item": "actuallyadditions:battery_double" + "item": "actuallyadditions:double_battery" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill.json b/src/generated/resources/data/actuallyadditions/recipes/drill.json index abd15875d..87a6c6c07 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill.json @@ -10,7 +10,7 @@ "tag": "forge:gems/diamond" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" }, "R": { "item": "actuallyadditions:drill_core" diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_core.json b/src/generated/resources/data/actuallyadditions/recipes/drill_core.json index e1f359573..fb970af33 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill_core.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_core.json @@ -7,7 +7,7 @@ ], "key": { "C": { - "item": "actuallyadditions:coil" + "item": "actuallyadditions:basic_coil" }, "R": { "item": "actuallyadditions:restonia_crystal" diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_block_placing.json b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_block_placing.json index 0348f657e..4728fa42f 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_block_placing.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_block_placing.json @@ -13,7 +13,7 @@ "item": "minecraft:paper" }, "A": { - "item": "actuallyadditions:coil" + "item": "actuallyadditions:basic_coil" }, "R": { "item": "actuallyadditions:enori_crystal" diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_five_by_five.json b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_five_by_five.json index b8eed98e9..eaddf9d63 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_five_by_five.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_five_by_five.json @@ -7,13 +7,13 @@ ], "key": { "I": { - "item": "actuallyadditions:enori_empowered_crystal" + "item": "actuallyadditions:empowered_enori_crystal" }, "D": { "item": "actuallyadditions:diamatine_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_fortune_ii.json b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_fortune_ii.json index 84e379cfb..fc7f7f202 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_fortune_ii.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_fortune_ii.json @@ -10,7 +10,7 @@ "item": "minecraft:glowstone" }, "S": { - "item": "actuallyadditions:restonia_empowered_crystal" + "item": "actuallyadditions:empowered_restonia_crystal" }, "R": { "item": "actuallyadditions:ender_casing" diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_silk_touch.json b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_silk_touch.json index ca8d71b34..4cf9f8271 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_silk_touch.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_silk_touch.json @@ -13,7 +13,7 @@ "item": "actuallyadditions:diamatine_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_speed_iii.json b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_speed_iii.json index 474d5ef58..d941ff670 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_speed_iii.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_speed_iii.json @@ -7,13 +7,13 @@ ], "key": { "I": { - "item": "actuallyadditions:enori_empowered_crystal" + "item": "actuallyadditions:empowered_enori_crystal" }, "S": { "item": "minecraft:sugar" }, "R": { - "item": "actuallyadditions:diamatine_empowered_crystal" + "item": "actuallyadditions:empowered_diamatine_crystal" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_three_by_three.json b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_three_by_three.json index b382b0aaa..64a493fb2 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_three_by_three.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_upgrade_three_by_three.json @@ -13,7 +13,7 @@ "item": "actuallyadditions:diamatine_crystal" }, "C": { - "item": "actuallyadditions:coil" + "item": "actuallyadditions:basic_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/emeradic_aiot.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_aiot.json new file mode 100644 index 000000000..88142d333 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_aiot.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:emeradic_axe" + }, + { + "item": "actuallyadditions:emeradic_pickaxe" + }, + { + "item": "actuallyadditions:emeradic_sword" + }, + { + "item": "actuallyadditions:emeradic_shovel" + }, + { + "item": "actuallyadditions:emeradic_hoe" + } + ], + "result": { + "item": "actuallyadditions:emeradic_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_axe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/axe_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_axe.json index 6b2b32f25..1f418266a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:axe_crystal_emeradic" + "item": "actuallyadditions:emeradic_axe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_boots.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/boots_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_boots.json index d1f3e5956..d8083e304 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_boots.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:boots_crystal_emeradic" + "item": "actuallyadditions:emeradic_boots" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_chest.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/chest_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_chest.json index 53832a340..85720525c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_chest.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:chest_crystal_emeradic" + "item": "actuallyadditions:emeradic_chest" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_helmet.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/helm_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_helmet.json index f240f0b43..c53e43564 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_helmet.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:helm_crystal_emeradic" + "item": "actuallyadditions:emeradic_helmet" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_hoe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_hoe.json index 7a79af400..55da1d2f4 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:hoe_crystal_emeradic" + "item": "actuallyadditions:emeradic_hoe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_leggings.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/pants_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_leggings.json index be7b7777b..3c5b40163 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_leggings.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:pants_crystal_emeradic" + "item": "actuallyadditions:emeradic_leggings" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_pickaxe.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_pickaxe.json index ed8e14e14..fe9a5eea8 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:pickaxe_crystal_emeradic" + "item": "actuallyadditions:emeradic_pickaxe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_shovel.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_shovel.json index 5685d115a..5b386a26d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:shovel_crystal_emeradic" + "item": "actuallyadditions:emeradic_shovel" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_sword.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/sword_crystal_emeradic.json rename to src/generated/resources/data/actuallyadditions/recipes/emeradic_sword.json index 40f137d54..b4a2ff1b5 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:sword_crystal_emeradic" + "item": "actuallyadditions:emeradic_sword" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowerer.json b/src/generated/resources/data/actuallyadditions/recipes/empowerer.json index fb30d7411..27b7df31c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowerer.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowerer.json @@ -10,7 +10,7 @@ "item": "actuallyadditions:restonia_crystal" }, "B": { - "item": "actuallyadditions:battery_double" + "item": "actuallyadditions:double_battery" }, "C": { "item": "actuallyadditions:iron_casing" diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json index 8970a1f2e..5c6ff4d34 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json @@ -21,6 +21,6 @@ "time": 50, "color": 6522834, "result": { - "item": "actuallyadditions:diamatine_empowered_crystal" + "item": "actuallyadditions:empowered_diamatine_crystal" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json index 630beebc7..5d0cf0904 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json @@ -21,6 +21,6 @@ "time": 50, "color": 3492376, "result": { - "item": "actuallyadditions:emeradic_empowered_crystal" + "item": "actuallyadditions:empowered_emeradic_crystal" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json index e808db26d..202fc4743 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json @@ -5,16 +5,16 @@ }, "modifiers": [ { - "item": "actuallyadditions:canola_seed" + "item": "actuallyadditions:canola_seeds" }, { - "item": "actuallyadditions:canola_seed" + "item": "actuallyadditions:canola_seeds" }, { - "item": "actuallyadditions:canola_seed" + "item": "actuallyadditions:canola_seeds" }, { - "item": "actuallyadditions:canola_seed" + "item": "actuallyadditions:canola_seeds" } ], "energy": 1000, diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json index 9bba38035..305a43686 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json @@ -21,6 +21,6 @@ "time": 50, "color": 13421772, "result": { - "item": "actuallyadditions:enori_empowered_crystal" + "item": "actuallyadditions:empowered_enori_crystal" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json index 4deaff286..4bbafcb1d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json @@ -21,6 +21,6 @@ "time": 50, "color": 2437779, "result": { - "item": "actuallyadditions:palis_empowered_crystal" + "item": "actuallyadditions:empowered_palis_crystal" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json index fc13dd4c7..b90d7f499 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json @@ -21,6 +21,6 @@ "time": 50, "color": 10365735, "result": { - "item": "actuallyadditions:restonia_empowered_crystal" + "item": "actuallyadditions:empowered_restonia_crystal" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json index e7ce88008..77153aa06 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json @@ -21,6 +21,6 @@ "time": 50, "color": 3355443, "result": { - "item": "actuallyadditions:void_empowered_crystal" + "item": "actuallyadditions:empowered_void_crystal" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/engineer_goggles.json b/src/generated/resources/data/actuallyadditions/recipes/engineers_goggles.json similarity index 85% rename from src/generated/resources/data/actuallyadditions/recipes/engineer_goggles.json rename to src/generated/resources/data/actuallyadditions/recipes/engineers_goggles.json index 5ecfa3a19..c3858836c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/engineer_goggles.json +++ b/src/generated/resources/data/actuallyadditions/recipes/engineers_goggles.json @@ -16,6 +16,6 @@ } }, "result": { - "item": "actuallyadditions:engineer_goggles" + "item": "actuallyadditions:engineers_goggles" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/engineer_goggles_advanced.json b/src/generated/resources/data/actuallyadditions/recipes/engineers_goggles_advanced.json similarity index 54% rename from src/generated/resources/data/actuallyadditions/recipes/engineer_goggles_advanced.json rename to src/generated/resources/data/actuallyadditions/recipes/engineers_goggles_advanced.json index d26d9f783..d1aecc0fd 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/engineer_goggles_advanced.json +++ b/src/generated/resources/data/actuallyadditions/recipes/engineers_goggles_advanced.json @@ -6,16 +6,16 @@ ], "key": { "R": { - "item": "actuallyadditions:restonia_empowered_crystal" + "item": "actuallyadditions:empowered_restonia_crystal" }, "I": { "item": "minecraft:iron_bars" }, "G": { - "item": "actuallyadditions:engineer_goggles" + "item": "actuallyadditions:engineers_goggles" } }, "result": { - "item": "actuallyadditions:engineer_goggles_advanced" + "item": "actuallyadditions:engineers_goggles_advanced" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/enori_aiot.json b/src/generated/resources/data/actuallyadditions/recipes/enori_aiot.json new file mode 100644 index 000000000..f0d86ba96 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_aiot.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:enori_axe" + }, + { + "item": "actuallyadditions:enori_pickaxe" + }, + { + "item": "actuallyadditions:enori_sword" + }, + { + "item": "actuallyadditions:enori_shovel" + }, + { + "item": "actuallyadditions:enori_hoe" + } + ], + "result": { + "item": "actuallyadditions:enori_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_axe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/axe_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_axe.json index 2622a395d..13fc49d81 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:axe_crystal_enori" + "item": "actuallyadditions:enori_axe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_boots.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/boots_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_boots.json index 833632e1e..a6718320c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_boots.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:boots_crystal_enori" + "item": "actuallyadditions:enori_boots" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_chest.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/chest_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_chest.json index 10ab45ac8..d8599fad1 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_chest.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:chest_crystal_enori" + "item": "actuallyadditions:enori_chest" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_helmet.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/helm_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_helmet.json index 32d08398b..0d434cc1a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_helmet.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:helm_crystal_enori" + "item": "actuallyadditions:enori_helmet" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_hoe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_hoe.json index 0a93035d9..eb1331768 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:hoe_crystal_enori" + "item": "actuallyadditions:enori_hoe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_leggings.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/pants_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_leggings.json index 1ddd81438..11d59c16a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_leggings.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:pants_crystal_enori" + "item": "actuallyadditions:enori_leggings" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_pickaxe.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_pickaxe.json index e0720837e..b424c57db 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:pickaxe_crystal_enori" + "item": "actuallyadditions:enori_pickaxe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_shovel.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_shovel.json index d9540df87..882606535 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:shovel_crystal_enori" + "item": "actuallyadditions:enori_shovel" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/enori_sword.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/sword_crystal_enori.json rename to src/generated/resources/data/actuallyadditions/recipes/enori_sword.json index 11e129dfe..19ffc089d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_enori.json +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:sword_crystal_enori" + "item": "actuallyadditions:enori_sword" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/gold_paxel.json b/src/generated/resources/data/actuallyadditions/recipes/gold_aiot.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/gold_paxel.json rename to src/generated/resources/data/actuallyadditions/recipes/gold_aiot.json index 06874dc79..4c015321f 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/gold_paxel.json +++ b/src/generated/resources/data/actuallyadditions/recipes/gold_aiot.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "actuallyadditions:gold_paxel" + "item": "actuallyadditions:gold_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/filling_wand.json b/src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json similarity index 60% rename from src/generated/resources/data/actuallyadditions/recipes/filling_wand.json rename to src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json index 6eebe9ed1..bed55da8a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/filling_wand.json +++ b/src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json @@ -7,22 +7,22 @@ ], "key": { "I": { - "item": "actuallyadditions:enori_empowered_crystal" + "item": "actuallyadditions:empowered_enori_crystal" }, "P": { "item": "actuallyadditions:palis_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" }, "D": { "item": "actuallyadditions:diamatine_crystal" }, "B": { - "item": "actuallyadditions:battery_triple" + "item": "actuallyadditions:triple_battery" } }, "result": { - "item": "actuallyadditions:filling_wand" + "item": "actuallyadditions:handheld_filler" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/iron_paxel.json b/src/generated/resources/data/actuallyadditions/recipes/iron_aiot.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/iron_paxel.json rename to src/generated/resources/data/actuallyadditions/recipes/iron_aiot.json index 4b2f91a7c..88d745078 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/iron_paxel.json +++ b/src/generated/resources/data/actuallyadditions/recipes/iron_aiot.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "actuallyadditions:iron_paxel" + "item": "actuallyadditions:iron_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/item_viewer.json b/src/generated/resources/data/actuallyadditions/recipes/item_viewer.json index 953d1dab2..8a51caaf2 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/item_viewer.json +++ b/src/generated/resources/data/actuallyadditions/recipes/item_viewer.json @@ -10,7 +10,7 @@ "tag": "forge:dusts/redstone" }, "O": { - "item": "actuallyadditions:coil" + "item": "actuallyadditions:basic_coil" }, "R": { "item": "actuallyadditions:restonia_crystal" diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser/crystallized_canola_seed.json b/src/generated/resources/data/actuallyadditions/recipes/laser/crystallized_canola_seed.json index 44495a920..691428dab 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser/crystallized_canola_seed.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser/crystallized_canola_seed.json @@ -1,7 +1,7 @@ { "type": "actuallyadditions:laser", "ingredient": { - "item": "actuallyadditions:canola_seed" + "item": "actuallyadditions:canola_seeds" }, "energy": 2000, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser/damage_lens.json b/src/generated/resources/data/actuallyadditions/recipes/laser/damage_lens.json deleted file mode 100644 index 56c51c402..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/laser/damage_lens.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "actuallyadditions:laser", - "ingredient": { - "item": "actuallyadditions:explosion_lens" - }, - "energy": 5000, - "result": { - "item": "actuallyadditions:damage_lens" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser/lens.json b/src/generated/resources/data/actuallyadditions/recipes/laser/lens.json index dd2063b56..0b20b211c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser/lens.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser/lens.json @@ -1,7 +1,7 @@ { "type": "actuallyadditions:laser", "ingredient": { - "item": "actuallyadditions:damage_lens" + "item": "actuallyadditions:lens_of_certain_death" }, "energy": 5000, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_certain_death.json b/src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_certain_death.json new file mode 100644 index 000000000..dbf4c0948 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_certain_death.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:laser", + "ingredient": { + "item": "actuallyadditions:lens_of_detonation" + }, + "energy": 5000, + "result": { + "item": "actuallyadditions:lens_of_certain_death" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser/color_lens.json b/src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_color.json similarity index 74% rename from src/generated/resources/data/actuallyadditions/recipes/laser/color_lens.json rename to src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_color.json index 68207ab39..073f96725 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser/color_lens.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_color.json @@ -5,6 +5,6 @@ }, "energy": 5000, "result": { - "item": "actuallyadditions:color_lens" + "item": "actuallyadditions:lens_of_color" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser/explosion_lens.json b/src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_detonation.json similarity index 50% rename from src/generated/resources/data/actuallyadditions/recipes/laser/explosion_lens.json rename to src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_detonation.json index dd3932151..382761740 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser/explosion_lens.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser/lens_of_detonation.json @@ -1,10 +1,10 @@ { "type": "actuallyadditions:laser", "ingredient": { - "item": "actuallyadditions:color_lens" + "item": "actuallyadditions:lens_of_color" }, "energy": 5000, "result": { - "item": "actuallyadditions:explosion_lens" + "item": "actuallyadditions:lens_of_detonation" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser_relay.json b/src/generated/resources/data/actuallyadditions/recipes/laser_relay.json index 09a4c44c7..74543e7db 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser_relay.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser_relay.json @@ -16,7 +16,7 @@ "item": "actuallyadditions:restonia_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser_relay_extreme.json b/src/generated/resources/data/actuallyadditions/recipes/laser_relay_extreme.json index a0ac33175..5b435bf2b 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser_relay_extreme.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser_relay_extreme.json @@ -7,7 +7,7 @@ ], "key": { "I": { - "item": "actuallyadditions:diamatine_empowered_crystal" + "item": "actuallyadditions:empowered_diamatine_crystal" }, "R": { "item": "actuallyadditions:laser_relay_advanced" diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser_relay_item_advanced.json b/src/generated/resources/data/actuallyadditions/recipes/laser_relay_item_advanced.json index e8192eae0..7d39db7c6 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser_relay_item_advanced.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser_relay_item_advanced.json @@ -5,7 +5,7 @@ "item": "actuallyadditions:laser_relay_item" }, { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" }, { "item": "actuallyadditions:black_quartz" diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_invisibility.json b/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_invisibility.json index 77e05998b..8bf61be06 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_invisibility.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_invisibility.json @@ -13,7 +13,7 @@ "item": "actuallyadditions:void_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_range.json b/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_range.json index e68ab1af7..391539796 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_range.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser_upgrade_range.json @@ -13,7 +13,7 @@ "item": "actuallyadditions:restonia_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/laser_wrench.json b/src/generated/resources/data/actuallyadditions/recipes/laser_wrench.json index fd4ce1090..ffc945381 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/laser_wrench.json +++ b/src/generated/resources/data/actuallyadditions/recipes/laser_wrench.json @@ -7,7 +7,7 @@ ], "key": { "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" }, "S": { "item": "actuallyadditions:enori_crystal" diff --git a/src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json b/src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json index 392678134..f73e4e10a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json +++ b/src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json @@ -16,7 +16,7 @@ "item": "minecraft:flint" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/lens_of_disenchanting.json b/src/generated/resources/data/actuallyadditions/recipes/lens_of_disenchanting.json new file mode 100644 index 000000000..877fe5f48 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/lens_of_disenchanting.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:lens" + }, + { + "item": "minecraft:enchanting_table" + }, + { + "item": "actuallyadditions:empowered_diamatine_crystal" + }, + { + "item": "actuallyadditions:empowered_diamatine_crystal" + }, + { + "item": "actuallyadditions:empowered_diamatine_crystal" + }, + { + "item": "actuallyadditions:empowered_diamatine_crystal" + }, + { + "item": "actuallyadditions:empowered_diamatine_crystal" + }, + { + "item": "actuallyadditions:empowered_diamatine_crystal" + }, + { + "item": "actuallyadditions:empowered_diamatine_crystal" + } + ], + "result": { + "item": "actuallyadditions:lens_of_disenchanting" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/more_damage_lens.json b/src/generated/resources/data/actuallyadditions/recipes/lens_of_the_killer.json similarity index 65% rename from src/generated/resources/data/actuallyadditions/recipes/more_damage_lens.json rename to src/generated/resources/data/actuallyadditions/recipes/lens_of_the_killer.json index b1d594e18..167322151 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/more_damage_lens.json +++ b/src/generated/resources/data/actuallyadditions/recipes/lens_of_the_killer.json @@ -5,13 +5,13 @@ "item": "minecraft:diamond_sword" }, { - "item": "actuallyadditions:damage_lens" + "item": "actuallyadditions:lens_of_certain_death" }, { "item": "minecraft:enchanted_book" } ], "result": { - "item": "actuallyadditions:more_damage_lens" + "item": "actuallyadditions:lens_of_the_killer" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/mining_lens.json b/src/generated/resources/data/actuallyadditions/recipes/lens_of_the_miner.json similarity index 92% rename from src/generated/resources/data/actuallyadditions/recipes/mining_lens.json rename to src/generated/resources/data/actuallyadditions/recipes/lens_of_the_miner.json index 75ed58190..836a1501b 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/mining_lens.json +++ b/src/generated/resources/data/actuallyadditions/recipes/lens_of_the_miner.json @@ -35,6 +35,6 @@ } }, "result": { - "item": "actuallyadditions:mining_lens" + "item": "actuallyadditions:lens_of_the_miner" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/netherite_paxel.json b/src/generated/resources/data/actuallyadditions/recipes/netherite_aiot.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/netherite_paxel.json rename to src/generated/resources/data/actuallyadditions/recipes/netherite_aiot.json index 7ab3ce2f2..9bed90543 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/netherite_paxel.json +++ b/src/generated/resources/data/actuallyadditions/recipes/netherite_aiot.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "actuallyadditions:netherite_paxel" + "item": "actuallyadditions:netherite_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/palis_aiot.json b/src/generated/resources/data/actuallyadditions/recipes/palis_aiot.json new file mode 100644 index 000000000..012b513c7 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_aiot.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:palis_axe" + }, + { + "item": "actuallyadditions:palis_pickaxe" + }, + { + "item": "actuallyadditions:palis_sword" + }, + { + "item": "actuallyadditions:palis_shovel" + }, + { + "item": "actuallyadditions:palis_hoe" + } + ], + "result": { + "item": "actuallyadditions:palis_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_axe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/axe_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_axe.json index 843f95705..8ecd4e604 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:axe_crystal_palis" + "item": "actuallyadditions:palis_axe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_boots.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/boots_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_boots.json index 3daeec918..97b94cb22 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_boots.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:boots_crystal_palis" + "item": "actuallyadditions:palis_boots" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_chest.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/chest_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_chest.json index 1145dc6c6..e44ce320c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_chest.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:chest_crystal_palis" + "item": "actuallyadditions:palis_chest" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_helmet.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/helm_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_helmet.json index 256c05038..274097307 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_helmet.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:helm_crystal_palis" + "item": "actuallyadditions:palis_helmet" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_hoe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_hoe.json index fbc9fffb5..5ad9582a8 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:hoe_crystal_palis" + "item": "actuallyadditions:palis_hoe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_leggings.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/pants_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_leggings.json index 0b0534491..6a40ef833 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_leggings.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:pants_crystal_palis" + "item": "actuallyadditions:palis_leggings" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_pickaxe.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_pickaxe.json index a5e7e7acb..e377b6a87 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:pickaxe_crystal_palis" + "item": "actuallyadditions:palis_pickaxe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_shovel.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_shovel.json index cf6b07ef0..98eff093d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:shovel_crystal_palis" + "item": "actuallyadditions:palis_shovel" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/palis_sword.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/sword_crystal_palis.json rename to src/generated/resources/data/actuallyadditions/recipes/palis_sword.json index efe55aaf2..37be7a767 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_palis.json +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:sword_crystal_palis" + "item": "actuallyadditions:palis_sword" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_diamatine.json deleted file mode 100644 index 4ef233f11..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_diamatine.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:axe_crystal_diamatine" - }, - { - "item": "actuallyadditions:pickaxe_crystal_diamatine" - }, - { - "item": "actuallyadditions:sword_crystal_diamatine" - }, - { - "item": "actuallyadditions:shovel_crystal_diamatine" - }, - { - "item": "actuallyadditions:hoe_crystal_diamatine" - } - ], - "result": { - "item": "actuallyadditions:paxel_crystal_diamatine" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_emeradic.json deleted file mode 100644 index 313d4c9df..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_emeradic.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:axe_crystal_emeradic" - }, - { - "item": "actuallyadditions:pickaxe_crystal_emeradic" - }, - { - "item": "actuallyadditions:sword_crystal_emeradic" - }, - { - "item": "actuallyadditions:shovel_crystal_emeradic" - }, - { - "item": "actuallyadditions:hoe_crystal_emeradic" - } - ], - "result": { - "item": "actuallyadditions:paxel_crystal_emeradic" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_enori.json b/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_enori.json deleted file mode 100644 index f0d4c99a9..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_enori.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:axe_crystal_enori" - }, - { - "item": "actuallyadditions:pickaxe_crystal_enori" - }, - { - "item": "actuallyadditions:sword_crystal_enori" - }, - { - "item": "actuallyadditions:shovel_crystal_enori" - }, - { - "item": "actuallyadditions:hoe_crystal_enori" - } - ], - "result": { - "item": "actuallyadditions:paxel_crystal_enori" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_palis.json b/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_palis.json deleted file mode 100644 index 90dbc01b6..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_palis.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:axe_crystal_palis" - }, - { - "item": "actuallyadditions:pickaxe_crystal_palis" - }, - { - "item": "actuallyadditions:sword_crystal_palis" - }, - { - "item": "actuallyadditions:shovel_crystal_palis" - }, - { - "item": "actuallyadditions:hoe_crystal_palis" - } - ], - "result": { - "item": "actuallyadditions:paxel_crystal_palis" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_restonia.json deleted file mode 100644 index 152bf0b57..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_restonia.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:axe_crystal_restonia" - }, - { - "item": "actuallyadditions:pickaxe_crystal_restonia" - }, - { - "item": "actuallyadditions:sword_crystal_restonia" - }, - { - "item": "actuallyadditions:shovel_crystal_restonia" - }, - { - "item": "actuallyadditions:hoe_crystal_restonia" - } - ], - "result": { - "item": "actuallyadditions:paxel_crystal_restonia" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_void.json deleted file mode 100644 index 7c4d1db91..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/paxel_crystal_void.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:axe_crystal_void" - }, - { - "item": "actuallyadditions:pickaxe_crystal_void" - }, - { - "item": "actuallyadditions:sword_crystal_void" - }, - { - "item": "actuallyadditions:shovel_crystal_void" - }, - { - "item": "actuallyadditions:hoe_crystal_void" - } - ], - "result": { - "item": "actuallyadditions:paxel_crystal_void" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/battery_quadruple.json b/src/generated/resources/data/actuallyadditions/recipes/quadruple_battery.json similarity index 52% rename from src/generated/resources/data/actuallyadditions/recipes/battery_quadruple.json rename to src/generated/resources/data/actuallyadditions/recipes/quadruple_battery.json index ab8d31825..b1f776583 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/battery_quadruple.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quadruple_battery.json @@ -7,17 +7,17 @@ ], "key": { "R": { - "item": "actuallyadditions:battery_triple", + "item": "actuallyadditions:triple_battery", "type": "actuallyadditions:nbt_target" }, "I": { - "item": "actuallyadditions:enori_empowered_crystal" + "item": "actuallyadditions:empowered_enori_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { - "item": "actuallyadditions:battery_quadruple" + "item": "actuallyadditions:quadruple_battery" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/quartz_paxel.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_aiot.json similarity index 89% rename from src/generated/resources/data/actuallyadditions/recipes/quartz_paxel.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_aiot.json index 1d62d2de1..f374504c3 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/quartz_paxel.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_aiot.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "actuallyadditions:quartz_paxel" + "item": "actuallyadditions:quartz_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/battery_quintuple.json b/src/generated/resources/data/actuallyadditions/recipes/quintuple_battery.json similarity index 51% rename from src/generated/resources/data/actuallyadditions/recipes/battery_quintuple.json rename to src/generated/resources/data/actuallyadditions/recipes/quintuple_battery.json index 2f2e67f48..45221be94 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/battery_quintuple.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quintuple_battery.json @@ -7,17 +7,17 @@ ], "key": { "R": { - "item": "actuallyadditions:battery_quadruple", + "item": "actuallyadditions:quadruple_battery", "type": "actuallyadditions:nbt_target" }, "I": { - "item": "actuallyadditions:diamatine_empowered_crystal" + "item": "actuallyadditions:empowered_diamatine_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { - "item": "actuallyadditions:battery_quintuple" + "item": "actuallyadditions:quintuple_battery" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/restonia_aiot.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_aiot.json new file mode 100644 index 000000000..0e1b834e7 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_aiot.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:restonia_axe" + }, + { + "item": "actuallyadditions:restonia_pickaxe" + }, + { + "item": "actuallyadditions:restonia_sword" + }, + { + "item": "actuallyadditions:restonia_shovel" + }, + { + "item": "actuallyadditions:restonia_hoe" + } + ], + "result": { + "item": "actuallyadditions:restonia_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_axe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/axe_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_axe.json index c468eecf4..82dac08b5 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:axe_crystal_restonia" + "item": "actuallyadditions:restonia_axe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_boots.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/boots_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_boots.json index 0ce4a40ef..e801d42ed 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_boots.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:boots_crystal_restonia" + "item": "actuallyadditions:restonia_boots" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_chest.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/chest_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_chest.json index 056c61645..e42561dcc 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_chest.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:chest_crystal_restonia" + "item": "actuallyadditions:restonia_chest" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_helmet.json similarity index 77% rename from src/generated/resources/data/actuallyadditions/recipes/helm_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_helmet.json index b09997013..248b39639 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_helmet.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:helm_crystal_restonia" + "item": "actuallyadditions:restonia_helmet" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_hoe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_hoe.json index 1c7295a7d..f1df6dcd6 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:hoe_crystal_restonia" + "item": "actuallyadditions:restonia_hoe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_leggings.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/pants_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_leggings.json index 4edf0bc3d..44fc43a85 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_leggings.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:pants_crystal_restonia" + "item": "actuallyadditions:restonia_leggings" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_pickaxe.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_pickaxe.json index d538b048d..ef2a680d2 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:pickaxe_crystal_restonia" + "item": "actuallyadditions:restonia_pickaxe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_shovel.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_shovel.json index 4cd5c2abe..5ddd52c1b 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:shovel_crystal_restonia" + "item": "actuallyadditions:restonia_shovel" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_restonia.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_sword.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/sword_crystal_restonia.json rename to src/generated/resources/data/actuallyadditions/recipes/restonia_sword.json index 6cf267ba8..b2e31977d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_restonia.json +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:sword_crystal_restonia" + "item": "actuallyadditions:restonia_sword" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/rice_slime.json b/src/generated/resources/data/actuallyadditions/recipes/rice_slime.json index 56c48f0f7..4e9a792cd 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/rice_slime.json +++ b/src/generated/resources/data/actuallyadditions/recipes/rice_slime.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:rice_slime" + "item": "actuallyadditions:rice_slimeball" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/rice_slime_potion.json b/src/generated/resources/data/actuallyadditions/recipes/rice_slime_potion.json index 4c7ca8ef0..448d889dc 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/rice_slime_potion.json +++ b/src/generated/resources/data/actuallyadditions/recipes/rice_slime_potion.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:rice_slime" + "item": "actuallyadditions:rice_slimeball" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shock_suppressor.json b/src/generated/resources/data/actuallyadditions/recipes/shock_suppressor.json index 399356071..5e2dcd022 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shock_suppressor.json +++ b/src/generated/resources/data/actuallyadditions/recipes/shock_suppressor.json @@ -7,13 +7,13 @@ ], "key": { "A": { - "item": "actuallyadditions:void_empowered_crystal" + "item": "actuallyadditions:empowered_void_crystal" }, "O": { "tag": "forge:obsidian" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/battery.json b/src/generated/resources/data/actuallyadditions/recipes/single_battery.json similarity index 74% rename from src/generated/resources/data/actuallyadditions/recipes/battery.json rename to src/generated/resources/data/actuallyadditions/recipes/single_battery.json index 24090cf68..60e5a7bd8 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/battery.json +++ b/src/generated/resources/data/actuallyadditions/recipes/single_battery.json @@ -13,10 +13,10 @@ "item": "actuallyadditions:enori_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { - "item": "actuallyadditions:battery" + "item": "actuallyadditions:single_battery" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/stone_paxel.json b/src/generated/resources/data/actuallyadditions/recipes/stone_aiot.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/stone_paxel.json rename to src/generated/resources/data/actuallyadditions/recipes/stone_aiot.json index 94d0c67ea..6f7cc993f 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/stone_paxel.json +++ b/src/generated/resources/data/actuallyadditions/recipes/stone_aiot.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "actuallyadditions:stone_paxel" + "item": "actuallyadditions:stone_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/tele_staff.json b/src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json similarity index 65% rename from src/generated/resources/data/actuallyadditions/recipes/tele_staff.json rename to src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json index 5f81dddfe..f91041853 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/tele_staff.json +++ b/src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json @@ -7,7 +7,7 @@ ], "key": { "F": { - "item": "actuallyadditions:diamatine_empowered_crystal" + "item": "actuallyadditions:empowered_diamatine_crystal" }, "E": { "item": "actuallyadditions:ender_pearl_block" @@ -16,10 +16,10 @@ "item": "actuallyadditions:ender_casing" }, "B": { - "item": "actuallyadditions:battery" + "item": "actuallyadditions:single_battery" } }, "result": { - "item": "actuallyadditions:tele_staff" + "item": "actuallyadditions:teleport_staff" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/bag.json b/src/generated/resources/data/actuallyadditions/recipes/travelers_sack.json similarity index 87% rename from src/generated/resources/data/actuallyadditions/recipes/bag.json rename to src/generated/resources/data/actuallyadditions/recipes/travelers_sack.json index 6fd90ecb9..48120c1b5 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/bag.json +++ b/src/generated/resources/data/actuallyadditions/recipes/travelers_sack.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "actuallyadditions:bag" + "item": "actuallyadditions:travelers_sack" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/battery_triple.json b/src/generated/resources/data/actuallyadditions/recipes/triple_battery.json similarity index 52% rename from src/generated/resources/data/actuallyadditions/recipes/battery_triple.json rename to src/generated/resources/data/actuallyadditions/recipes/triple_battery.json index 53ce2143d..c0b8c636d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/battery_triple.json +++ b/src/generated/resources/data/actuallyadditions/recipes/triple_battery.json @@ -7,17 +7,17 @@ ], "key": { "R": { - "item": "actuallyadditions:battery_double", + "item": "actuallyadditions:double_battery", "type": "actuallyadditions:nbt_target" }, "I": { - "item": "actuallyadditions:enori_empowered_crystal" + "item": "actuallyadditions:empowered_enori_crystal" }, "C": { - "item": "actuallyadditions:coil_advanced" + "item": "actuallyadditions:advanced_coil" } }, "result": { - "item": "actuallyadditions:battery_triple" + "item": "actuallyadditions:triple_battery" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json b/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json index 33320cefc..7da7b7d0d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json +++ b/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json @@ -13,7 +13,7 @@ "item": "actuallyadditions:iron_casing" }, "C": { - "item": "actuallyadditions:void_empowered_crystal" + "item": "actuallyadditions:empowered_void_crystal" }, "D": { "item": "actuallyadditions:drill" diff --git a/src/generated/resources/data/actuallyadditions/recipes/void_aiot.json b/src/generated/resources/data/actuallyadditions/recipes/void_aiot.json new file mode 100644 index 000000000..97101c2a0 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/void_aiot.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:void_axe" + }, + { + "item": "actuallyadditions:void_pickaxe" + }, + { + "item": "actuallyadditions:void_sword" + }, + { + "item": "actuallyadditions:void_shovel" + }, + { + "item": "actuallyadditions:void_hoe" + } + ], + "result": { + "item": "actuallyadditions:void_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_axe.json similarity index 83% rename from src/generated/resources/data/actuallyadditions/recipes/axe_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_axe.json index c77f4b1c8..9c9b584d5 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/axe_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:axe_crystal_void" + "item": "actuallyadditions:void_axe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_boots.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/boots_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_boots.json index 153a81f43..f7945af05 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/boots_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_boots.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:boots_crystal_void" + "item": "actuallyadditions:void_boots" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_chest.json similarity index 79% rename from src/generated/resources/data/actuallyadditions/recipes/chest_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_chest.json index f8d95d001..bdccf4c61 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chest_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_chest.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:chest_crystal_void" + "item": "actuallyadditions:void_chest" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_helmet.json similarity index 78% rename from src/generated/resources/data/actuallyadditions/recipes/helm_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_helmet.json index b917e5628..f0ad40866 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/helm_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_helmet.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:helm_crystal_void" + "item": "actuallyadditions:void_helmet" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_hoe.json similarity index 83% rename from src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_hoe.json index a7d63ccc4..b8e418b78 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/hoe_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:hoe_crystal_void" + "item": "actuallyadditions:void_hoe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_leggings.json similarity index 79% rename from src/generated/resources/data/actuallyadditions/recipes/pants_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_leggings.json index b2e963559..69108ac75 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pants_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_leggings.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:pants_crystal_void" + "item": "actuallyadditions:void_leggings" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_pickaxe.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_pickaxe.json index c246801c6..4bb174d65 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:pickaxe_crystal_void" + "item": "actuallyadditions:void_pickaxe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/void_bag.json b/src/generated/resources/data/actuallyadditions/recipes/void_sack.json similarity index 73% rename from src/generated/resources/data/actuallyadditions/recipes/void_bag.json rename to src/generated/resources/data/actuallyadditions/recipes/void_sack.json index 8c8bd4735..ab104555c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/void_bag.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_sack.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "actuallyadditions:bag" + "item": "actuallyadditions:travelers_sack" }, { "tag": "forge:ender_pearls" @@ -15,6 +15,6 @@ } ], "result": { - "item": "actuallyadditions:void_bag" + "item": "actuallyadditions:void_sack" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_shovel.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_shovel.json index f927fbf21..26019ec53 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shovel_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:shovel_crystal_void" + "item": "actuallyadditions:void_shovel" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_void.json b/src/generated/resources/data/actuallyadditions/recipes/void_sword.json similarity index 82% rename from src/generated/resources/data/actuallyadditions/recipes/sword_crystal_void.json rename to src/generated/resources/data/actuallyadditions/recipes/void_sword.json index 7fedca399..c377c23d1 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/sword_crystal_void.json +++ b/src/generated/resources/data/actuallyadditions/recipes/void_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:sword_crystal_void" + "item": "actuallyadditions:void_sword" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/wings_of_the_bats.json b/src/generated/resources/data/actuallyadditions/recipes/wings_of_the_bats.json index a89feec2e..8cc445871 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/wings_of_the_bats.json +++ b/src/generated/resources/data/actuallyadditions/recipes/wings_of_the_bats.json @@ -7,7 +7,7 @@ ], "key": { "W": { - "item": "actuallyadditions:bat_wing" + "item": "actuallyadditions:bats_wing" }, "N": { "item": "actuallyadditions:diamatine_crystal_block" diff --git a/src/generated/resources/data/actuallyadditions/recipes/wooden_paxel.json b/src/generated/resources/data/actuallyadditions/recipes/wooden_aiot.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/wooden_paxel.json rename to src/generated/resources/data/actuallyadditions/recipes/wooden_aiot.json index 62d72785f..854dc6f81 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/wooden_paxel.json +++ b/src/generated/resources/data/actuallyadditions/recipes/wooden_aiot.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "actuallyadditions:wooden_paxel" + "item": "actuallyadditions:wooden_aiot" } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index d1201b64b..c270c7448 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -21,7 +21,7 @@ public class BlockRecipeGenerator extends RecipeProvider { @Override protected void buildShapelessRecipes(Consumer consumer) { //Battery Box - Recipe.shapeless(ActuallyBlocks.BATTERY_BOX.getItem()).ingredients(ActuallyBlocks.ENERGIZER.get(), ActuallyBlocks.ENERVATOR.get(), ActuallyItems.COIL.get()).save(consumer); + Recipe.shapeless(ActuallyBlocks.BATTERY_BOX.getItem()).ingredients(ActuallyBlocks.ENERGIZER.get(), ActuallyBlocks.ENERVATOR.get(), ActuallyItems.BASIC_COIL.get()).save(consumer); //Farmer Recipe.shaped(ActuallyBlocks.FARMER.getItem()) @@ -35,7 +35,7 @@ public class BlockRecipeGenerator extends RecipeProvider { Recipe.shaped(ActuallyBlocks.EMPOWERER.getItem()) .pattern(" R ", " B ", "CDC") .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) - .define('B', ActuallyItems.BATTERY_DOUBLE.get()) + .define('B', ActuallyItems.DOUBLE_BATTERY.get()) .define('C', ActuallyBlocks.IRON_CASING.get()) .define('D', ActuallyBlocks.DISPLAY_STAND.get()) .save(consumer); @@ -62,13 +62,13 @@ public class BlockRecipeGenerator extends RecipeProvider { .pattern("OAO", "ACA", "OAO") .define('A', ActuallyItems.EMPOWERED_VOID_CRYSTAL.get()) .define('O', Tags.Items.OBSIDIAN) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .save(consumer); //Display Stand Recipe.shaped(ActuallyBlocks.DISPLAY_STAND.getItem()) .pattern(" R ", "EEE", "GGG") - .define('R', ActuallyItems.COIL_ADVANCED.get()) + .define('R', ActuallyItems.ADVANCED_COIL.get()) .define('E', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get()) .define('G', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get()) .save(consumer); @@ -141,7 +141,7 @@ public class BlockRecipeGenerator extends RecipeProvider { .define('B', Tags.Items.STORAGE_BLOCKS_REDSTONE) .define('O', Tags.Items.OBSIDIAN) .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .save(consumer); // Advanced Laser Relay @@ -162,14 +162,14 @@ public class BlockRecipeGenerator extends RecipeProvider { // Whitelist Item Laser Relay Recipe.shapeless(ActuallyBlocks.LASER_RELAY_ITEM_ADVANCED.getItem()) - .ingredients(ActuallyBlocks.LASER_RELAY_ITEM.get(), ActuallyItems.COIL_ADVANCED.get(), ActuallyItems.BLACK_QUARTZ.get()) + .ingredients(ActuallyBlocks.LASER_RELAY_ITEM.get(), ActuallyItems.ADVANCED_COIL.get(), ActuallyItems.BLACK_QUARTZ.get()) .save(consumer); // Item Interface Recipe.shaped(ActuallyBlocks.ITEM_INTERFACE.getItem()) .pattern("OBO", "RCR", "OBO") .define('B', Tags.Items.DUSTS_REDSTONE) - .define('O', ActuallyItems.COIL.get()) + .define('O', ActuallyItems.BASIC_COIL.get()) .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) .define('C', Tags.Items.CHESTS_WOODEN) .save(consumer); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java index 42c767518..eb9892524 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java @@ -103,10 +103,10 @@ public class EmpoweringRecipeGenerator extends RecipeProvider { .addModifier(Tags.Items.SLIMEBALLS).save(consumer, "emeradic_block"); EmpoweringBuilder.builder(ActuallyItems.EMPOWERED_CANOLA_SEED.get(), ActuallyItems.CRYSTALLIZED_CANOLA_SEED.get(), 1000, 30, 0x015b4c) - .addModifier(ActuallyItems.CANOLA_SEED.get()) - .addModifier(ActuallyItems.CANOLA_SEED.get()) - .addModifier(ActuallyItems.CANOLA_SEED.get()) - .addModifier(ActuallyItems.CANOLA_SEED.get()).save(consumer, "empowered_canola"); + .addModifier(ActuallyItems.CANOLA_SEEDS.get()) + .addModifier(ActuallyItems.CANOLA_SEEDS.get()) + .addModifier(ActuallyItems.CANOLA_SEEDS.get()) + .addModifier(ActuallyItems.CANOLA_SEEDS.get()).save(consumer, "empowered_canola"); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java index 925163475..4ef968758 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java @@ -2,6 +2,7 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; import net.minecraft.item.Item; @@ -23,7 +24,7 @@ public class ItemModelGenerator extends ItemModelProvider { //simpleItem(ActuallyItems.BOOKLET); // will require complex I think // All items? - //ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem); + ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem); // Toolsets /* ActuallyItems.ALL_TOOL_SETS.stream() diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index 90a998d8c..35f613357 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -35,7 +35,7 @@ public class ItemRecipeGenerator extends RecipeProvider { generatePaxels(consumer); //Goggles - Recipe.shaped(ActuallyItems.ENGINEER_GOGGLES.get()) + Recipe.shaped(ActuallyItems.ENGINEERS_GOGGLES.get()) .pattern(" R ") .pattern("IGI") .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) @@ -43,12 +43,12 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('G', Tags.Items.GLASS).save(consumer); //Advanced Goggles - Recipe.shaped(ActuallyItems.ENGINEER_GOGGLES_ADVANCED.get()) + Recipe.shaped(ActuallyItems.ENGINEERS_GOGGLES_ADVANCED.get()) .pattern(" R ") .pattern("IGI") .define('R', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get()) .define('I', Items.IRON_BARS) - .define('G', ActuallyItems.ENGINEER_GOGGLES.get()).save(consumer); + .define('G', ActuallyItems.ENGINEERS_GOGGLES.get()).save(consumer); //Laser Upgrades //Invisibility @@ -58,7 +58,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("GGG") .define('G', Tags.Items.GLASS_BLACK) .define('R', ActuallyItems.VOID_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()).save(consumer); + .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); //Range Recipe.shaped(ActuallyItems.LASER_UPGRADE_RANGE.get(), 2) @@ -67,21 +67,21 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("CGG") .define('R', Items.COMPASS) .define('G', ActuallyItems.RESTONIA_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()).save(consumer); + .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); //Filling Wand - Recipe.shaped(ActuallyItems.FILLING_WAND.get()) + Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get()) .pattern("IPI") .pattern("DCD") .pattern(" B ") .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) .define('P', ActuallyItems.PALIS_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) - .define('B', ActuallyItems.BATTERY_TRIPLE.get()).save(consumer); + .define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(consumer); //Bag - Recipe.shaped(ActuallyItems.BAG.get()) + Recipe.shaped(ActuallyItems.TRAVELERS_SACK.get()) .pattern("SLS") .pattern("SCS") .pattern("LVL") @@ -91,8 +91,8 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('V', ActuallyBlocks.VOID_CRYSTAL.getItem()).save(consumer); //Void Bag - Recipe.shapeless(ActuallyItems.VOID_BAG.get()) - .requires(ActuallyItems.BAG.get()) + Recipe.shapeless(ActuallyItems.VOID_SACK.get()) + .requires(ActuallyItems.TRAVELERS_SACK.get()) .requires(Tags.Items.ENDER_PEARLS) .requires(Tags.Items.OBSIDIAN) .requires(ActuallyBlocks.VOID_CRYSTAL.getItem()) @@ -108,7 +108,7 @@ public class ItemRecipeGenerator extends RecipeProvider { //Booklet Recipe.shapeless(ActuallyItems.ITEM_BOOKLET.get()) - .ingredients(ActuallyItems.CANOLA_SEED.get(), Items.PAPER).save(consumer); + .ingredients(ActuallyItems.CANOLA_SEEDS.get(), Items.PAPER).save(consumer); //Clearing NBT Storage @@ -116,13 +116,13 @@ public class ItemRecipeGenerator extends RecipeProvider { Recipe.shapeless(ActuallyItems.PHANTOM_CONNECTOR.get()).ingredients(ActuallyItems.PHANTOM_CONNECTOR.get()).save(consumer); //Disenchanting Lens - Recipe.shapeless(ActuallyItems.DISENCHANTING_LENS.get()) + Recipe.shapeless(ActuallyItems.LENS_OF_DISENCHANTING.get()) .requires(ActuallyItems.LENS.get()) .requires(Items.ENCHANTING_TABLE) .requires(ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get(), 7).save(consumer); //Mining Lens - Recipe.shaped(ActuallyItems.MINING_LENS.get()) + Recipe.shaped(ActuallyItems.LENS_OF_THE_MINER.get()) .pattern("DGI") .pattern("CLB") .pattern("QPE") @@ -139,9 +139,9 @@ public class ItemRecipeGenerator extends RecipeProvider { //Killer Lens ItemStack enchantedBook = new ItemStack(Items.ENCHANTED_BOOK); enchantedBook.enchant(Enchantments.SHARPNESS, 5); - Recipe.shapeless(ActuallyItems.MORE_DAMAGE_LENS.get()) + Recipe.shapeless(ActuallyItems.LENS_OF_THE_KILLER.get()) .requires(Items.DIAMOND_SWORD) - .requires(ActuallyItems.DAMAGE_LENS.get()) + .requires(ActuallyItems.LENS_OF_CERTAIN_DEATH.get()) .requires(NBTIngredient.of(enchantedBook)).save(consumer); @@ -167,7 +167,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("C ") .pattern(" S ") .pattern(" S") - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .define('S', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); @@ -178,7 +178,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern(" R") .define('R', TheFoods.RICE).save(consumer); //TODO foods need worked on still.*/ - Recipe.shaped(ActuallyItems.RICE_SLIME.get()) + Recipe.shaped(ActuallyItems.RICE_SLIMEBALL.get()) .requiresBook() .pattern(" R ") .pattern("RBR") @@ -187,7 +187,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('B', Items.WATER_BUCKET) .save(consumer, new ResourceLocation(ActuallyAdditions.MODID, "rice_slime")); - Recipe.shaped(ActuallyItems.RICE_SLIME.get()) + Recipe.shaped(ActuallyItems.RICE_SLIMEBALL.get()) .requiresBook() .pattern(" R ") .pattern("RBR") @@ -204,7 +204,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('P', Items.PISTON) .define('F', Items.FLINT) - .define('C', ActuallyItems.COIL_ADVANCED.get()).save(consumer); + .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); //Drill //TODO is this still being colorable? Recipe.shaped(ActuallyItems.DRILL.get()) @@ -212,7 +212,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("CRC") .pattern("III") .define('D', Tags.Items.GEMS_DIAMOND) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .define('R', ActuallyItems.DRILL_CORE.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); @@ -221,19 +221,19 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("ICI") .pattern("CRC") .pattern("ICI") - .define('C', ActuallyItems.COIL.get()) + .define('C', ActuallyItems.BASIC_COIL.get()) .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); //Tele Staff - Recipe.shaped(ActuallyItems.TELE_STAFF.get()) + Recipe.shaped(ActuallyItems.TELEPORT_STAFF.get()) .pattern(" FE") .pattern(" S ") .pattern("SB ") .define('F', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get()) .define('E', ActuallyBlocks.ENDER_PEARL_BLOCK.getItem()) .define('S', ActuallyBlocks.ENDER_CASING.getItem()) - .define('B', ActuallyItems.BATTERY.get()).save(consumer); + .define('B', ActuallyItems.SINGLE_BATTERY.get()).save(consumer); //Drill Speed upgrade Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SPEED.get()) @@ -287,7 +287,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("DID") .define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) - .define('C', ActuallyItems.COIL.get()).save(consumer); + .define('C', ActuallyItems.BASIC_COIL.get()).save(consumer); //5x5 Recipe.shaped(ActuallyItems.DRILL_UPGRADE_FIVE_BY_FIVE.get()) @@ -296,7 +296,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("DID") .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()).save(consumer); + .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); //Silk Touch Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SILK_TOUCH.get()) @@ -305,7 +305,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("DSD") .define('D', ActuallyItems.EMERADIC_CRYSTAL.get()) .define('S', ActuallyItems.DIAMATINE_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()).save(consumer); + .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); //Placing Recipe.shaped(ActuallyItems.DRILL_UPGRADE_BLOCK_PLACING.get()) @@ -314,7 +314,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("CEC") .define('C', Tags.Items.COBBLESTONE) .define('E', Items.PAPER) - .define('A', ActuallyItems.COIL.get()) + .define('A', ActuallyItems.BASIC_COIL.get()) .define('R', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); //Bat Wings @@ -322,12 +322,12 @@ public class ItemRecipeGenerator extends RecipeProvider { .pattern("WNW") .pattern("WDW") .pattern("WNW") - .define('W', ActuallyItems.BAT_WING.get()) + .define('W', ActuallyItems.BATS_WING.get()) .define('N', ActuallyBlocks.DIAMATINE_CRYSTAL.getItem()) .define('D', ActuallyItems.ENDER_STAR.get()).save(consumer); //Coil - Recipe.shaped(ActuallyItems.COIL.get()) + Recipe.shaped(ActuallyItems.BASIC_COIL.get()) .pattern(" R ") .pattern("RIR") .pattern(" R ") @@ -335,61 +335,61 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()).save(consumer); //Advanced Coil - Recipe.shaped(ActuallyItems.COIL_ADVANCED.get()) + Recipe.shaped(ActuallyItems.ADVANCED_COIL.get()) .pattern("GGG") .pattern("GCG") .pattern("GGG") - .define('C', ActuallyItems.COIL.get()) + .define('C', ActuallyItems.BASIC_COIL.get()) .define('G', Items.GOLD_NUGGET).save(consumer); //Battery - Recipe.shaped(ActuallyItems.BATTERY.get()) + Recipe.shaped(ActuallyItems.SINGLE_BATTERY.get()) .pattern(" R ") .pattern("ICI") .pattern("III") .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .save(consumer); //Double Battery - Recipe.shaped(ActuallyItems.BATTERY_DOUBLE.get()) + Recipe.shaped(ActuallyItems.DOUBLE_BATTERY.get()) .pattern(" R ") .pattern("ICI") .pattern("III") - .define('R', TargetNBTIngredient.of(ActuallyItems.BATTERY.get())) + .define('R', TargetNBTIngredient.of(ActuallyItems.SINGLE_BATTERY.get())) .define('I', ActuallyItems.ENORI_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .save(WrappedRecipe.Inject(consumer, ActuallyRecipes.KEEP_DATA_SHAPED_RECIPE.get())); //Triple Battery - Recipe.shaped(ActuallyItems.BATTERY_TRIPLE.get()) + Recipe.shaped(ActuallyItems.TRIPLE_BATTERY.get()) .pattern(" R ") .pattern("ICI") .pattern("III") - .define('R', TargetNBTIngredient.of(ActuallyItems.BATTERY_DOUBLE.get())) + .define('R', TargetNBTIngredient.of(ActuallyItems.DOUBLE_BATTERY.get())) .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .save(WrappedRecipe.Inject(consumer, ActuallyRecipes.KEEP_DATA_SHAPED_RECIPE.get())); //Quad Battery - Recipe.shaped(ActuallyItems.BATTERY_QUADRUPLE.get()) + Recipe.shaped(ActuallyItems.QUADRUPLE_BATTERY.get()) .pattern(" R ") .pattern("ICI") .pattern("III") - .define('R', TargetNBTIngredient.of(ActuallyItems.BATTERY_TRIPLE.get())) + .define('R', TargetNBTIngredient.of(ActuallyItems.TRIPLE_BATTERY.get())) .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .save(WrappedRecipe.Inject(consumer, ActuallyRecipes.KEEP_DATA_SHAPED_RECIPE.get())); //Quintuple Battery - Recipe.shaped(ActuallyItems.BATTERY_QUINTUPLE.get()) + Recipe.shaped(ActuallyItems.QUINTUPLE_BATTERY.get()) .pattern(" R ") .pattern("ICI") .pattern("III") - .define('R', TargetNBTIngredient.of(ActuallyItems.BATTERY_QUADRUPLE.get())) + .define('R', TargetNBTIngredient.of(ActuallyItems.QUADRUPLE_BATTERY.get())) .define('I', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get()) - .define('C', ActuallyItems.COIL_ADVANCED.get()) + .define('C', ActuallyItems.ADVANCED_COIL.get()) .save(WrappedRecipe.Inject(consumer, ActuallyRecipes.KEEP_DATA_SHAPED_RECIPE.get())); @@ -471,29 +471,29 @@ public class ItemRecipeGenerator extends RecipeProvider { protected void generateEquipment(Consumer consumer) { addToolAndArmorRecipes(consumer, ActuallyItems.BLACK_QUARTZ, ActuallyItems.PICKAXE_QUARTZ, ActuallyItems.SWORD_QUARTZ, ActuallyItems.AXE_QUARTZ, ActuallyItems.SHOVEL_QUARTZ, ActuallyItems.HOE_QUARTZ, ActuallyItems.HELM_QUARTZ, ActuallyItems.CHEST_QUARTZ, ActuallyItems.PANTS_QUARTZ, ActuallyItems.BOOTS_QUARTZ); - addToolAndArmorRecipes(consumer, ActuallyItems.RESTONIA_CRYSTAL, ActuallyItems.PICKAXE_CRYSTAL_RESTONIA, ActuallyItems.SWORD_CRYSTAL_RESTONIA, ActuallyItems.AXE_CRYSTAL_RESTONIA, ActuallyItems.SHOVEL_CRYSTAL_RESTONIA, ActuallyItems.HOE_CRYSTAL_RESTONIA, ActuallyItems.HELM_CRYSTAL_RESTONIA, ActuallyItems.CHEST_CRYSTAL_RESTONIA, ActuallyItems.PANTS_CRYSTAL_RESTONIA, ActuallyItems.BOOTS_CRYSTAL_RESTONIA); - addToolAndArmorRecipes(consumer, ActuallyItems.EMERADIC_CRYSTAL, ActuallyItems.PICKAXE_CRYSTAL_EMERADIC, ActuallyItems.SWORD_CRYSTAL_EMERADIC, ActuallyItems.AXE_CRYSTAL_EMERADIC, ActuallyItems.SHOVEL_CRYSTAL_EMERADIC, ActuallyItems.HOE_CRYSTAL_EMERADIC, ActuallyItems.HELM_CRYSTAL_EMERADIC, ActuallyItems.CHEST_CRYSTAL_EMERADIC, ActuallyItems.PANTS_CRYSTAL_EMERADIC, ActuallyItems.BOOTS_CRYSTAL_EMERADIC); - addToolAndArmorRecipes(consumer, ActuallyItems.ENORI_CRYSTAL, ActuallyItems.PICKAXE_CRYSTAL_ENORI, ActuallyItems.SWORD_CRYSTAL_ENORI, ActuallyItems.AXE_CRYSTAL_ENORI, ActuallyItems.SHOVEL_CRYSTAL_ENORI, ActuallyItems.HOE_CRYSTAL_ENORI, ActuallyItems.HELM_CRYSTAL_ENORI, ActuallyItems.CHEST_CRYSTAL_ENORI, ActuallyItems.PANTS_CRYSTAL_ENORI, ActuallyItems.BOOTS_CRYSTAL_ENORI); - addToolAndArmorRecipes(consumer, ActuallyItems.DIAMATINE_CRYSTAL, ActuallyItems.PICKAXE_CRYSTAL_DIAMATINE, ActuallyItems.SWORD_CRYSTAL_DIAMATINE, ActuallyItems.AXE_CRYSTAL_DIAMATINE, ActuallyItems.SHOVEL_CRYSTAL_DIAMATINE, ActuallyItems.HOE_CRYSTAL_DIAMATINE, ActuallyItems.HELM_CRYSTAL_DIAMATINE, ActuallyItems.CHEST_CRYSTAL_DIAMATINE, ActuallyItems.PANTS_CRYSTAL_DIAMATINE, ActuallyItems.BOOTS_CRYSTAL_DIAMATINE); - addToolAndArmorRecipes(consumer, ActuallyItems.PALIS_CRYSTAL, ActuallyItems.PICKAXE_CRYSTAL_PALIS, ActuallyItems.SWORD_CRYSTAL_PALIS, ActuallyItems.AXE_CRYSTAL_PALIS, ActuallyItems.SHOVEL_CRYSTAL_PALIS, ActuallyItems.HOE_CRYSTAL_PALIS, ActuallyItems.HELM_CRYSTAL_PALIS, ActuallyItems.CHEST_CRYSTAL_PALIS, ActuallyItems.PANTS_CRYSTAL_PALIS, ActuallyItems.BOOTS_CRYSTAL_PALIS); - addToolAndArmorRecipes(consumer, ActuallyItems.VOID_CRYSTAL, ActuallyItems.PICKAXE_CRYSTAL_VOID, ActuallyItems.SWORD_CRYSTAL_VOID, ActuallyItems.AXE_CRYSTAL_VOID, ActuallyItems.SHOVEL_CRYSTAL_VOID, ActuallyItems.HOE_CRYSTAL_VOID, ActuallyItems.HELM_CRYSTAL_VOID, ActuallyItems.CHEST_CRYSTAL_VOID, ActuallyItems.PANTS_CRYSTAL_VOID, ActuallyItems.BOOTS_CRYSTAL_VOID); + addToolAndArmorRecipes(consumer, ActuallyItems.RESTONIA_CRYSTAL, ActuallyItems.RESTONIA_PICKAXE, ActuallyItems.RESTONIA_SWORD, ActuallyItems.RESTONIA_AXE, ActuallyItems.RESTONIA_SHOVEL, ActuallyItems.RESTONIA_HOE, ActuallyItems.RESTONIA_HELMET, ActuallyItems.RESTONIA_CHEST, ActuallyItems.RESTONIA_LEGGINGS, ActuallyItems.RESTONIA_BOOTS); + addToolAndArmorRecipes(consumer, ActuallyItems.EMERADIC_CRYSTAL, ActuallyItems.EMERADIC_PICKAXE, ActuallyItems.EMERADIC_SWORD, ActuallyItems.EMERADIC_AXE, ActuallyItems.EMERADIC_SHOVEL, ActuallyItems.EMERADIC_HOE, ActuallyItems.EMERADIC_HELMET, ActuallyItems.EMERADIC_CHEST, ActuallyItems.EMERADIC_LEGGINGS, ActuallyItems.EMERADIC_BOOTS); + addToolAndArmorRecipes(consumer, ActuallyItems.ENORI_CRYSTAL, ActuallyItems.ENORI_PICKAXE, ActuallyItems.ENORI_SWORD, ActuallyItems.ENORI_AXE, ActuallyItems.ENORI_SHOVEL, ActuallyItems.ENORI_HOE, ActuallyItems.ENORI_HELMET, ActuallyItems.ENORI_CHEST, ActuallyItems.ENORI_LEGGINGS, ActuallyItems.ENORI_BOOTS); + addToolAndArmorRecipes(consumer, ActuallyItems.DIAMATINE_CRYSTAL, ActuallyItems.DIAMATINE_PICKAXE, ActuallyItems.DIAMATINE_SWORD, ActuallyItems.DIAMATINE_AXE, ActuallyItems.DIAMATINE_SHOVEL, ActuallyItems.DIAMATINE_HOE, ActuallyItems.DIAMATINE_HELMET, ActuallyItems.DIAMATINE_CHEST, ActuallyItems.DIAMATINE_LEGGINGS, ActuallyItems.DIAMATINE_BOOTS); + addToolAndArmorRecipes(consumer, ActuallyItems.PALIS_CRYSTAL, ActuallyItems.PALIS_PICKAXE, ActuallyItems.PALIS_SWORD, ActuallyItems.PALIS_AXE, ActuallyItems.PALIS_SHOVEL, ActuallyItems.PALIS_HOE, ActuallyItems.PALIS_HELMET, ActuallyItems.PALIS_CHEST, ActuallyItems.PALIS_LEGGINGS, ActuallyItems.PALIS_BOOTS); + addToolAndArmorRecipes(consumer, ActuallyItems.VOID_CRYSTAL, ActuallyItems.VOID_PICKAXE, ActuallyItems.VOID_SWORD, ActuallyItems.VOID_AXE, ActuallyItems.VOID_SHOVEL, ActuallyItems.VOID_HOE, ActuallyItems.VOID_HELMET, ActuallyItems.VOID_CHEST, ActuallyItems.VOID_LEGGINGS, ActuallyItems.VOID_BOOTS); } protected void generatePaxels(Consumer consumer) { - addPaxel(consumer, ActuallyItems.WOODEN_PAXEL, Items.WOODEN_AXE, Items.WOODEN_PICKAXE, Items.WOODEN_SWORD, Items.WOODEN_SHOVEL, Items.WOODEN_HOE); - addPaxel(consumer, ActuallyItems.STONE_PAXEL, Items.STONE_AXE, Items.STONE_PICKAXE, Items.STONE_SWORD, Items.STONE_SHOVEL, Items.STONE_HOE); - addPaxel(consumer, ActuallyItems.IRON_PAXEL, Items.IRON_AXE, Items.IRON_PICKAXE, Items.IRON_SWORD, Items.IRON_SHOVEL, Items.IRON_HOE); - addPaxel(consumer, ActuallyItems.GOLD_PAXEL, Items.GOLDEN_AXE, Items.GOLDEN_PICKAXE, Items.GOLDEN_SWORD, Items.GOLDEN_SHOVEL, Items.GOLDEN_HOE); - addPaxel(consumer, ActuallyItems.DIAMOND_PAXEL, Items.DIAMOND_AXE, Items.DIAMOND_PICKAXE, Items.DIAMOND_SWORD, Items.DIAMOND_SHOVEL, Items.DIAMOND_HOE); - addPaxel(consumer, ActuallyItems.NETHERITE_PAXEL, Items.NETHERITE_AXE, Items.NETHERITE_PICKAXE, Items.NETHERITE_SWORD, Items.NETHERITE_SHOVEL, Items.NETHERITE_HOE); + addPaxel(consumer, ActuallyItems.WOODEN_AIOT, Items.WOODEN_AXE, Items.WOODEN_PICKAXE, Items.WOODEN_SWORD, Items.WOODEN_SHOVEL, Items.WOODEN_HOE); + addPaxel(consumer, ActuallyItems.STONE_AIOT, Items.STONE_AXE, Items.STONE_PICKAXE, Items.STONE_SWORD, Items.STONE_SHOVEL, Items.STONE_HOE); + addPaxel(consumer, ActuallyItems.IRON_AIOT, Items.IRON_AXE, Items.IRON_PICKAXE, Items.IRON_SWORD, Items.IRON_SHOVEL, Items.IRON_HOE); + addPaxel(consumer, ActuallyItems.GOLD_AIOT, Items.GOLDEN_AXE, Items.GOLDEN_PICKAXE, Items.GOLDEN_SWORD, Items.GOLDEN_SHOVEL, Items.GOLDEN_HOE); + addPaxel(consumer, ActuallyItems.DIAMOND_AIOT, Items.DIAMOND_AXE, Items.DIAMOND_PICKAXE, Items.DIAMOND_SWORD, Items.DIAMOND_SHOVEL, Items.DIAMOND_HOE); + addPaxel(consumer, ActuallyItems.NETHERITE_AIOT, Items.NETHERITE_AXE, Items.NETHERITE_PICKAXE, Items.NETHERITE_SWORD, Items.NETHERITE_SHOVEL, Items.NETHERITE_HOE); - addPaxel(consumer, ActuallyItems.QUARTZ_PAXEL, ActuallyItems.AXE_QUARTZ, ActuallyItems.PICKAXE_QUARTZ, ActuallyItems.SWORD_QUARTZ, ActuallyItems.SHOVEL_QUARTZ, ActuallyItems.HOE_QUARTZ); - addPaxel(consumer, ActuallyItems.PAXEL_CRYSTAL_RESTONIA, ActuallyItems.AXE_CRYSTAL_RESTONIA, ActuallyItems.PICKAXE_CRYSTAL_RESTONIA, ActuallyItems.SWORD_CRYSTAL_RESTONIA, ActuallyItems.SHOVEL_CRYSTAL_RESTONIA, ActuallyItems.HOE_CRYSTAL_RESTONIA); - addPaxel(consumer, ActuallyItems.PAXEL_CRYSTAL_EMERADIC, ActuallyItems.AXE_CRYSTAL_EMERADIC, ActuallyItems.PICKAXE_CRYSTAL_EMERADIC, ActuallyItems.SWORD_CRYSTAL_EMERADIC, ActuallyItems.SHOVEL_CRYSTAL_EMERADIC, ActuallyItems.HOE_CRYSTAL_EMERADIC); - addPaxel(consumer, ActuallyItems.PAXEL_CRYSTAL_PALIS, ActuallyItems.AXE_CRYSTAL_PALIS, ActuallyItems.PICKAXE_CRYSTAL_PALIS, ActuallyItems.SWORD_CRYSTAL_PALIS, ActuallyItems.SHOVEL_CRYSTAL_PALIS, ActuallyItems.HOE_CRYSTAL_PALIS); - addPaxel(consumer, ActuallyItems.PAXEL_CRYSTAL_DIAMATINE, ActuallyItems.AXE_CRYSTAL_DIAMATINE, ActuallyItems.PICKAXE_CRYSTAL_DIAMATINE, ActuallyItems.SWORD_CRYSTAL_DIAMATINE, ActuallyItems.SHOVEL_CRYSTAL_DIAMATINE, ActuallyItems.HOE_CRYSTAL_DIAMATINE); - addPaxel(consumer, ActuallyItems.PAXEL_CRYSTAL_VOID, ActuallyItems.AXE_CRYSTAL_VOID, ActuallyItems.PICKAXE_CRYSTAL_VOID, ActuallyItems.SWORD_CRYSTAL_VOID, ActuallyItems.SHOVEL_CRYSTAL_VOID, ActuallyItems.HOE_CRYSTAL_VOID); - addPaxel(consumer, ActuallyItems.PAXEL_CRYSTAL_ENORI, ActuallyItems.AXE_CRYSTAL_ENORI, ActuallyItems.PICKAXE_CRYSTAL_ENORI, ActuallyItems.SWORD_CRYSTAL_ENORI, ActuallyItems.SHOVEL_CRYSTAL_ENORI, ActuallyItems.HOE_CRYSTAL_ENORI); + addPaxel(consumer, ActuallyItems.QUARTZ_AIOT, ActuallyItems.AXE_QUARTZ, ActuallyItems.PICKAXE_QUARTZ, ActuallyItems.SWORD_QUARTZ, ActuallyItems.SHOVEL_QUARTZ, ActuallyItems.HOE_QUARTZ); + addPaxel(consumer, ActuallyItems.RESTONIA_AIOT, ActuallyItems.RESTONIA_AXE, ActuallyItems.RESTONIA_PICKAXE, ActuallyItems.RESTONIA_SWORD, ActuallyItems.RESTONIA_SHOVEL, ActuallyItems.RESTONIA_HOE); + addPaxel(consumer, ActuallyItems.EMERADIC_AIOT, ActuallyItems.EMERADIC_AXE, ActuallyItems.EMERADIC_PICKAXE, ActuallyItems.EMERADIC_SWORD, ActuallyItems.EMERADIC_SHOVEL, ActuallyItems.EMERADIC_HOE); + addPaxel(consumer, ActuallyItems.PALIS_AIOT, ActuallyItems.PALIS_AXE, ActuallyItems.PALIS_PICKAXE, ActuallyItems.PALIS_SWORD, ActuallyItems.PALIS_SHOVEL, ActuallyItems.PALIS_HOE); + addPaxel(consumer, ActuallyItems.DIAMATINE_AIOT, ActuallyItems.DIAMATINE_AXE, ActuallyItems.DIAMATINE_PICKAXE, ActuallyItems.DIAMATINE_SWORD, ActuallyItems.DIAMATINE_SHOVEL, ActuallyItems.DIAMATINE_HOE); + addPaxel(consumer, ActuallyItems.VOID_AIOT, ActuallyItems.VOID_AXE, ActuallyItems.VOID_PICKAXE, ActuallyItems.VOID_SWORD, ActuallyItems.VOID_SHOVEL, ActuallyItems.VOID_HOE); + addPaxel(consumer, ActuallyItems.ENORI_AIOT, ActuallyItems.ENORI_AXE, ActuallyItems.ENORI_PICKAXE, ActuallyItems.ENORI_SWORD, ActuallyItems.ENORI_SHOVEL, ActuallyItems.ENORI_HOE); } public static void addPaxel(Consumer consumer, RegistryObject output, Item axe, Item pickaxe, Item sword, Item shovel, Item hoe) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/LaserRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/LaserRecipeGenerator.java index 6631bc1f0..3af08eb2a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/LaserRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/LaserRecipeGenerator.java @@ -2,17 +2,14 @@ package de.ellpeck.actuallyadditions.data; import com.google.gson.JsonObject; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlock; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.crafting.LaserRecipe; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; -import net.minecraft.block.Blocks; import net.minecraft.data.DataGenerator; import net.minecraft.data.DirectoryCache; import net.minecraft.data.IFinishedRecipe; import net.minecraft.data.RecipeProvider; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ITag; @@ -52,10 +49,10 @@ public class LaserRecipeGenerator extends RecipeProvider { laserCrystalizeRecipe(consumer, ActuallyItems.ENORI_CRYSTAL.get(), Tags.Items.INGOTS_IRON, 80); //Lenses - laserRecipe(consumer, ActuallyItems.COLOR_LENS.get(), ActuallyItems.LENS.get(), 5000); - laserRecipe(consumer, ActuallyItems.EXPLOSION_LENS.get(), ActuallyItems.COLOR_LENS.get(), 5000); - laserRecipe(consumer, ActuallyItems.DAMAGE_LENS.get(), ActuallyItems.EXPLOSION_LENS.get(), 5000); - laserRecipe(consumer, ActuallyItems.LENS.get(), ActuallyItems.DAMAGE_LENS.get(), 5000); + laserRecipe(consumer, ActuallyItems.LENS_OF_COLOR.get(), ActuallyItems.LENS.get(), 5000); + laserRecipe(consumer, ActuallyItems.LENS_OF_DETONATION.get(), ActuallyItems.LENS_OF_COLOR.get(), 5000); + laserRecipe(consumer, ActuallyItems.LENS_OF_CERTAIN_DEATH.get(), ActuallyItems.LENS_OF_DETONATION.get(), 5000); + laserRecipe(consumer, ActuallyItems.LENS.get(), ActuallyItems.LENS_OF_CERTAIN_DEATH.get(), 5000); //Relays laserRecipe(consumer, ActuallyBlocks.LASER_RELAY_FLUIDS.getItem(), ActuallyBlocks.LASER_RELAY.getItem(), 2000); @@ -67,7 +64,7 @@ public class LaserRecipeGenerator extends RecipeProvider { laserRecipe(consumer, Items.LEATHER, Items.ROTTEN_FLESH, 20000); laserRecipe(consumer, Items.NETHER_WART, Items.RED_MUSHROOM, 150000); laserRecipe(consumer, Items.PRISMARINE_SHARD, Items.QUARTZ, 30000); - laserRecipe(consumer, ActuallyItems.CRYSTALLIZED_CANOLA_SEED.get(), ActuallyItems.CANOLA_SEED.get(), 2000); + laserRecipe(consumer, ActuallyItems.CRYSTALLIZED_CANOLA_SEED.get(), ActuallyItems.CANOLA_SEEDS.get(), 2000); laserRecipe(consumer, ActuallyBlocks.ETHETIC_WHITE_BLOCK.getItem(), Items.QUARTZ_BLOCK, 10); laserRecipe(consumer, ActuallyBlocks.ETHETIC_GREEN_BLOCK.getItem(), Items.CHISELED_QUARTZ_BLOCK, 10); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index 6a9555408..675f1f73f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -261,13 +261,13 @@ public final class ActuallyBlocks { //public static final AABlockReg<> WILD_PLANT = new AABlockReg<>("wild", BlockWildPlant::new); //TODO: what is this? //TODO: Are plants normal blocks / blockitems? i have no idea... news at 11... - public static final AABlockReg RICE = new AABlockReg<>("rice", () -> new BlockPlant(ActuallyItems.RICE_SEED), + public static final AABlockReg RICE = new AABlockReg<>("rice", () -> new BlockPlant(ActuallyItems.RICE_SEEDS), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg CANOLA = new AABlockReg<>("canola", () -> new BlockPlant(ActuallyItems.CANOLA_SEED), + public static final AABlockReg CANOLA = new AABlockReg<>("canola", () -> new BlockPlant(ActuallyItems.CANOLA_SEEDS), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg FLAX = new AABlockReg<>("flax", () -> new BlockPlant(ActuallyItems.FLAX_SEED), + public static final AABlockReg FLAX = new AABlockReg<>("flax", () -> new BlockPlant(ActuallyItems.FLAX_SEEDS), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg COFFEE = new AABlockReg<>("coffee", () -> new BlockPlant(ActuallyItems.COFFEE_SEED), + public static final AABlockReg COFFEE = new AABlockReg<>("coffee", () -> new BlockPlant(ActuallyItems.COFFEE_SEEDS), (b) -> new AABlockItem(b, defaultBlockItemProperties)); public static final AABlockReg GREENHOUSE_GLASS = new AABlockReg<>("greenhouse_glass", BlockGreenhouseGlass::new, (b) -> new AABlockItem(b, defaultBlockItemProperties)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java index 626bb40fd..a37e5b6e5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -10,6 +10,7 @@ package de.ellpeck.actuallyadditions.mod.items; +import com.google.common.collect.ImmutableSet; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.items.base.ItemArmorAA; @@ -28,6 +29,8 @@ import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; +import java.util.Set; + public final class ActuallyItems { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ActuallyAdditions.MODID); @@ -44,8 +47,8 @@ public final class ActuallyItems { public static final RegistryObject KNIFE_HANDLE = ITEMS.register("knife_handle", ItemBase::new); public static final RegistryObject DOUGH = ITEMS.register("dough", ItemBase::new); public static final RegistryObject RING = ITEMS.register("ring", ItemBase::new); - public static final RegistryObject COIL = ITEMS.register("coil", ItemBase::new); - public static final RegistryObject COIL_ADVANCED = ITEMS.register("coil_advanced", ItemBase::new); + public static final RegistryObject BASIC_COIL = ITEMS.register("basic_coil", ItemBase::new); + public static final RegistryObject ADVANCED_COIL = ITEMS.register("advanced_coil", ItemBase::new); public static final RegistryObject RICE_DOUGH = ITEMS.register("rice_dough", ItemBase::new); public static final RegistryObject TINY_COAL = ITEMS.register("tiny_coal", () -> new ItemBase() { @Override @@ -59,9 +62,9 @@ public final class ActuallyItems { return 200; } }); - public static final RegistryObject RICE_SLIME = ITEMS.register("rice_slime", ItemBase::new); - public static final RegistryObject CUP = ITEMS.register("cup", ItemBase::new); - public static final RegistryObject BAT_WING = ITEMS.register("bat_wing", ItemBase::new); + public static final RegistryObject RICE_SLIMEBALL = ITEMS.register("rice_slimeball", ItemBase::new); + public static final RegistryObject EMPTY_CUP = ITEMS.register("empty_cup", ItemBase::new); + public static final RegistryObject BATS_WING = ITEMS.register("bats_wing", ItemBase::new); public static final RegistryObject DRILL_CORE = ITEMS.register("drill_core", ItemBase::new); public static final RegistryObject BLACK_DYE = ITEMS.register("black_dye", ItemBase::new); public static final RegistryObject LENS = ITEMS.register("lens", ItemBase::new); @@ -88,50 +91,50 @@ public final class ActuallyItems { public static final RegistryObject EMERADIC_CRYSTAL = ITEMS.register("emeradic_crystal", ItemCrystal::new); public static final RegistryObject ENORI_CRYSTAL = ITEMS.register("enori_crystal", ItemCrystal::new); - public static final RegistryObject EMPOWERED_RESTONIA_CRYSTAL = ITEMS.register("restonia_empowered_crystal", () -> new ItemCrystal(true)); - public static final RegistryObject EMPOWERED_PALIS_CRYSTAL = ITEMS.register("palis_empowered_crystal", () -> new ItemCrystal(true)); - public static final RegistryObject EMPOWERED_DIAMATINE_CRYSTAL = ITEMS.register("diamatine_empowered_crystal", () -> new ItemCrystal(true)); - public static final RegistryObject EMPOWERED_VOID_CRYSTAL = ITEMS.register("void_empowered_crystal", () -> new ItemCrystal(true)); - public static final RegistryObject EMPOWERED_EMERADIC_CRYSTAL = ITEMS.register("emeradic_empowered_crystal", () -> new ItemCrystal(true)); - public static final RegistryObject EMPOWERED_ENORI_CRYSTAL = ITEMS.register("enori_empowered_crystal", () -> new ItemCrystal(true)); + public static final RegistryObject EMPOWERED_RESTONIA_CRYSTAL = ITEMS.register("empowered_restonia_crystal", () -> new ItemCrystal(true)); + public static final RegistryObject EMPOWERED_PALIS_CRYSTAL = ITEMS.register("empowered_palis_crystal", () -> new ItemCrystal(true)); + public static final RegistryObject EMPOWERED_DIAMATINE_CRYSTAL = ITEMS.register("empowered_diamatine_crystal", () -> new ItemCrystal(true)); + public static final RegistryObject EMPOWERED_VOID_CRYSTAL = ITEMS.register("empowered_void_crystal", () -> new ItemCrystal(true)); + public static final RegistryObject EMPOWERED_EMERADIC_CRYSTAL = ITEMS.register("empowered_emeradic_crystal", () -> new ItemCrystal(true)); + public static final RegistryObject EMPOWERED_ENORI_CRYSTAL = ITEMS.register("empowered_enori_crystal", () -> new ItemCrystal(true)); // BLACK QUARTZ public static final RegistryObject BLACK_QUARTZ = ITEMS.register("black_quartz", ItemBase::new); - public static final RegistryObject ENGINEER_GOGGLES_ADVANCED = ITEMS.register("engineer_goggles_advanced", () -> new ItemEngineerGoggles(true)); - public static final RegistryObject ENGINEER_GOGGLES = ITEMS.register("engineer_goggles", () -> new ItemEngineerGoggles(false)); + public static final RegistryObject ENGINEERS_GOGGLES_ADVANCED = ITEMS.register("engineers_goggles_advanced", () -> new ItemEngineerGoggles(true)); + public static final RegistryObject ENGINEERS_GOGGLES = ITEMS.register("engineers_goggles", () -> new ItemEngineerGoggles(false)); public static final RegistryObject LASER_UPGRADE_RANGE = ITEMS.register("laser_upgrade_range", ItemBase::new); public static final RegistryObject LASER_UPGRADE_INVISIBILITY = ITEMS.register("laser_upgrade_invisibility", ItemBase::new); - public static final RegistryObject FILLING_WAND = ITEMS.register("filling_wand", ItemFillingWand::new); - public static final RegistryObject BAG = ITEMS.register("bag", () -> new ItemBag(false)); - public static final RegistryObject VOID_BAG = ITEMS.register("void_bag", () -> new ItemBag(true)); + public static final RegistryObject HANDHELD_FILLER = ITEMS.register("handheld_filler", ItemFillingWand::new); + public static final RegistryObject TRAVELERS_SACK = ITEMS.register("travelers_sack", () -> new ItemBag(false)); + public static final RegistryObject VOID_SACK = ITEMS.register("void_sack", () -> new ItemBag(true)); public static final RegistryObject WORM = ITEMS.register("worm", ItemWorm::new); public static final RegistryObject PLAYER_PROBE = ITEMS.register("player_probe", ItemPlayerProbe::new); public static final RegistryObject FILTER = ITEMS.register("filter", ItemFilter::new); public static final RegistryObject WATER_BOWL = ITEMS.register("water_bowl", ItemWaterBowl::new); public static final RegistryObject CRATE_KEEPER = ITEMS.register("crate_keeper", () -> new ItemGeneric(defaultProps().stacksTo(1))); - public static final RegistryObject COLOR_LENS = ITEMS.register("color_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensColor)); - public static final RegistryObject EXPLOSION_LENS = ITEMS.register("explosion_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensDetonation)); - public static final RegistryObject DAMAGE_LENS = ITEMS.register("damage_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensDeath)); - public static final RegistryObject MORE_DAMAGE_LENS = ITEMS.register("more_damage_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensEvenMoarDeath)); - public static final RegistryObject DISENCHANTING_LENS = ITEMS.register("disenchanting_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensDisenchanting)); - public static final RegistryObject MINING_LENS = ITEMS.register("mining_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensMining)); + public static final RegistryObject LENS_OF_COLOR = ITEMS.register("lens_of_color", () -> new ItemLens(ActuallyAdditionsAPI.lensColor)); + public static final RegistryObject LENS_OF_DETONATION = ITEMS.register("lens_of_detonation", () -> new ItemLens(ActuallyAdditionsAPI.lensDetonation)); + public static final RegistryObject LENS_OF_CERTAIN_DEATH = ITEMS.register("lens_of_certain_death", () -> new ItemLens(ActuallyAdditionsAPI.lensDeath)); + public static final RegistryObject LENS_OF_THE_KILLER = ITEMS.register("lens_of_the_killer", () -> new ItemLens(ActuallyAdditionsAPI.lensEvenMoarDeath)); + public static final RegistryObject LENS_OF_DISENCHANTING = ITEMS.register("lens_of_disenchanting", () -> new ItemLens(ActuallyAdditionsAPI.lensDisenchanting)); + public static final RegistryObject LENS_OF_THE_MINER = ITEMS.register("lens_of_the_miner", () -> new ItemLens(ActuallyAdditionsAPI.lensMining)); public static final RegistryObject LASER_WRENCH = ITEMS.register("laser_wrench", ItemLaserWrench::new); // public static final RegistryObject itemChestToCrateUpgrade = ITEMS.register("", new ItemChestToCrateUpgrade("chest_to_crate_upgrade", TileEntityChest.class, InitBlocks.blockGiantChest.getDefaultState())); // public static final RegistryObject itemSmallToMediumCrateUpgrade = ITEMS.register("", new ItemChestToCrateUpgrade("small_to_medium_crate_upgrade", TileEntityGiantChest.class, InitBlocks.blockGiantChestMedium.getDefaultState())); // public static final RegistryObject itemMediumToLargeCrateUpgrade = ITEMS.register("", new ItemChestToCrateUpgrade("medium_to_large_crate_upgrade", TileEntityGiantChestMedium.class, InitBlocks.blockGiantChestLarge.getDefaultState())); public static final RegistryObject ITEM_BOOKLET = ITEMS.register("booklet", ItemBooklet::new); - public static final RegistryObject GROWTH_RING = ITEMS.register("growth_ring", ItemGrowthRing::new); - public static final RegistryObject MAGNET_RING = ITEMS.register("suction_ring", ItemMagnetRing::new); - public static final RegistryObject WATER_REMOVAL_RING = ITEMS.register("water_removal_ring", ItemWaterRemovalRing::new); - public static final RegistryObject TELE_STAFF = ITEMS.register("tele_staff", ItemTeleStaff::new); + public static final RegistryObject RING_OF_GROWTH = ITEMS.register("ring_of_growth", ItemGrowthRing::new); + public static final RegistryObject RING_OF_MAGNETIZING = ITEMS.register("ring_of_magnetizing", ItemMagnetRing::new); + //public static final RegistryObject WATER_REMOVAL_RING = ITEMS.register("water_removal_ring", ItemWaterRemovalRing::new); + public static final RegistryObject TELEPORT_STAFF = ITEMS.register("teleport_staff", ItemTeleStaff::new); public static final RegistryObject WINGS_OF_THE_BATS = ITEMS.register("wings_of_the_bats", ItemWingsOfTheBats::new); public static final RegistryObject DRILL = ITEMS.register("drill", ItemDrill::new); - public static final RegistryObject BATTERY = ITEMS.register("battery", () -> new ItemBattery(200000, 1000)); - public static final RegistryObject BATTERY_DOUBLE = ITEMS.register("battery_double", () -> new ItemBattery(350000, 5000)); - public static final RegistryObject BATTERY_TRIPLE = ITEMS.register("battery_triple", () -> new ItemBattery(600000, 10000)); - public static final RegistryObject BATTERY_QUADRUPLE = ITEMS.register("battery_quadruple", () -> new ItemBattery(1000000, 30000)); - public static final RegistryObject BATTERY_QUINTUPLE = ITEMS.register("battery_quintuple", () -> new ItemBattery(2000000, 100000)); + public static final RegistryObject SINGLE_BATTERY = ITEMS.register("single_battery", () -> new ItemBattery(200000, 1000)); + public static final RegistryObject DOUBLE_BATTERY = ITEMS.register("double_battery", () -> new ItemBattery(350000, 5000)); + public static final RegistryObject TRIPLE_BATTERY = ITEMS.register("triple_battery", () -> new ItemBattery(600000, 10000)); + public static final RegistryObject QUADRUPLE_BATTERY = ITEMS.register("quadruple_battery", () -> new ItemBattery(1000000, 30000)); + public static final RegistryObject QUINTUPLE_BATTERY = ITEMS.register("quintuple_battery", () -> new ItemBattery(2000000, 100000)); public static final RegistryObject DRILL_UPGRADE_SPEED = ITEMS.register("drill_upgrade_speed", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED)); public static final RegistryObject DRILL_UPGRADE_SPEED_II = ITEMS.register("drill_upgrade_speed_ii", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II)); public static final RegistryObject DRILL_UPGRADE_SPEED_III = ITEMS.register("drill_upgrade_speed_iii", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III)); @@ -152,7 +155,7 @@ public final class ActuallyItems { public static final RegistryObject DUST = ITEMS.register("dust", ItemDust::new); public static final RegistryObject SOLIDIFIED_EXPERIENCE = ITEMS.register("solidified_experience", ItemSolidifiedExperience::new); public static final RegistryObject LEAF_BLOWER = ITEMS.register("leaf_blower", () -> new ItemLeafBlower(false)); - public static final RegistryObject LEAF_BLOWER_ADVANCED = ITEMS.register("leaf_blower_advanced", () -> new ItemLeafBlower(true)); + public static final RegistryObject ADVANCED_LEAF_BLOWER = ITEMS.register("advanced_leaf_blower", () -> new ItemLeafBlower(true)); // TODO [port] unflatten public static final RegistryObject POTION_RING = ITEMS.register("potion_ring", () -> new ItemPotionRing(false)); @@ -161,10 +164,10 @@ public final class ActuallyItems { public static final RegistryObject HAIRY_BALL = ITEMS.register("hairy_ball", ItemHairBall::new); public static final RegistryObject COFFEE_BEANS = ITEMS.register("coffee_beans", ItemCoffeeBean::new); - public static final RegistryObject RICE_SEED = ITEMS.register("rice_seed", ItemBase::new); //() -> new ItemSeed("seedRice", ActuallyBlocks.RICE.get(), FOOD.get(), TheFoods.RICE.ordinal())); - public static final RegistryObject CANOLA_SEED = ITEMS.register("canola_seed", ItemBase::new); //() -> new ItemFoodSeed("seedCanola", ActuallyBlocks.CANOLA, itemMisc, 0, 1, 0.01F, 10).setPotionEffect(new PotionEffect(MobEffects.NAUSEA, 1000, 0), 0.2F)); - public static final RegistryObject FLAX_SEED = ITEMS.register("flax_seed", ItemBase::new); //() -> new ItemSeed("seedFlax", ActuallyBlocks.FLAX, Items.STRING, 0)); - public static final RegistryObject COFFEE_SEED = ITEMS.register("coffee_seed", ItemBase::new); //() -> new ItemSeed("seedCoffeeBeans", ActuallyBlocks.COFFEE, COFFEE_BEANS, 0)); + public static final RegistryObject RICE_SEEDS = ITEMS.register("rice_seeds", ItemBase::new); //() -> new ItemSeed("seedRice", ActuallyBlocks.RICE.get(), FOOD.get(), TheFoods.RICE.ordinal())); + public static final RegistryObject CANOLA_SEEDS = ITEMS.register("canola_seeds", ItemBase::new); //() -> new ItemFoodSeed("seedCanola", ActuallyBlocks.CANOLA, itemMisc, 0, 1, 0.01F, 10).setPotionEffect(new PotionEffect(MobEffects.NAUSEA, 1000, 0), 0.2F)); + public static final RegistryObject FLAX_SEEDS = ITEMS.register("flax_seeds", ItemBase::new); //() -> new ItemSeed("seedFlax", ActuallyBlocks.FLAX, Items.STRING, 0)); + public static final RegistryObject COFFEE_SEEDS = ITEMS.register("coffee_seeds", ItemBase::new); //() -> new ItemSeed("seedCoffeeBeans", ActuallyBlocks.COFFEE, COFFEE_BEANS, 0)); // TOOLS & ARMOR public static final RegistryObject HELM_QUARTZ = ITEMS.register("helm_quartz", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.HEAD)); @@ -177,79 +180,120 @@ public final class ActuallyItems { public static final RegistryObject SHOVEL_QUARTZ = ITEMS.register("shovel_quartz", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.BLACK_QUARTZ)); public static final RegistryObject SWORD_QUARTZ = ITEMS.register("sword_quartz", () -> new ItemSwordAA(ToolMaterials.BLACK_QUARTZ)); public static final RegistryObject HOE_QUARTZ = ITEMS.register("hoe_quartz", () -> new ItemHoeAA(ToolMaterials.BLACK_QUARTZ)); - public static final RegistryObject WOODEN_PAXEL = ITEMS.register("wooden_paxel", () -> new AllInOneTool(ItemTier.WOOD)); - public static final RegistryObject STONE_PAXEL = ITEMS.register("stone_paxel", () -> new AllInOneTool(ItemTier.STONE)); - public static final RegistryObject IRON_PAXEL = ITEMS.register("iron_paxel", () -> new AllInOneTool(ItemTier.IRON)); - public static final RegistryObject GOLD_PAXEL = ITEMS.register("gold_paxel", () -> new AllInOneTool(ItemTier.GOLD)); - public static final RegistryObject DIAMOND_PAXEL = ITEMS.register("diamond_paxel", () -> new AllInOneTool(ItemTier.DIAMOND)); - public static final RegistryObject NETHERITE_PAXEL = ITEMS.register("netherite_paxel", () -> new AllInOneTool(ItemTier.NETHERITE)); - public static final RegistryObject QUARTZ_PAXEL = ITEMS.register("quartz_paxel", () -> new AllInOneTool(ToolMaterials.BLACK_QUARTZ)); + public static final RegistryObject WOODEN_AIOT = ITEMS.register("wooden_aiot", () -> new AllInOneTool(ItemTier.WOOD)); + public static final RegistryObject STONE_AIOT = ITEMS.register("stone_aiot", () -> new AllInOneTool(ItemTier.STONE)); + public static final RegistryObject IRON_AIOT = ITEMS.register("iron_aiot", () -> new AllInOneTool(ItemTier.IRON)); + public static final RegistryObject GOLD_AIOT = ITEMS.register("gold_aiot", () -> new AllInOneTool(ItemTier.GOLD)); + public static final RegistryObject DIAMOND_AIOT = ITEMS.register("diamond_aiot", () -> new AllInOneTool(ItemTier.DIAMOND)); + public static final RegistryObject NETHERITE_AIOT = ITEMS.register("netherite_aiot", () -> new AllInOneTool(ItemTier.NETHERITE)); + public static final RegistryObject QUARTZ_AIOT = ITEMS.register("quartz_aiot", () -> new AllInOneTool(ToolMaterials.BLACK_QUARTZ)); - public static final RegistryObject PICKAXE_CRYSTAL_RESTONIA = ITEMS.register("pickaxe_crystal_restonia", () -> new ItemPickaxeAA(ToolMaterials.RESTONIA)); - public static final RegistryObject AXE_CRYSTAL_RESTONIA = ITEMS.register("axe_crystal_restonia", () -> new ItemAxeAA(ToolMaterials.RESTONIA)); - public static final RegistryObject SHOVEL_CRYSTAL_RESTONIA = ITEMS.register("shovel_crystal_restonia", ItemBase::new); // () -> new ItemShovelAA(ToolMaterials.RESTONIA)); - public static final RegistryObject SWORD_CRYSTAL_RESTONIA = ITEMS.register("sword_crystal_restonia", () -> new ItemSwordAA(ToolMaterials.RESTONIA)); - public static final RegistryObject HOE_CRYSTAL_RESTONIA = ITEMS.register("hoe_crystal_restonia", () -> new ItemHoeAA(ToolMaterials.RESTONIA)); - public static final RegistryObject HELM_CRYSTAL_RESTONIA = ITEMS.register("helm_crystal_restonia", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.HEAD)); - public static final RegistryObject CHEST_CRYSTAL_RESTONIA = ITEMS.register("chest_crystal_restonia", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.CHEST)); - public static final RegistryObject PANTS_CRYSTAL_RESTONIA = ITEMS.register("pants_crystal_restonia", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.LEGS)); - public static final RegistryObject BOOTS_CRYSTAL_RESTONIA = ITEMS.register("boots_crystal_restonia", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.FEET)); - public static final RegistryObject PAXEL_CRYSTAL_RESTONIA = ITEMS.register("paxel_crystal_restonia", () -> new AllInOneTool(ToolMaterials.RESTONIA)); + public static final RegistryObject RESTONIA_PICKAXE = ITEMS.register("restonia_pickaxe", () -> new ItemPickaxeAA(ToolMaterials.RESTONIA)); + public static final RegistryObject RESTONIA_AXE = ITEMS.register("restonia_axe", () -> new ItemAxeAA(ToolMaterials.RESTONIA)); + public static final RegistryObject RESTONIA_SHOVEL = ITEMS.register("restonia_shovel", ItemBase::new); // () -> new ItemShovelAA(ToolMaterials.RESTONIA)); + public static final RegistryObject RESTONIA_SWORD = ITEMS.register("restonia_sword", () -> new ItemSwordAA(ToolMaterials.RESTONIA)); + public static final RegistryObject RESTONIA_HOE = ITEMS.register("restonia_hoe", () -> new ItemHoeAA(ToolMaterials.RESTONIA)); + public static final RegistryObject RESTONIA_HELMET = ITEMS.register("restonia_helmet", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.HEAD)); + public static final RegistryObject RESTONIA_CHEST = ITEMS.register("restonia_chest", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.CHEST)); + public static final RegistryObject RESTONIA_LEGGINGS = ITEMS.register("restonia_leggings", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.LEGS)); + public static final RegistryObject RESTONIA_BOOTS = ITEMS.register("restonia_boots", () -> new ItemArmorAA(ArmorMaterials.RESTONIA, EquipmentSlotType.FEET)); + public static final RegistryObject RESTONIA_AIOT = ITEMS.register("restonia_aiot", () -> new AllInOneTool(ToolMaterials.RESTONIA)); - public static final RegistryObject PICKAXE_CRYSTAL_PALIS = ITEMS.register("pickaxe_crystal_palis", () -> new ItemPickaxeAA(ToolMaterials.PALIS)); - public static final RegistryObject AXE_CRYSTAL_PALIS = ITEMS.register("axe_crystal_palis", () -> new ItemAxeAA(ToolMaterials.PALIS)); - public static final RegistryObject SHOVEL_CRYSTAL_PALIS = ITEMS.register("shovel_crystal_palis", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.PALIS)); - public static final RegistryObject SWORD_CRYSTAL_PALIS = ITEMS.register("sword_crystal_palis", () -> new ItemSwordAA(ToolMaterials.PALIS)); - public static final RegistryObject HOE_CRYSTAL_PALIS = ITEMS.register("hoe_crystal_palis", () -> new ItemHoeAA(ToolMaterials.PALIS)); - public static final RegistryObject HELM_CRYSTAL_PALIS = ITEMS.register("helm_crystal_palis", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.HEAD)); - public static final RegistryObject CHEST_CRYSTAL_PALIS = ITEMS.register("chest_crystal_palis", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.CHEST)); - public static final RegistryObject PANTS_CRYSTAL_PALIS = ITEMS.register("pants_crystal_palis", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.LEGS)); - public static final RegistryObject BOOTS_CRYSTAL_PALIS = ITEMS.register("boots_crystal_palis", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.FEET)); - public static final RegistryObject PAXEL_CRYSTAL_PALIS = ITEMS.register("paxel_crystal_palis", () -> new AllInOneTool(ToolMaterials.PALIS)); + public static final RegistryObject PALIS_PICKAXE = ITEMS.register("palis_pickaxe", () -> new ItemPickaxeAA(ToolMaterials.PALIS)); + public static final RegistryObject PALIS_AXE = ITEMS.register("palis_axe", () -> new ItemAxeAA(ToolMaterials.PALIS)); + public static final RegistryObject PALIS_SHOVEL = ITEMS.register("palis_shovel", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.PALIS)); + public static final RegistryObject PALIS_SWORD = ITEMS.register("palis_sword", () -> new ItemSwordAA(ToolMaterials.PALIS)); + public static final RegistryObject PALIS_HOE = ITEMS.register("palis_hoe", () -> new ItemHoeAA(ToolMaterials.PALIS)); + public static final RegistryObject PALIS_HELMET = ITEMS.register("palis_helmet", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.HEAD)); + public static final RegistryObject PALIS_CHEST = ITEMS.register("palis_chest", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.CHEST)); + public static final RegistryObject PALIS_LEGGINGS = ITEMS.register("palis_leggings", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.LEGS)); + public static final RegistryObject PALIS_BOOTS = ITEMS.register("palis_boots", () -> new ItemArmorAA(ArmorMaterials.PALIS, EquipmentSlotType.FEET)); + public static final RegistryObject PALIS_AIOT = ITEMS.register("palis_aiot", () -> new AllInOneTool(ToolMaterials.PALIS)); - public static final RegistryObject PICKAXE_CRYSTAL_DIAMATINE = ITEMS.register("pickaxe_crystal_diamatine", () -> new ItemPickaxeAA(ToolMaterials.DIAMATINE)); - public static final RegistryObject AXE_CRYSTAL_DIAMATINE = ITEMS.register("axe_crystal_diamatine", () -> new ItemAxeAA(ToolMaterials.DIAMATINE)); - public static final RegistryObject SHOVEL_CRYSTAL_DIAMATINE = ITEMS.register("shovel_crystal_diamatine", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.DIAMATINE)); - public static final RegistryObject SWORD_CRYSTAL_DIAMATINE = ITEMS.register("sword_crystal_diamatine", () -> new ItemSwordAA(ToolMaterials.DIAMATINE)); - public static final RegistryObject HOE_CRYSTAL_DIAMATINE = ITEMS.register("hoe_crystal_diamatine", () -> new ItemHoeAA(ToolMaterials.DIAMATINE)); - public static final RegistryObject HELM_CRYSTAL_DIAMATINE = ITEMS.register("helm_crystal_diamatine", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.HEAD)); - public static final RegistryObject CHEST_CRYSTAL_DIAMATINE = ITEMS.register("chest_crystal_diamatine", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.CHEST)); - public static final RegistryObject PANTS_CRYSTAL_DIAMATINE = ITEMS.register("pants_crystal_diamatine", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.LEGS)); - public static final RegistryObject BOOTS_CRYSTAL_DIAMATINE = ITEMS.register("boots_crystal_diamatine", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.FEET)); - public static final RegistryObject PAXEL_CRYSTAL_DIAMATINE = ITEMS.register("paxel_crystal_diamatine", () -> new AllInOneTool(ToolMaterials.DIAMATINE)); + public static final RegistryObject DIAMATINE_PICKAXE = ITEMS.register("diamatine_pickaxe", () -> new ItemPickaxeAA(ToolMaterials.DIAMATINE)); + public static final RegistryObject DIAMATINE_AXE = ITEMS.register("diamatine_axe", () -> new ItemAxeAA(ToolMaterials.DIAMATINE)); + public static final RegistryObject DIAMATINE_SHOVEL = ITEMS.register("diamatine_shovel", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.DIAMATINE)); + public static final RegistryObject DIAMATINE_SWORD = ITEMS.register("diamatine_sword", () -> new ItemSwordAA(ToolMaterials.DIAMATINE)); + public static final RegistryObject DIAMATINE_HOE = ITEMS.register("diamatine_hoe", () -> new ItemHoeAA(ToolMaterials.DIAMATINE)); + public static final RegistryObject DIAMATINE_HELMET = ITEMS.register("diamatine_helmet", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.HEAD)); + public static final RegistryObject DIAMATINE_CHEST = ITEMS.register("diamatine_chest", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.CHEST)); + public static final RegistryObject DIAMATINE_LEGGINGS = ITEMS.register("diamatine_leggings", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.LEGS)); + public static final RegistryObject DIAMATINE_BOOTS = ITEMS.register("diamatine_boots", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.FEET)); + public static final RegistryObject DIAMATINE_AIOT = ITEMS.register("diamatine_aiot", () -> new AllInOneTool(ToolMaterials.DIAMATINE)); - public static final RegistryObject PICKAXE_CRYSTAL_VOID = ITEMS.register("pickaxe_crystal_void", () -> new ItemPickaxeAA(ToolMaterials.VOID)); - public static final RegistryObject AXE_CRYSTAL_VOID = ITEMS.register("axe_crystal_void", () -> new ItemAxeAA(ToolMaterials.VOID)); - public static final RegistryObject SHOVEL_CRYSTAL_VOID = ITEMS.register("shovel_crystal_void", ItemBase::new); // () -> new ItemShovelAA(ToolMaterials.VOID)); - public static final RegistryObject SWORD_CRYSTAL_VOID = ITEMS.register("sword_crystal_void", () -> new ItemSwordAA(ToolMaterials.VOID)); - public static final RegistryObject HOE_CRYSTAL_VOID = ITEMS.register("hoe_crystal_void", () -> new ItemHoeAA(ToolMaterials.VOID)); - public static final RegistryObject HELM_CRYSTAL_VOID = ITEMS.register("helm_crystal_void", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.HEAD)); - public static final RegistryObject CHEST_CRYSTAL_VOID = ITEMS.register("chest_crystal_void", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.CHEST)); - public static final RegistryObject PANTS_CRYSTAL_VOID = ITEMS.register("pants_crystal_void", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.LEGS)); - public static final RegistryObject BOOTS_CRYSTAL_VOID = ITEMS.register("boots_crystal_void", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.FEET)); - public static final RegistryObject PAXEL_CRYSTAL_VOID = ITEMS.register("paxel_crystal_void", () -> new AllInOneTool(ToolMaterials.VOID)); + public static final RegistryObject VOID_PICKAXE = ITEMS.register("void_pickaxe", () -> new ItemPickaxeAA(ToolMaterials.VOID)); + public static final RegistryObject VOID_AXE = ITEMS.register("void_axe", () -> new ItemAxeAA(ToolMaterials.VOID)); + public static final RegistryObject VOID_SHOVEL = ITEMS.register("void_shovel", ItemBase::new); // () -> new ItemShovelAA(ToolMaterials.VOID)); + public static final RegistryObject VOID_SWORD = ITEMS.register("void_sword", () -> new ItemSwordAA(ToolMaterials.VOID)); + public static final RegistryObject VOID_HOE = ITEMS.register("void_hoe", () -> new ItemHoeAA(ToolMaterials.VOID)); + public static final RegistryObject VOID_HELMET = ITEMS.register("void_helmet", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.HEAD)); + public static final RegistryObject VOID_CHEST = ITEMS.register("void_chest", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.CHEST)); + public static final RegistryObject VOID_LEGGINGS = ITEMS.register("void_leggings", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.LEGS)); + public static final RegistryObject VOID_BOOTS = ITEMS.register("void_boots", () -> new ItemArmorAA(ArmorMaterials.VOID, EquipmentSlotType.FEET)); + public static final RegistryObject VOID_AIOT = ITEMS.register("void_aiot", () -> new AllInOneTool(ToolMaterials.VOID)); - public static final RegistryObject PICKAXE_CRYSTAL_EMERADIC = ITEMS.register("pickaxe_crystal_emeradic", () -> new ItemPickaxeAA(ToolMaterials.EMERADIC)); - public static final RegistryObject AXE_CRYSTAL_EMERADIC = ITEMS.register("axe_crystal_emeradic", () -> new ItemAxeAA(ToolMaterials.EMERADIC)); - public static final RegistryObject SHOVEL_CRYSTAL_EMERADIC = ITEMS.register("shovel_crystal_emeradic", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.EMERADIC)); - public static final RegistryObject SWORD_CRYSTAL_EMERADIC = ITEMS.register("sword_crystal_emeradic", () -> new ItemSwordAA(ToolMaterials.EMERADIC)); - public static final RegistryObject HOE_CRYSTAL_EMERADIC = ITEMS.register("hoe_crystal_emeradic", () -> new ItemHoeAA(ToolMaterials.EMERADIC)); - public static final RegistryObject HELM_CRYSTAL_EMERADIC = ITEMS.register("helm_crystal_emeradic", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.HEAD)); - public static final RegistryObject CHEST_CRYSTAL_EMERADIC = ITEMS.register("chest_crystal_emeradic", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.CHEST)); - public static final RegistryObject PANTS_CRYSTAL_EMERADIC = ITEMS.register("pants_crystal_emeradic", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.LEGS)); - public static final RegistryObject BOOTS_CRYSTAL_EMERADIC = ITEMS.register("boots_crystal_emeradic", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.FEET)); - public static final RegistryObject PAXEL_CRYSTAL_EMERADIC = ITEMS.register("paxel_crystal_emeradic", () -> new AllInOneTool(ToolMaterials.EMERADIC)); + public static final RegistryObject EMERADIC_PICKAXE = ITEMS.register("emeradic_pickaxe", () -> new ItemPickaxeAA(ToolMaterials.EMERADIC)); + public static final RegistryObject EMERADIC_AXE = ITEMS.register("emeradic_axe", () -> new ItemAxeAA(ToolMaterials.EMERADIC)); + public static final RegistryObject EMERADIC_SHOVEL = ITEMS.register("emeradic_shovel", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.EMERADIC)); + public static final RegistryObject EMERADIC_SWORD = ITEMS.register("emeradic_sword", () -> new ItemSwordAA(ToolMaterials.EMERADIC)); + public static final RegistryObject EMERADIC_HOE = ITEMS.register("emeradic_hoe", () -> new ItemHoeAA(ToolMaterials.EMERADIC)); + public static final RegistryObject EMERADIC_HELMET = ITEMS.register("emeradic_helmet", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.HEAD)); + public static final RegistryObject EMERADIC_CHEST = ITEMS.register("emeradic_chest", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.CHEST)); + public static final RegistryObject EMERADIC_LEGGINGS = ITEMS.register("emeradic_leggings", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.LEGS)); + public static final RegistryObject EMERADIC_BOOTS = ITEMS.register("emeradic_boots", () -> new ItemArmorAA(ArmorMaterials.DIAMATINE, EquipmentSlotType.FEET)); + public static final RegistryObject EMERADIC_AIOT = ITEMS.register("emeradic_aiot", () -> new AllInOneTool(ToolMaterials.EMERADIC)); - public static final RegistryObject PICKAXE_CRYSTAL_ENORI = ITEMS.register("pickaxe_crystal_enori", () -> new ItemPickaxeAA(ToolMaterials.ENORI)); - public static final RegistryObject AXE_CRYSTAL_ENORI = ITEMS.register("axe_crystal_enori", () -> new ItemAxeAA(ToolMaterials.ENORI)); - public static final RegistryObject SHOVEL_CRYSTAL_ENORI = ITEMS.register("shovel_crystal_enori", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.ENORI)); - public static final RegistryObject SWORD_CRYSTAL_ENORI = ITEMS.register("sword_crystal_enori", () -> new ItemSwordAA(ToolMaterials.ENORI)); - public static final RegistryObject HOE_CRYSTAL_ENORI = ITEMS.register("hoe_crystal_enori", () -> new ItemHoeAA(ToolMaterials.ENORI)); - public static final RegistryObject HELM_CRYSTAL_ENORI = ITEMS.register("helm_crystal_enori", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.HEAD)); - public static final RegistryObject CHEST_CRYSTAL_ENORI = ITEMS.register("chest_crystal_enori", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.CHEST)); - public static final RegistryObject PANTS_CRYSTAL_ENORI = ITEMS.register("pants_crystal_enori", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.LEGS)); - public static final RegistryObject BOOTS_CRYSTAL_ENORI = ITEMS.register("boots_crystal_enori", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.FEET)); - public static final RegistryObject PAXEL_CRYSTAL_ENORI = ITEMS.register("paxel_crystal_enori", () -> new AllInOneTool(ToolMaterials.ENORI)); + public static final RegistryObject ENORI_PICKAXE = ITEMS.register("enori_pickaxe", () -> new ItemPickaxeAA(ToolMaterials.ENORI)); + public static final RegistryObject ENORI_AXE = ITEMS.register("enori_axe", () -> new ItemAxeAA(ToolMaterials.ENORI)); + public static final RegistryObject ENORI_SHOVEL = ITEMS.register("enori_shovel", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.ENORI)); + public static final RegistryObject ENORI_SWORD = ITEMS.register("enori_sword", () -> new ItemSwordAA(ToolMaterials.ENORI)); + public static final RegistryObject ENORI_HOE = ITEMS.register("enori_hoe", () -> new ItemHoeAA(ToolMaterials.ENORI)); + public static final RegistryObject ENORI_HELMET = ITEMS.register("enori_helmet", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.HEAD)); + public static final RegistryObject ENORI_CHEST = ITEMS.register("enori_chest", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.CHEST)); + public static final RegistryObject ENORI_LEGGINGS = ITEMS.register("enori_leggings", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.LEGS)); + public static final RegistryObject ENORI_BOOTS = ITEMS.register("enori_boots", () -> new ItemArmorAA(ArmorMaterials.ENORI, EquipmentSlotType.FEET)); + public static final RegistryObject ENORI_AIOT = ITEMS.register("enori_aiot", () -> new AllInOneTool(ToolMaterials.ENORI)); + + public static final Set> SIMPLE_ITEMS = ImmutableSet.of( + // Crystals + BLACK_QUARTZ, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL, + VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL, EMPOWERED_RESTONIA_CRYSTAL, + EMPOWERED_PALIS_CRYSTAL, EMPOWERED_DIAMATINE_CRYSTAL, EMPOWERED_VOID_CRYSTAL, EMPOWERED_EMERADIC_CRYSTAL, + EMPOWERED_ENORI_CRYSTAL, + // All in one tools + WOODEN_AIOT, STONE_AIOT, IRON_AIOT, GOLD_AIOT, DIAMOND_AIOT, NETHERITE_AIOT, QUARTZ_AIOT, ENORI_AIOT, + EMERADIC_AIOT, VOID_AIOT, DIAMATINE_AIOT, PALIS_AIOT, RESTONIA_AIOT, + // The rest? + RESTONIA_CRYSTAL_SHARD, PALIS_CRYSTAL_SHARD, DIAMATINE_CRYSTAL_SHARD, VOID_CRYSTAL_SHARD, EMERADIC_CRYSTAL_SHARD, + ENORI_CRYSTAL_SHARD, ENGINEERS_GOGGLES, ENGINEERS_GOGGLES_ADVANCED, LASER_UPGRADE_RANGE, LASER_UPGRADE_INVISIBILITY, + HANDHELD_FILLER, TRAVELERS_SACK, VOID_SACK, WORM, PLAYER_PROBE, FILTER, WATER_BOWL, PAPER_CONE, DOUGH, + RING, BASIC_COIL, ADVANCED_COIL, RICE_DOUGH, TINY_COAL, TINY_CHARCOAL, RICE_SLIMEBALL, /*CANOLA,*/ EMPTY_CUP, + BATS_WING, DRILL_CORE, LENS, ENDER_STAR, CRYSTALLIZED_CANOLA_SEED, EMPOWERED_CANOLA_SEED, LENS_OF_COLOR, +/* LENS_OF_DETONATION, LENS_OF_CERTAIN_DEATH, LENS_OF_THE_KILLER, LENS_OF_DISENCHANTING, LENS_OF_THE_MINER,*/ + LASER_WRENCH, TELEPORT_STAFF, WINGS_OF_THE_BATS, SINGLE_BATTERY, DOUBLE_BATTERY, TRIPLE_BATTERY, QUADRUPLE_BATTERY, QUINTUPLE_BATTERY, +/* DRILL_BLACK, DRILL_BLUE, DRILL_BROWN, DRILL_CYAN, DRILL_GRAY, DRILL_GREEN, DRILL_MAIN, DRILL_LIGHT_GRAY, + DRILL_LIME, DRILL_MAGENTA, DRILL_ORANGE, DRILL_PINK, DRILL_PURPLE, DRILL_RED, DRILL_WHITE, DRILL_YELLOW, DRILL_SPEED_AUGMENT_I, + DRILL_SPEED_AUGMENT_II, DRILL_SPEED_AUGMENT_III, DRILL_SILK_TOUCH_AUGMENT, DRILL_FORTUNE_AUGMENT_I, DRILL_FORTUNE_AUGMENT_II, + DRILL_MINING_AUGMENT_I, DRILL_MINING_AUGMENT_II, DRILL_BLOCK_PLACING_AUGMENT, */ + FERTILIZER, COFFEE_CUP, PHANTOM_CONNECTOR, + RESONANT_RICE, +/* FOOD_CHEESE, FOOD_PUMPKIN_STEW, FOOD_CARROT_JUICE, FOOD_FISH_N_CHIPS, FOOD_FRENCH_FRIES, FOOD_FRENCH_FRY, + FOOD_SPAGHETTI, FOOD_NOODLE, FOOD_CHOCOLATE_CAKE, FOOD_CHOCOLATE, FOOD_TOAST, FOOD_SUBMARINE_SANDWICH, FOOD_BIG_COOKIE, + FOOD_HAMBURGER, FOOD_PIZZA, FOOD_BAGUETTE, FOOD_RICE, FOOD_RICE_BREAD, FOOD_DOUGHNUT, FOOD_TOAST_O_CHOCOLATE, + FOOD_BACON, CU_BA_RA_JAM, GRA_KI_BA_JAM, PL_AP_LE_JAM, CH_AP_CI_JAM, HO_ME_KI_JAM, PI_CO_JAM, HO_ME_CO_JAM,*/ + KNIFE, CRAFTER_ON_A_STICK, +/* CRUSHED_IRON, CRUSHED_GOLD, CRUSHED_DIAMOND, CRUSHED_EMERALD, CRUSHED_LAPIS, + CRUSHED_QUARTZ, CRUSHED_COAL, CRUSHED_BLACK_QUARTZ, */ + SOLIDIFIED_EXPERIENCE, LEAF_BLOWER, ADVANCED_LEAF_BLOWER, + RING_OF_GROWTH, RING_OF_MAGNETIZING, +/* RING_OF_SPEED, RING_OF_HASTE, RING_OF_STRENGTH, RING_OF_JUMP_BOOST, + RING_OF_REGENERATION, RING_OF_RESISTANCE, RING_OF_FIRE_RESISTANCE, RING_OF_WATER_BREATHING, RING_OF_INVISIBILITY, + RING_OF_NIGHT_VISION, ADVANCED_RING_OF_SPEED, ADVANCED_RING_OF_HASTE, ADVANCED_RING_OF_STRENGTH, + ADVANCED_RING_OF_JUMP_BOOST, ADVANCED_RING_OF_REGENERATION, ADVANCED_RING_OF_RESISTANCE, ADVANCED_RING_OF_FIRE_RESISTANCE, + ADVANCED_RING_OF_WATER_BREATHING, ADVANCED_RING_OF_INVISIBILITY, ADVANCED_RING_OF_NIGHT_VISION,*/ + HAIRY_BALL, + COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, COFFEE_SEEDS + ); public static Item.Properties defaultProps() { return new Item.Properties().tab(ActuallyAdditions.GROUP); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index 87ada3a0b..722614f41 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -107,7 +107,7 @@ public class ItemWingsOfTheBats extends ItemBase { if (event.getEntityLiving().level.random.nextInt(15) <= looting * 2) { LivingEntity entityLiving = event.getEntityLiving(); - event.getDrops().add(new ItemEntity(event.getEntityLiving().level, entityLiving.getX(), entityLiving.getY(), entityLiving.getZ(), new ItemStack(ActuallyItems.BAT_WING.get(), event.getEntityLiving().level.random.nextInt(2 + looting) + 1))); + event.getDrops().add(new ItemEntity(event.getEntityLiving().level, entityLiving.getX(), entityLiving.getY(), entityLiving.getZ(), new ItemStack(ActuallyItems.BATS_WING.get(), event.getEntityLiving().level.random.nextInt(2 + looting) + 1))); } } } diff --git a/src/main/resources/assets/actuallyadditions/textures/item/cup_with_coffee.png b/src/main/resources/assets/actuallyadditions/textures/item/coffee_cup.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/cup_with_coffee.png rename to src/main/resources/assets/actuallyadditions/textures/item/coffee_cup.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crafting_table_on_a_stick.png b/src/main/resources/assets/actuallyadditions/textures/item/crafter_on_a_stick.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/crafting_table_on_a_stick.png rename to src/main/resources/assets/actuallyadditions/textures/item/crafter_on_a_stick.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/light_blue_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal_shard.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/light_blue_crystal_shard.png rename to src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal_shard.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/green_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal_shard.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/green_crystal_shard.png rename to src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal_shard.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamatine_empowered_crystal.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_diamatine_crystal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/diamatine_empowered_crystal.png rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_diamatine_crystal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamatine_empowered_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/empowered_diamatine_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/diamatine_empowered_crystal.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_diamatine_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/emeradic_empowered_crystal.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_emeradic_crystal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/emeradic_empowered_crystal.png rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_emeradic_crystal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/emeradic_empowered_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/empowered_emeradic_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/emeradic_empowered_crystal.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_emeradic_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/enori_empowered_crystal.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_enori_crystal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/enori_empowered_crystal.png rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_enori_crystal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/enori_empowered_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/empowered_enori_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/enori_empowered_crystal.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_enori_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/palis_empowered_crystal.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_palis_crystal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/palis_empowered_crystal.png rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_palis_crystal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/palis_empowered_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/empowered_palis_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/palis_empowered_crystal.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_palis_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/restonia_empowered_crystal.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_restonia_crystal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/restonia_empowered_crystal.png rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_restonia_crystal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/restonia_empowered_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/empowered_restonia_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/restonia_empowered_crystal.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_restonia_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/void_empowered_crystal.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_void_crystal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/void_empowered_crystal.png rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_void_crystal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/void_empowered_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/empowered_void_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/void_empowered_crystal.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_void_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/engineers_goggles_infrared.png b/src/main/resources/assets/actuallyadditions/textures/item/engineers_goggles_advanced.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/engineers_goggles_infrared.png rename to src/main/resources/assets/actuallyadditions/textures/item/engineers_goggles_advanced.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/white_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/enori_crystal_shard.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/white_crystal_shard.png rename to src/main/resources/assets/actuallyadditions/textures/item/enori_crystal_shard.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_filter.png b/src/main/resources/assets/actuallyadditions/textures/item/filter.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_filter.png rename to src/main/resources/assets/actuallyadditions/textures/item/filter.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/fur_ball.png b/src/main/resources/assets/actuallyadditions/textures/item/hairy_ball.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/fur_ball.png rename to src/main/resources/assets/actuallyadditions/textures/item/hairy_ball.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_invisibility.png b/src/main/resources/assets/actuallyadditions/textures/item/laser_upgrade_invisibility.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_invisibility.png rename to src/main/resources/assets/actuallyadditions/textures/item/laser_upgrade_invisibility.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_range.png b/src/main/resources/assets/actuallyadditions/textures/item/laser_upgrade_range.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_range.png rename to src/main/resources/assets/actuallyadditions/textures/item/laser_upgrade_range.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/blue_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/palis_crystal_shard.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/blue_crystal_shard.png rename to src/main/resources/assets/actuallyadditions/textures/item/palis_crystal_shard.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/red_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal_shard.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/red_crystal_shard.png rename to src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal_shard.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/black_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/void_crystal_shard.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/black_crystal_shard.png rename to src/main/resources/assets/actuallyadditions/textures/item/void_crystal_shard.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/bowl_of_water.png b/src/main/resources/assets/actuallyadditions/textures/item/water_bowl.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/bowl_of_water.png rename to src/main/resources/assets/actuallyadditions/textures/item/water_bowl.png