From 4617d363c9f1229d35b494cf91eb05a55bb1f1ce Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Tue, 23 Nov 2021 16:42:12 -0600 Subject: [PATCH] SOME datagens moved over, still needs alot of work. --- src/generated/resources/.cache/cache | 122 ++++++++++ .../blockstates/atomic_reconstructor.json | 30 +++ .../blockstates/battery_box.json | 7 + .../blockstates/black_quartz_block.json | 7 + .../black_quartz_pillar_block.json | 7 + .../blockstates/breaker.json | 30 +++ .../actuallyadditions/blockstates/canola.json | 7 + .../blockstates/canola_press.json | 7 + .../chiseled_black_quartz_block.json | 7 + .../blockstates/coal_generator.json | 19 ++ .../actuallyadditions/blockstates/coffee.json | 7 + .../blockstates/coffee_machine.json | 19 ++ .../blockstates/crusher.json | 34 +++ .../blockstates/crusher_double.json | 34 +++ .../blockstates/diamatine_crystal_block.json | 7 + .../diamatine_crystal_cluster.json | 7 + .../blockstates/display_stand.json | 7 + .../blockstates/dropper.json | 30 +++ .../blockstates/emeradic_crystal_block.json | 7 + .../blockstates/emeradic_crystal_cluster.json | 7 + .../empowered_diamatine_crystal_block.json | 7 + .../empowered_emeradic_crystal_block.json | 7 + .../empowered_enori_crystal_block.json | 7 + .../empowered_palis_crystal_block.json | 7 + .../empowered_restonia_crystal_block.json | 7 + .../empowered_void_crystal_block.json | 7 + .../blockstates/empowerer.json | 7 + .../blockstates/ender_casing.json | 7 + .../blockstates/ender_pearl_block.json | 7 + .../blockstates/energizer.json | 7 + .../blockstates/enervator.json | 7 + .../blockstates/enori_crystal_block.json | 7 + .../blockstates/enori_crystal_cluster.json | 7 + .../blockstates/ethetic_green_block.json | 7 + .../blockstates/ethetic_white_block.json | 7 + .../actuallyadditions/blockstates/farmer.json | 19 ++ .../actuallyadditions/blockstates/feeder.json | 7 + .../blockstates/fermenting_barrel.json | 7 + .../blockstates/firework_box.json | 7 + .../actuallyadditions/blockstates/flax.json | 7 + .../blockstates/fluid_collector.json | 30 +++ .../blockstates/fluid_placer.json | 30 +++ .../blockstates/greenhouse_glass.json | 7 + .../blockstates/heat_collector.json | 7 + .../blockstates/iron_casing.json | 7 + .../blockstates/item_viewer.json | 7 + .../blockstates/item_viewer_hopping.json | 7 + .../blockstates/lamp_black.json | 10 + .../blockstates/lamp_blue.json | 10 + .../blockstates/lamp_brown.json | 10 + .../blockstates/lamp_cyan.json | 10 + .../blockstates/lamp_gray.json | 10 + .../blockstates/lamp_green.json | 10 + .../blockstates/lamp_light_blue.json | 10 + .../blockstates/lamp_light_gray.json | 10 + .../blockstates/lamp_lime.json | 10 + .../blockstates/lamp_magenta.json | 10 + .../blockstates/lamp_orange.json | 10 + .../blockstates/lamp_pink.json | 10 + .../blockstates/lamp_purple.json | 10 + .../blockstates/lamp_red.json | 10 + .../blockstates/lamp_white.json | 10 + .../blockstates/lamp_yellow.json | 10 + .../blockstates/laser_relay.json | 7 + .../blockstates/laser_relay_advanced.json | 7 + .../blockstates/laser_relay_extreme.json | 7 + .../blockstates/laser_relay_fluids.json | 7 + .../blockstates/laser_relay_item.json | 7 + .../laser_relay_item_advanced.json | 7 + .../blockstates/lava_factory_casing.json | 7 + .../blockstates/lava_factory_controller.json | 19 ++ .../blockstates/leaf_generator.json | 19 ++ .../blockstates/long_range_breaker.json | 30 +++ .../blockstates/oil_generator.json | 19 ++ .../blockstates/palis_crystal_block.json | 7 + .../blockstates/palis_crystal_cluster.json | 7 + .../blockstates/phantom_booster.json | 7 + .../blockstates/phantom_breaker.json | 7 + .../blockstates/phantom_energyface.json | 7 + .../blockstates/phantom_itemface.json | 7 + .../blockstates/phantom_liquiface.json | 7 + .../blockstates/phantom_placer.json | 7 + .../blockstates/phantom_redstoneface.json | 7 + .../actuallyadditions/blockstates/placer.json | 30 +++ .../blockstates/player_interface.json | 7 + .../blockstates/powered_furnace.json | 34 +++ .../blockstates/ranged_collector.json | 7 + .../blockstates/restonia_crystal_block.json | 7 + .../blockstates/restonia_crystal_cluster.json | 7 + .../actuallyadditions/blockstates/rice.json | 7 + .../blockstates/shock_suppressor.json | 7 + .../blockstates/tiny_torch.json | 7 + .../blockstates/vertical_digger.json | 19 ++ .../blockstates/void_crystal_block.json | 7 + .../blockstates/void_crystal_cluster.json | 7 + .../blockstates/wood_casing.json | 7 + .../blockstates/xp_solidifier.json | 7 + .../models/block/canola.json | 6 + .../models/block/coffee.json | 6 + .../models/block/ender_casing.json | 6 + .../models/block/ender_pearl_block.json | 6 + .../models/block/ethetic_green_block.json | 6 + .../models/block/ethetic_white_block.json | 6 + .../actuallyadditions/models/block/flax.json | 6 + .../models/block/iron_casing.json | 6 + .../models/block/lamp_black.json | 6 + .../models/block/lamp_blue.json | 6 + .../models/block/lamp_brown.json | 6 + .../models/block/lamp_cyan.json | 6 + .../models/block/lamp_gray.json | 6 + .../models/block/lamp_green.json | 6 + .../models/block/lamp_light_blue.json | 6 + .../models/block/lamp_light_gray.json | 6 + .../models/block/lamp_lime.json | 6 + .../models/block/lamp_magenta.json | 6 + .../models/block/lamp_orange.json | 6 + .../models/block/lamp_pink.json | 6 + .../models/block/lamp_purple.json | 6 + .../models/block/lamp_red.json | 6 + .../models/block/lamp_white.json | 6 + .../models/block/lamp_yellow.json | 6 + .../actuallyadditions/models/block/rice.json | 6 + .../models/block/wood_casing.json | 6 + .../data/ActuallyAdditionsData.java | 2 + .../data/BlockStateGenerator.java | 210 ++++++++++++++++++ .../mod/ActuallyAdditions.java | 9 + .../mod/config/CommonConfig.java | 7 + .../mod/event/ClientEvents.java | 3 +- ...lock.png => advanced_item_laser_relay.png} | Bin ...tor_block.png => atomic_reconstructor.png} | Bin ...png => atomic_reconstructor_front (2).png} | Bin ...k_top.png => atomic_reconstructor_top.png} | Bin ...{battery_box_block.png => battery_box.png} | Bin ...{bio_reactor_block.png => bio_reactor.png} | Bin ...{black_lotus_block.png => black_lotus.png} | Bin ...lack_quartz_block.png => black_quartz.png} | Bin ...brick_block.png => black_quartz_brick.png} | Bin ...ed_block.png => black_quartz_chiseled.png} | Bin ..._top.png => black_quartz_chiseled_top.png} | Bin ...llar_block.png => black_quartz_pillar.png} | Bin ...ck_top.png => black_quartz_pillar_top.png} | Bin ...ooth_block.png => black_quartz_smooth.png} | Bin ...rtz_block_top.png => black_quartz_top.png} | Bin .../block/{breaker_block.png => breaker.png} | Bin ...aker_block_front.png => breaker_front.png} | Bin ...{breaker_block_top.png => breaker_top.png} | Bin .../block/{canola_block.png => canola.png} | Bin ...a_press_block.png => canola_press (2).png} | Bin ...ess_block_top.png => canola_press_top.png} | Bin ...a_block_stage_2.png => canola_stage_2.png} | Bin ...a_block_stage_3.png => canola_stage_3.png} | Bin ...a_block_stage_4.png => canola_stage_4.png} | Bin .../{charcoal_block.png => charcoal.png} | Bin ...generator_block.png => coal_generator.png} | Bin ...k_bottom.png => coal_generator_bottom.png} | Bin ...block_side.png => coal_generator_side.png} | Bin ...r_block_top.png => coal_generator_top.png} | Bin .../block/{coffee_block.png => coffee.png} | Bin ...e_machine_block.png => coffee_machine.png} | Bin ...e_block_stage_2.png => coffee_stage_2.png} | Bin ...e_block_stage_3.png => coffee_stage_3.png} | Bin ...e_block_stage_4.png => coffee_stage_4.png} | Bin ...e_block_stage_5.png => coffee_stage_5.png} | Bin ...e_block_stage_6.png => coffee_stage_6.png} | Bin .../block/{crusher_block.png => crusher.png} | Bin ...er_block_bottom.png => crusher_bottom.png} | Bin ...er_double_block.png => crusher_double.png} | Bin .../{crusher_block_on.png => crusher_on.png} | Bin ...{crusher_block_top.png => crusher_top.png} | Bin ...lock.png => crystal_cluster_diamatine.png} | Bin ...a => crystal_cluster_diamatine.png.mcmeta} | 0 ...block.png => crystal_cluster_emeradic.png} | Bin ...ta => crystal_cluster_emeradic.png.mcmeta} | 0 ...ri_block.png => crystal_cluster_enori.png} | Bin ...cmeta => crystal_cluster_enori.png.mcmeta} | 0 ...is_block.png => crystal_cluster_palis.png} | Bin ...cmeta => crystal_cluster_palis.png.mcmeta} | 0 ...block.png => crystal_cluster_restonia.png} | Bin ...ta => crystal_cluster_restonia.png.mcmeta} | 0 ...oid_block.png => crystal_cluster_void.png} | Bin ...mcmeta => crystal_cluster_void.png.mcmeta} | 0 ...matine_block.png => crystal_diamatine.png} | Bin ...ck.png => crystal_diamatine_empowered.png} | Bin ...=> crystal_diamatine_empowered.png.mcmeta} | 0 ...meradic_block.png => crystal_emeradic.png} | Bin ...ock.png => crystal_emeradic_empowered.png} | Bin ... => crystal_emeradic_empowered.png.mcmeta} | 0 ...stal_enori_block.png => crystal_enori.png} | Bin ..._block.png => crystal_enori_empowered.png} | Bin ...eta => crystal_enori_empowered.png.mcmeta} | 0 ...stal_palis_block.png => crystal_palis.png} | Bin ..._block.png => crystal_palis_empowered.png} | Bin ...eta => crystal_palis_empowered.png.mcmeta} | 0 ...estonia_block.png => crystal_restonia.png} | Bin ...ock.png => crystal_restonia_empowered.png} | Bin ... => crystal_restonia_empowered.png.mcmeta} | 0 ...rystal_void_block.png => crystal_void.png} | Bin ...d_block.png => crystal_void_empowered.png} | Bin ...meta => crystal_void_empowered.png.mcmeta} | 0 ...aker_block.png => directional_breaker.png} | Bin ...ront.png => directional_breaker_front.png} | Bin ...ck_top.png => directional_breaker_top.png} | Bin ...play_stand_block.png => display_stand.png} | Bin ...ck_side.png => display_stand_side (2).png} | Bin .../block/{dropper_block.png => dropper.png} | Bin ...pper_block_front.png => dropper_front.png} | Bin ...{dropper_block_top.png => dropper_top.png} | Bin .../{empowerer_block.png => empowerer.png} | Bin ...nder_casing_block.png => ender_casing.png} | Bin ...rpearl_block.png => ender_pearl_block.png} | Bin .../{energizer_block.png => energizer.png} | Bin ..._block_side.png => energizer_side (2).png} | Bin ...er_block_top.png => energizer_top (2).png} | Bin ...relay_block.png => energy_laser_relay.png} | Bin ...ck.png => energy_laser_relay_advanced.png} | Bin ...ock.png => energy_laser_relay_extreme.png} | Bin .../{enervator_block.png => enervator.png} | Bin ..._block_side.png => enervator_side (2).png} | Bin ...or_block_top.png => enervator_top (2).png} | Bin .../textures/block/{esd_block.png => esd.png} | Bin ...sd_advanced_block.png => esd_advanced.png} | Bin ...reen_block.png => ethetic_green_block.png} | Bin ...hite_block.png => ethetic_white_block.png} | Bin .../block/{farmer_block.png => farmer.png} | Bin ...r_block_front.png => farmer_front (2).png} | Bin .../{farmer_block_top.png => farmer_top.png} | Bin .../block/{feeder_block.png => feeder.png} | Bin .../{feeder_block_top.png => feeder_top.png} | Bin ...barrel_block.png => fermenting_barrel.png} | Bin ...lock_top.png => fermenting_barrel_top.png} | Bin ...irework_box_block.png => firework_box.png} | Bin ...block_top.png => firework_box_top (2).png} | Bin ...hing_net_block.png => fishing_net (2).png} | Bin .../block/{flax_block.png => flax.png} | Bin ...lax_block_stage_2.png => flax_stage_2.png} | Bin ...lax_block_stage_3.png => flax_stage_3.png} | Bin ...lax_block_stage_4.png => flax_stage_4.png} | Bin ...lax_block_stage_5.png => flax_stage_5.png} | Bin ...lax_block_stage_6.png => flax_stage_6.png} | Bin ...ollector_block.png => fluid_collector.png} | Bin ...ront.png => fluid_collector_front (2).png} | Bin ..._block_top.png => fluid_collector_top.png} | Bin ...luid_placer_block.png => fluid_placer.png} | Bin ...k_front.png => fluid_placer_front (2).png} | Bin ...cer_block_top.png => fluid_placer_top.png} | Bin ...relay_block.png => fluids_laser_relay.png} | Bin ...e_glass_block.png => greenhouse_glass.png} | Bin ...collector_block.png => heat_collector.png} | Bin ...k_bottom.png => heat_collector_bottom.png} | Bin ...ock_top.png => heat_collector_top (2).png} | Bin ...e_block.png => hopping_item_interface.png} | Bin ....png => hopping_item_interface_inside.png} | Bin ...top.png => hopping_item_interface_top.png} | Bin ...{iron_casing_block.png => iron_casing.png} | Bin ...ng_snow_block.png => iron_casing_snow.png} | Bin ...block_top.png => iron_casing_snow_top.png} | Bin ...interface_block.png => item_interface.png} | Bin ...r_relay_block.png => item_laser_relay.png} | Bin ...m_repairer_block.png => item_repairer.png} | Bin ...ck_bottom.png => item_repairer_bottom.png} | Bin ...lock_top.png => item_repairer_top (2).png} | Bin .../{lamp_black_block.png => lamp_black.png} | Bin ...p_black_on_block.png => lamp_black_on.png} | Bin .../{lamp_blue_block.png => lamp_blue.png} | Bin ...amp_blue_on_block.png => lamp_blue_on.png} | Bin .../{lamp_brown_block.png => lamp_brown.png} | Bin ...p_brown_on_block.png => lamp_brown_on.png} | Bin ...ntroller_block.png => lamp_controller.png} | Bin ...lock.png => lamp_controller_front (2).png} | Bin .../{lamp_cyan_block.png => lamp_cyan.png} | Bin ...amp_cyan_on_block.png => lamp_cyan_on.png} | Bin .../{lamp_gray_block.png => lamp_gray.png} | Bin ...amp_gray_on_block.png => lamp_gray_on.png} | Bin .../{lamp_green_block.png => lamp_green.png} | Bin ...p_green_on_block.png => lamp_green_on.png} | Bin ...ght_blue_block.png => lamp_light_blue.png} | Bin ...ue_on_block.png => lamp_light_blue_on.png} | Bin ...ght_gray_block.png => lamp_light_gray.png} | Bin ...ay_on_block.png => lamp_light_gray_on.png} | Bin .../{lamp_lime_block.png => lamp_lime.png} | Bin ...amp_lime_on_block.png => lamp_lime_on.png} | Bin ...amp_magenta_block.png => lamp_magenta.png} | Bin ...genta_on_block.png => lamp_magenta_on.png} | Bin ...{lamp_orange_block.png => lamp_orange.png} | Bin ...orange_on_block.png => lamp_orange_on.png} | Bin .../{lamp_pink_block.png => lamp_pink.png} | Bin ...amp_pink_on_block.png => lamp_pink_on.png} | Bin ...{lamp_purple_block.png => lamp_purple.png} | Bin ...purple_on_block.png => lamp_purple_on.png} | Bin .../{lamp_red_block.png => lamp_red.png} | Bin ...{lamp_red_on_block.png => lamp_red_on.png} | Bin .../{lamp_white_block.png => lamp_white.png} | Bin ...p_white_on_block.png => lamp_white_on.png} | Bin ...{lamp_yellow_block.png => lamp_yellow.png} | Bin ...yellow_on_block.png => lamp_yellow_on.png} | Bin ...y_case_block.png => lava_factory_case.png} | Bin ..._block.png => lava_factory_controller.png} | Bin ...op.png => lava_factory_controller_top.png} | Bin ...generator_block.png => leaf_generator.png} | Bin ...k_bottom.png => leaf_generator_bottom.png} | Bin ...r_block_top.png => leaf_generator_top.png} | Bin .../block/{miner_block.png => miner.png} | Bin ...{miner_block_front.png => miner_front.png} | Bin .../{miner_block_top.png => miner_top.png} | Bin ..._generator_block.png => oil_generator.png} | Bin ...ck_bottom.png => oil_generator_bottom.png} | Bin ...or_block_top.png => oil_generator_top.png} | Bin ..._quartz_block.png => ore_black_quartz.png} | Bin ..._booster_block.png => phantom_booster.png} | Bin ..._breaker_block.png => phantom_breaker.png} | Bin ...yface_block.png => phantom_energyface.png} | Bin ...uiface_block.png => phantom_liquiface.png} | Bin ...om_placer_block.png => phantom_placer.png} | Bin ...ace_block.png => phantom_redstoneface.png} | Bin ...{phantomface_block.png => phantomface.png} | Bin .../block/{placer_block.png => placer.png} | Bin ...lacer_block_front.png => placer_front.png} | Bin .../{placer_block_top.png => placer_top.png} | Bin ...terface_block.png => player_interface.png} | Bin ..._furnace_block.png => powered_furnace.png} | Bin ...ck_front.png => powered_furnace_front.png} | Bin ...ce_on_block.png => powered_furnace_on.png} | Bin ..._block_top.png => powered_furnace_top.png} | Bin ...llector_block.png => ranged_collector.png} | Bin .../block/{rice_block.png => rice.png} | Bin ...ice_block_stage_2.png => rice_stage_2.png} | Bin ...ice_block_stage_3.png => rice_stage_3.png} | Bin ...ice_block_stage_4.png => rice_stage_4.png} | Bin ...ice_block_stage_5.png => rice_stage_5.png} | Bin ...ice_block_stage_6.png => rice_stage_6.png} | Bin ...pressor_block.png => shock_suppressor.png} | Bin ...miley_cloud_block.png => smiley_cloud.png} | Bin ...{solar_panel_block.png => solar_panel.png} | Bin .../{tiny_torch_block.png => tiny_torch.png} | Bin ...ure_chest_block.png => treasure_chest.png} | Bin ...k_bottom.png => treasure_chest_bottom.png} | Bin ...ock_front.png => treasure_chest_front.png} | Bin ...ock_top.png => treasure_chest_top (2).png} | Bin ...{wood_casing_block.png => wood_casing.png} | Bin ...solidifier_block.png => xp_solidifier.png} | Bin ...lock_front.png => xp_solidifier_front.png} | Bin ...er_block_top.png => xp_solidifier_top.png} | Bin 342 files changed, 1554 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/atomic_reconstructor.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/battery_box.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/breaker.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/canola.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/canola_press.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/coal_generator.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/coffee.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/coffee_machine.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crusher.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crusher_double.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_cluster.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/display_stand.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/dropper.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_cluster.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/empowered_diamatine_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/empowered_emeradic_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/empowered_enori_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/empowered_palis_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/empowered_restonia_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/empowered_void_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/empowerer.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ender_casing.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ender_pearl_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/energizer.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/enervator.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_cluster.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/farmer.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/feeder.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/fermenting_barrel.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/firework_box.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/flax.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/fluid_collector.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/fluid_placer.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/greenhouse_glass.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/heat_collector.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/iron_casing.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_black.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_blue.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_brown.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_cyan.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_gray.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_green.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_blue.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_gray.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_lime.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_magenta.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_orange.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_pink.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_purple.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_red.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_white.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_yellow.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_advanced.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_casing.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_controller.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/leaf_generator.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/long_range_breaker.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/oil_generator.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_cluster.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/phantom_booster.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/phantom_breaker.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/phantom_energyface.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/phantom_itemface.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/phantom_liquiface.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/phantom_placer.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/phantom_redstoneface.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/placer.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/player_interface.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ranged_collector.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_cluster.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/rice.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/shock_suppressor.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/tiny_torch.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/vertical_digger.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_cluster.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/wood_casing.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/xp_solidifier.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/canola.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/coffee.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ender_casing.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ender_pearl_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/flax.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/iron_casing.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/rice.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/wood_casing.json create mode 100644 src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java rename src/main/resources/assets/actuallyadditions/textures/block/{advanced_item_laser_relay_block.png => advanced_item_laser_relay.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{atomic_reconstructor_block.png => atomic_reconstructor.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{atomic_reconstructor_block_front.png => atomic_reconstructor_front (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{atomic_reconstructor_block_top.png => atomic_reconstructor_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{battery_box_block.png => battery_box.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{bio_reactor_block.png => bio_reactor.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_lotus_block.png => black_lotus.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_block.png => black_quartz.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_brick_block.png => black_quartz_brick.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_chiseled_block.png => black_quartz_chiseled.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_chiseled_block_top.png => black_quartz_chiseled_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_pillar_block.png => black_quartz_pillar.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_pillar_block_top.png => black_quartz_pillar_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_smooth_block.png => black_quartz_smooth.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_block_top.png => black_quartz_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{breaker_block.png => breaker.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{breaker_block_front.png => breaker_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{breaker_block_top.png => breaker_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{canola_block.png => canola.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{canola_press_block.png => canola_press (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{canola_press_block_top.png => canola_press_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{canola_block_stage_2.png => canola_stage_2.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{canola_block_stage_3.png => canola_stage_3.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{canola_block_stage_4.png => canola_stage_4.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{charcoal_block.png => charcoal.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coal_generator_block.png => coal_generator.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coal_generator_block_bottom.png => coal_generator_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coal_generator_block_side.png => coal_generator_side.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coal_generator_block_top.png => coal_generator_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_block.png => coffee.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_machine_block.png => coffee_machine.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_block_stage_2.png => coffee_stage_2.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_block_stage_3.png => coffee_stage_3.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_block_stage_4.png => coffee_stage_4.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_block_stage_5.png => coffee_stage_5.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_block_stage_6.png => coffee_stage_6.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crusher_block.png => crusher.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crusher_block_bottom.png => crusher_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crusher_double_block.png => crusher_double.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crusher_block_on.png => crusher_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crusher_block_top.png => crusher_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_diamatine_block.png => crystal_cluster_diamatine.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_diamatine_block.png.mcmeta => crystal_cluster_diamatine.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_emeradic_block.png => crystal_cluster_emeradic.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_emeradic_block.png.mcmeta => crystal_cluster_emeradic.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_enori_block.png => crystal_cluster_enori.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_enori_block.png.mcmeta => crystal_cluster_enori.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_palis_block.png => crystal_cluster_palis.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_palis_block.png.mcmeta => crystal_cluster_palis.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_restonia_block.png => crystal_cluster_restonia.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_restonia_block.png.mcmeta => crystal_cluster_restonia.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_void_block.png => crystal_cluster_void.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_void_block.png.mcmeta => crystal_cluster_void.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_diamatine_block.png => crystal_diamatine.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_diamatine_empowered_block.png => crystal_diamatine_empowered.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_diamatine_empowered_block.png.mcmeta => crystal_diamatine_empowered.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_emeradic_block.png => crystal_emeradic.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_emeradic_empowered_block.png => crystal_emeradic_empowered.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_emeradic_empowered_block.png.mcmeta => crystal_emeradic_empowered.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_enori_block.png => crystal_enori.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_enori_empowered_block.png => crystal_enori_empowered.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_enori_empowered_block.png.mcmeta => crystal_enori_empowered.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_palis_block.png => crystal_palis.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_palis_empowered_block.png => crystal_palis_empowered.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_palis_empowered_block.png.mcmeta => crystal_palis_empowered.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_restonia_block.png => crystal_restonia.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_restonia_empowered_block.png => crystal_restonia_empowered.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_restonia_empowered_block.png.mcmeta => crystal_restonia_empowered.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_void_block.png => crystal_void.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_void_empowered_block.png => crystal_void_empowered.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_void_empowered_block.png.mcmeta => crystal_void_empowered.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{directional_breaker_block.png => directional_breaker.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{directional_breaker_block_front.png => directional_breaker_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{directional_breaker_block_top.png => directional_breaker_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{display_stand_block.png => display_stand.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{display_stand_block_side.png => display_stand_side (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{dropper_block.png => dropper.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{dropper_block_front.png => dropper_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{dropper_block_top.png => dropper_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{empowerer_block.png => empowerer.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ender_casing_block.png => ender_casing.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{enderpearl_block.png => ender_pearl_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{energizer_block.png => energizer.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{energizer_block_side.png => energizer_side (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{energizer_block_top.png => energizer_top (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{energy_laser_relay_block.png => energy_laser_relay.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{energy_laser_relay_advanced_block.png => energy_laser_relay_advanced.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{energy_laser_relay_extreme_block.png => energy_laser_relay_extreme.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{enervator_block.png => enervator.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{enervator_block_side.png => enervator_side (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{enervator_block_top.png => enervator_top (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{esd_block.png => esd.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{esd_advanced_block.png => esd_advanced.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{green_block.png => ethetic_green_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{white_block.png => ethetic_white_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{farmer_block.png => farmer.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{farmer_block_front.png => farmer_front (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{farmer_block_top.png => farmer_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{feeder_block.png => feeder.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{feeder_block_top.png => feeder_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fermenting_barrel_block.png => fermenting_barrel.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fermenting_barrel_block_top.png => fermenting_barrel_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{firework_box_block.png => firework_box.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{firework_box_block_top.png => firework_box_top (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fishing_net_block.png => fishing_net (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{flax_block.png => flax.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{flax_block_stage_2.png => flax_stage_2.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{flax_block_stage_3.png => flax_stage_3.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{flax_block_stage_4.png => flax_stage_4.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{flax_block_stage_5.png => flax_stage_5.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{flax_block_stage_6.png => flax_stage_6.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fluid_collector_block.png => fluid_collector.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fluid_collector_block_front.png => fluid_collector_front (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fluid_collector_block_top.png => fluid_collector_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fluid_placer_block.png => fluid_placer.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fluid_placer_block_front.png => fluid_placer_front (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fluid_placer_block_top.png => fluid_placer_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{fluids_laser_relay_block.png => fluids_laser_relay.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{greenhouse_glass_block.png => greenhouse_glass.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{heat_collector_block.png => heat_collector.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{heat_collector_block_bottom.png => heat_collector_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{heat_collector_block_top.png => heat_collector_top (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{hopping_item_interface_block.png => hopping_item_interface.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{hopping_item_interface_block_inside.png => hopping_item_interface_inside.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{hopping_item_interface_block_top.png => hopping_item_interface_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{iron_casing_block.png => iron_casing.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{iron_casing_snow_block.png => iron_casing_snow.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{iron_casing_snow_block_top.png => iron_casing_snow_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_interface_block.png => item_interface.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_laser_relay_block.png => item_laser_relay.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_repairer_block.png => item_repairer.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_repairer_block_bottom.png => item_repairer_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_repairer_block_top.png => item_repairer_top (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_black_block.png => lamp_black.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_black_on_block.png => lamp_black_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_blue_block.png => lamp_blue.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_blue_on_block.png => lamp_blue_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_brown_block.png => lamp_brown.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_brown_on_block.png => lamp_brown_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_controller_block.png => lamp_controller.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_controller_front_block.png => lamp_controller_front (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_cyan_block.png => lamp_cyan.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_cyan_on_block.png => lamp_cyan_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_gray_block.png => lamp_gray.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_gray_on_block.png => lamp_gray_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_green_block.png => lamp_green.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_green_on_block.png => lamp_green_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_light_blue_block.png => lamp_light_blue.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_light_blue_on_block.png => lamp_light_blue_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_light_gray_block.png => lamp_light_gray.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_light_gray_on_block.png => lamp_light_gray_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_lime_block.png => lamp_lime.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_lime_on_block.png => lamp_lime_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_magenta_block.png => lamp_magenta.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_magenta_on_block.png => lamp_magenta_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_orange_block.png => lamp_orange.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_orange_on_block.png => lamp_orange_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_pink_block.png => lamp_pink.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_pink_on_block.png => lamp_pink_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_purple_block.png => lamp_purple.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_purple_on_block.png => lamp_purple_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_red_block.png => lamp_red.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_red_on_block.png => lamp_red_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_white_block.png => lamp_white.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_white_on_block.png => lamp_white_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_yellow_block.png => lamp_yellow.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_yellow_on_block.png => lamp_yellow_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lava_factory_case_block.png => lava_factory_case.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lava_factory_controller_block.png => lava_factory_controller.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lava_factory_controller_block_top.png => lava_factory_controller_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{leaf_generator_block.png => leaf_generator.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{leaf_generator_block_bottom.png => leaf_generator_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{leaf_generator_block_top.png => leaf_generator_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{miner_block.png => miner.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{miner_block_front.png => miner_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{miner_block_top.png => miner_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{oil_generator_block.png => oil_generator.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{oil_generator_block_bottom.png => oil_generator_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{oil_generator_block_top.png => oil_generator_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ore_black_quartz_block.png => ore_black_quartz.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{phantom_booster_block.png => phantom_booster.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{phantom_breaker_block.png => phantom_breaker.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{phantom_energyface_block.png => phantom_energyface.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{phantom_liquiface_block.png => phantom_liquiface.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{phantom_placer_block.png => phantom_placer.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{phantom_redstoneface_block.png => phantom_redstoneface.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{phantomface_block.png => phantomface.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{placer_block.png => placer.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{placer_block_front.png => placer_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{placer_block_top.png => placer_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{player_interface_block.png => player_interface.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{powered_furnace_block.png => powered_furnace.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{powered_furnace_block_front.png => powered_furnace_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{powered_furnace_on_block.png => powered_furnace_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{powered_furnace_block_top.png => powered_furnace_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ranged_collector_block.png => ranged_collector.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{rice_block.png => rice.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{rice_block_stage_2.png => rice_stage_2.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{rice_block_stage_3.png => rice_stage_3.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{rice_block_stage_4.png => rice_stage_4.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{rice_block_stage_5.png => rice_stage_5.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{rice_block_stage_6.png => rice_stage_6.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{shock_suppressor_block.png => shock_suppressor.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{smiley_cloud_block.png => smiley_cloud.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{solar_panel_block.png => solar_panel.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{tiny_torch_block.png => tiny_torch.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{treasure_chest_block.png => treasure_chest.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{treasure_chest_block_bottom.png => treasure_chest_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{treasure_chest_block_front.png => treasure_chest_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{treasure_chest_block_top.png => treasure_chest_top (2).png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{wood_casing_block.png => wood_casing.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{xp_solidifier_block.png => xp_solidifier.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{xp_solidifier_block_front.png => xp_solidifier_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{xp_solidifier_block_top.png => xp_solidifier_top.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index d9518db0d..da6a5219c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,3 +1,125 @@ +ad5241a0fb20fbe1d724786a426855ab0ec07b39 assets/actuallyadditions/blockstates/atomic_reconstructor.json +dd693edf46ec7e4423ccb6afeacd866ed2bafe14 assets/actuallyadditions/blockstates/battery_box.json +f4b3482fd851ad2e0071caf4aedbd7ee45fe0a31 assets/actuallyadditions/blockstates/black_quartz_block.json +31b696d84e073be37ae3ce210463fd1568cdce47 assets/actuallyadditions/blockstates/black_quartz_pillar_block.json +5dea2f0e554a5ecb9b7f547526d745ff85353a40 assets/actuallyadditions/blockstates/breaker.json +48eb2c3f1180c04e668046abc65dbadeaaf3aed6 assets/actuallyadditions/blockstates/canola.json +5101139337dd4e5a057333e9e424df47f7138c93 assets/actuallyadditions/blockstates/canola_press.json +998b11d1f63e153ab2f8bd11830405611c8886a2 assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json +c1000550e4021ad6cc2aabcc1f3ecf8abfdd8f8e assets/actuallyadditions/blockstates/coal_generator.json +d884a36f1c222aaf5c3c3947df93f2f43fd6e2b5 assets/actuallyadditions/blockstates/coffee.json +033082834217900e98bd37dc5d6f09c484bd374a assets/actuallyadditions/blockstates/coffee_machine.json +756eed31de6b7c02e246b90741a0ed372c629c88 assets/actuallyadditions/blockstates/crusher.json +6a558853975a855b8fcae301d3e0ccf2357e5ee9 assets/actuallyadditions/blockstates/crusher_double.json +156669e8e8907d7db17c3a28a00006a594005958 assets/actuallyadditions/blockstates/diamatine_crystal_block.json +bcab0f0cf3ab29da5c66025f99f0c07f53e7ff1d assets/actuallyadditions/blockstates/diamatine_crystal_cluster.json +e6b4d6327ad71e7885e24d41601f0f1e238d4951 assets/actuallyadditions/blockstates/display_stand.json +a72f08f5b39d2bc66e5de566019376a8997aa7e4 assets/actuallyadditions/blockstates/dropper.json +931bd39cad66a056e04723286b5c0ba3d60041e0 assets/actuallyadditions/blockstates/emeradic_crystal_block.json +c1eca5de5c70d5b51695f4000d9351450dfef876 assets/actuallyadditions/blockstates/emeradic_crystal_cluster.json +1b3f59a3c2353c4de28a12b65c9df4eeab7f66dc assets/actuallyadditions/blockstates/empowered_diamatine_crystal_block.json +7072c3813719637b10f34f5c8fc70629aecaaa65 assets/actuallyadditions/blockstates/empowered_emeradic_crystal_block.json +a937aaa11c6f4975af476e3b3c61b2d598ada01c assets/actuallyadditions/blockstates/empowered_enori_crystal_block.json +0e937cdceb4c4d51f39886fedc9f3a50c8774b25 assets/actuallyadditions/blockstates/empowered_palis_crystal_block.json +fac9e12aa8a752acf65ccba51ffedaa3c3354427 assets/actuallyadditions/blockstates/empowered_restonia_crystal_block.json +b6284a46d822974f2226585c89746091b238ead2 assets/actuallyadditions/blockstates/empowered_void_crystal_block.json +e0dc3c1b041fcfb6508bebb1c15f07fcdf297241 assets/actuallyadditions/blockstates/empowerer.json +8e3e99cd4fd18762ceac1b265543976fc904225c assets/actuallyadditions/blockstates/ender_casing.json +728003592363b2e9be11e9b808b19495761a9a42 assets/actuallyadditions/blockstates/ender_pearl_block.json +32f6644e58fcab052e406837056f882a7754ac74 assets/actuallyadditions/blockstates/energizer.json +a3c46ac1c997e30f9fb4ecff56dbd573ddf8135d assets/actuallyadditions/blockstates/enervator.json +ac4f3f406105875df9f544407fa90ea309b0fc0e assets/actuallyadditions/blockstates/enori_crystal_block.json +0c2bad99ce171f7d39b08337581622884fb4590c assets/actuallyadditions/blockstates/enori_crystal_cluster.json +35b61ff98befecc8b05f7dee0e637e826b84f7ed assets/actuallyadditions/blockstates/ethetic_green_block.json +8cea4e84d6ef2a891eb674ea233483d6cfd7f489 assets/actuallyadditions/blockstates/ethetic_white_block.json +43d7b4a1155efbb3c3a12a93386acea7a478be7e assets/actuallyadditions/blockstates/farmer.json +d3d487fb2552edd781c69e01a03a8f527ee850af assets/actuallyadditions/blockstates/feeder.json +04dad3573abb79b915c577134f7f3ce630470b6d assets/actuallyadditions/blockstates/fermenting_barrel.json +f2a85c0cd664f17cef8aa41432ca8bc54088b155 assets/actuallyadditions/blockstates/firework_box.json +0a292e24273564842019099e725e632e713833ec assets/actuallyadditions/blockstates/flax.json +56c3978ead1ef836cbd61aed56e491c032b28a14 assets/actuallyadditions/blockstates/fluid_collector.json +4b8bd1dd56edbffa0478a287d8c07925ce18b0da assets/actuallyadditions/blockstates/fluid_placer.json +03e4a9e1203c4325eed9f1178bf935f1578a0f34 assets/actuallyadditions/blockstates/greenhouse_glass.json +573131431fb2e4ce5d2c2bf1f5aa76a6b9f8b996 assets/actuallyadditions/blockstates/heat_collector.json +877d2ceed901ad947704e6c4496f75400bb55701 assets/actuallyadditions/blockstates/iron_casing.json +faf45dd324cb2eb2fb41f4cb4e8a4f0c17354e55 assets/actuallyadditions/blockstates/item_viewer.json +15221b5e677291096877b0521a9b25b45e481696 assets/actuallyadditions/blockstates/item_viewer_hopping.json +78e22fe7ed75763a0b1380f6bbdf6d2ee75349c8 assets/actuallyadditions/blockstates/lamp_black.json +e7303f1950c105585a232e129c08aec4ba4757b4 assets/actuallyadditions/blockstates/lamp_blue.json +91a5344f0a56cf0f627545aeb280c1d3c078805b assets/actuallyadditions/blockstates/lamp_brown.json +00d376e464b080c481b754f2c63e7c3232976ad0 assets/actuallyadditions/blockstates/lamp_cyan.json +1d48ed205dd8ce6d73bc2b86126a77f915ac92f1 assets/actuallyadditions/blockstates/lamp_gray.json +02bd872e78ea21af959d17854461d61678e76eaf assets/actuallyadditions/blockstates/lamp_green.json +7bfffcd7febce15e3fcf55b78409e89d45742b10 assets/actuallyadditions/blockstates/lamp_light_blue.json +8bad71deeab5390d73f71a0d7964829cd9e7abab assets/actuallyadditions/blockstates/lamp_light_gray.json +bf6421ca2e5f5ec5169017bba55268a8bad568e0 assets/actuallyadditions/blockstates/lamp_lime.json +a1383458a8fe6d8a01da1b0e40289e749caf8fff assets/actuallyadditions/blockstates/lamp_magenta.json +be35e553fca4856c0c5db405944995a4d434732b assets/actuallyadditions/blockstates/lamp_orange.json +f03fc3f6983755f0c8d231554a92acfcef9e90a0 assets/actuallyadditions/blockstates/lamp_pink.json +215800a01c69db104dd997095628f4cf4e4494e2 assets/actuallyadditions/blockstates/lamp_purple.json +04e242e27c9debdcf924adc4e7e85e8879c8d9ba assets/actuallyadditions/blockstates/lamp_red.json +7cfadd0f25de8b5035641238a8e18ffac1ef356c assets/actuallyadditions/blockstates/lamp_white.json +5e526bf21366f7382a19261b71c73f96d62a3a0c assets/actuallyadditions/blockstates/lamp_yellow.json +c384311568a9dc7a4313ebf050f590792de7e7aa assets/actuallyadditions/blockstates/laser_relay.json +64b9076d7ebd666dd8cabd88c8fdab6e5ae15124 assets/actuallyadditions/blockstates/laser_relay_advanced.json +3e11aee568ff4c28dc9a51a6800faa3047a0aa81 assets/actuallyadditions/blockstates/laser_relay_extreme.json +89e137a4932755e23cd7dc3e46d223b2332d11e1 assets/actuallyadditions/blockstates/laser_relay_fluids.json +a3821b684b590b815499ff25847ecfbbc217f14d assets/actuallyadditions/blockstates/laser_relay_item.json +33069098e2bb435c696b1862d9d47971b3247117 assets/actuallyadditions/blockstates/laser_relay_item_advanced.json +eae81ba22d5b7761dd5a03d909d857007a40c9e2 assets/actuallyadditions/blockstates/lava_factory_casing.json +9bcb5be7108d01028f654dcc8698b801a1663117 assets/actuallyadditions/blockstates/lava_factory_controller.json +27a1c7620994f8f4b325e9323003e9a8ea9ee931 assets/actuallyadditions/blockstates/leaf_generator.json +524d0f4b3f3da99d6160e762ed0d150dba3b1ddb assets/actuallyadditions/blockstates/long_range_breaker.json +2e6fb6a93071194b948b6b652231fc53da7afbfc assets/actuallyadditions/blockstates/oil_generator.json +5b68d0df00167ca673d86b2bb345691fd60fd561 assets/actuallyadditions/blockstates/palis_crystal_block.json +d9899e68b82cac7d080427d291799d5ccc461b79 assets/actuallyadditions/blockstates/palis_crystal_cluster.json +2ba22d62db1fff55423aae3d5fc0516c37403a34 assets/actuallyadditions/blockstates/phantom_booster.json +d2c3ca80de761bdcc085de38df3d644d441fedbf assets/actuallyadditions/blockstates/phantom_breaker.json +3a8fefcca9ded096e3dd3c778607530d0c74d779 assets/actuallyadditions/blockstates/phantom_energyface.json +12e45c6581b0514f083d4873755d1d0c63d9c5bf assets/actuallyadditions/blockstates/phantom_itemface.json +99db69ad81d96eadd687468a7b3003d8bd989354 assets/actuallyadditions/blockstates/phantom_liquiface.json +702fe3d15cff19bf608471a79a6c6147f67316a2 assets/actuallyadditions/blockstates/phantom_placer.json +de3892995f3291404547487cccfb1a46cb92a591 assets/actuallyadditions/blockstates/phantom_redstoneface.json +7a0986bbbed6384a092d144ab160e5b2ce76d984 assets/actuallyadditions/blockstates/placer.json +5b5d96cc80294bab8326589bbfb26f259e6b4e46 assets/actuallyadditions/blockstates/player_interface.json +50923317f8a38d90fab4a1750652f4598ea8309c assets/actuallyadditions/blockstates/powered_furnace.json +ffd1562cb05c8b16dd91bad96312550e9735d0ea assets/actuallyadditions/blockstates/ranged_collector.json +d89ce6c2187bf08f01097ce02c32aeacfb467bbf assets/actuallyadditions/blockstates/restonia_crystal_block.json +3c9ed33d3ed07283e498550cd6a1a2f08511dee9 assets/actuallyadditions/blockstates/restonia_crystal_cluster.json +52881b57e3b0b26b6db676d80d4baa99f2123a5a assets/actuallyadditions/blockstates/rice.json +32b6a5617cdd7da766baf9493225b5c7e23b9379 assets/actuallyadditions/blockstates/shock_suppressor.json +31c02c33e5dd66cec77d882380ad6ab9b065a50b assets/actuallyadditions/blockstates/tiny_torch.json +105225ba331191bf67a62584497e16bcbaf19ff6 assets/actuallyadditions/blockstates/vertical_digger.json +685e310c4658c3b04fc7cf87a88e03e529343bf0 assets/actuallyadditions/blockstates/void_crystal_block.json +29f829ee8c128ac0d280a77754529d956ae3fb23 assets/actuallyadditions/blockstates/void_crystal_cluster.json +955f5fa11ac48e71a3052082b293e8b01d428b74 assets/actuallyadditions/blockstates/wood_casing.json +244e220702a65c286381d576de62772c2d509cc5 assets/actuallyadditions/blockstates/xp_solidifier.json +e3b1972935fa68ca5feaad8f7412530df5d6b8a2 assets/actuallyadditions/models/block/canola.json +b68aaef024c240ac11ad9b7848fe1eef745f0ffc assets/actuallyadditions/models/block/coffee.json +915095a6b35cf3bc2cf8b501c06e3fb8847cbeae assets/actuallyadditions/models/block/ender_casing.json +3f86a2ce93e109ef575273c43edc075bc919de76 assets/actuallyadditions/models/block/ender_pearl_block.json +5b274d745475e1f01d9f0565531447e9da86ad6a assets/actuallyadditions/models/block/ethetic_green_block.json +3f5f9a6ad3d87756e54af6a2bc0c8a44038343dc assets/actuallyadditions/models/block/ethetic_white_block.json +ae0b77900f38b8af43b992b839d7460478a99dc4 assets/actuallyadditions/models/block/flax.json +b23b86dd6bf3d1e9790ce97bb309765d738bc8fe assets/actuallyadditions/models/block/iron_casing.json +9a4167f5cb4f9def9ae4f4ad9791e2773dd616d3 assets/actuallyadditions/models/block/lamp_black.json +e2850c26892021a6081d879987d6bd0290ca2be8 assets/actuallyadditions/models/block/lamp_blue.json +5bd10f41ffc6cf2f1efcef92dff373331dd54119 assets/actuallyadditions/models/block/lamp_brown.json +14ed1b8fecf46f624e6858231f5ff7e036aa06e3 assets/actuallyadditions/models/block/lamp_cyan.json +a77bf1d1fd7ccd28f949088cc5160edf4cf92f5d assets/actuallyadditions/models/block/lamp_gray.json +58df152c63c1e668aa78b432eaf049d1df7b7cd6 assets/actuallyadditions/models/block/lamp_green.json +1311cd7285cea40bf064a56233969a10d01010d4 assets/actuallyadditions/models/block/lamp_light_blue.json +0afd1ddbcdd8930a71e081f6cb127ccde6cc5213 assets/actuallyadditions/models/block/lamp_light_gray.json +b2662538ba004d135b2004c002e54505fcbcaa54 assets/actuallyadditions/models/block/lamp_lime.json +520214cdb180cde6efe972dc47fda278235d26ff assets/actuallyadditions/models/block/lamp_magenta.json +82ff5d39b894ec234820e0ebdd53b68189f5abfc assets/actuallyadditions/models/block/lamp_orange.json +df751483270af0f3113ab0afa89c54ba842acd39 assets/actuallyadditions/models/block/lamp_pink.json +06af88b6b663fe2225535e5381bf882c97efce88 assets/actuallyadditions/models/block/lamp_purple.json +efe29e2ef5b349859508e4b4d2de1ce71c0f121d assets/actuallyadditions/models/block/lamp_red.json +130c3474ae76340a8073100cfe20788f5ba61e9f assets/actuallyadditions/models/block/lamp_white.json +894c22e147a999b330fe4ae3b4e97ce7237e6d98 assets/actuallyadditions/models/block/lamp_yellow.json +bf348e13cbaf0532bc254c9efa92350ae8b0023c assets/actuallyadditions/models/block/rice.json +83da16f21abc2ec8361ecc3b1bda2852d48dbd97 assets/actuallyadditions/models/block/wood_casing.json a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json df2c79e474e102a0bf80ee90a753fbe3690110e5 data/actuallyadditions/recipes/axe_crystal_diamatine.json 8d4e7233566d4764348c7c21178553bdc79efb32 data/actuallyadditions/recipes/axe_crystal_emeradic.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/atomic_reconstructor.json b/src/generated/resources/assets/actuallyadditions/blockstates/atomic_reconstructor.json new file mode 100644 index 000000000..f73250747 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/atomic_reconstructor.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/atomic_reconstructor", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/atomic_reconstructor" + }, + "facing=north": { + "model": "actuallyadditions:block/atomic_reconstructor", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/atomic_reconstructor", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/atomic_reconstructor", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/atomic_reconstructor", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/battery_box.json b/src/generated/resources/assets/actuallyadditions/blockstates/battery_box.json new file mode 100644 index 000000000..a2e452216 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/battery_box.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/battery_box" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_block.json new file mode 100644 index 000000000..5d3e3626a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/black_quartz_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json new file mode 100644 index 000000000..906f79fe1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/black_quartz_pillar_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/breaker.json b/src/generated/resources/assets/actuallyadditions/blockstates/breaker.json new file mode 100644 index 000000000..71d55086e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/breaker.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/breaker", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/breaker" + }, + "facing=north": { + "model": "actuallyadditions:block/breaker", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/breaker", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/breaker", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/breaker", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/canola.json b/src/generated/resources/assets/actuallyadditions/blockstates/canola.json new file mode 100644 index 000000000..ff1a7ef96 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/canola.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/canola" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/canola_press.json b/src/generated/resources/assets/actuallyadditions/blockstates/canola_press.json new file mode 100644 index 000000000..6bfe078c5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/canola_press.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/canola_press" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json new file mode 100644 index 000000000..998349201 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/chiseled_black_quartz_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/coal_generator.json b/src/generated/resources/assets/actuallyadditions/blockstates/coal_generator.json new file mode 100644 index 000000000..0f352fa77 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/coal_generator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "actuallyadditions:block/coal_generator" + }, + "facing=south": { + "model": "actuallyadditions:block/coal_generator", + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/coal_generator", + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/coal_generator", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/coffee.json b/src/generated/resources/assets/actuallyadditions/blockstates/coffee.json new file mode 100644 index 000000000..6d67e2e3f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/coffee.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/coffee" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/coffee_machine.json b/src/generated/resources/assets/actuallyadditions/blockstates/coffee_machine.json new file mode 100644 index 000000000..06ae3836f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/coffee_machine.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "actuallyadditions:block/coffee_machine" + }, + "facing=south": { + "model": "actuallyadditions:block/coffee_machine", + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/coffee_machine", + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/coffee_machine", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crusher.json b/src/generated/resources/assets/actuallyadditions/blockstates/crusher.json new file mode 100644 index 000000000..48132904d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crusher.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,lit=false": { + "model": "actuallyadditions:block/crusher" + }, + "facing=south,lit=false": { + "model": "actuallyadditions:block/crusher", + "y": 180 + }, + "facing=west,lit=false": { + "model": "actuallyadditions:block/crusher", + "y": 270 + }, + "facing=east,lit=false": { + "model": "actuallyadditions:block/crusher", + "y": 90 + }, + "facing=north,lit=true": { + "model": "actuallyadditions:block/crusher" + }, + "facing=south,lit=true": { + "model": "actuallyadditions:block/crusher", + "y": 180 + }, + "facing=west,lit=true": { + "model": "actuallyadditions:block/crusher", + "y": 270 + }, + "facing=east,lit=true": { + "model": "actuallyadditions:block/crusher", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crusher_double.json b/src/generated/resources/assets/actuallyadditions/blockstates/crusher_double.json new file mode 100644 index 000000000..44c84ac43 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crusher_double.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,lit=false": { + "model": "actuallyadditions:block/crusher_double" + }, + "facing=south,lit=false": { + "model": "actuallyadditions:block/crusher_double", + "y": 180 + }, + "facing=west,lit=false": { + "model": "actuallyadditions:block/crusher_double", + "y": 270 + }, + "facing=east,lit=false": { + "model": "actuallyadditions:block/crusher_double", + "y": 90 + }, + "facing=north,lit=true": { + "model": "actuallyadditions:block/crusher_double" + }, + "facing=south,lit=true": { + "model": "actuallyadditions:block/crusher_double", + "y": 180 + }, + "facing=west,lit=true": { + "model": "actuallyadditions:block/crusher_double", + "y": 270 + }, + "facing=east,lit=true": { + "model": "actuallyadditions:block/crusher_double", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_block.json new file mode 100644 index 000000000..f2c6606ba --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/diamatine_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_cluster.json new file mode 100644 index 000000000..5c2001710 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/diamatine_crystal_cluster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/diamatine_crystal_cluster" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/display_stand.json b/src/generated/resources/assets/actuallyadditions/blockstates/display_stand.json new file mode 100644 index 000000000..ab18294dc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/display_stand.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/display_stand" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/dropper.json b/src/generated/resources/assets/actuallyadditions/blockstates/dropper.json new file mode 100644 index 000000000..079234440 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/dropper.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/dropper", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/dropper" + }, + "facing=north": { + "model": "actuallyadditions:block/dropper", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/dropper", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/dropper", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/dropper", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_block.json new file mode 100644 index 000000000..e44f87f47 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/emeradic_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_cluster.json new file mode 100644 index 000000000..cf2a4b758 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/emeradic_crystal_cluster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/emeradic_crystal_cluster" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/empowered_diamatine_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_diamatine_crystal_block.json new file mode 100644 index 000000000..8cb5a12cb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_diamatine_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowered_diamatine_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/empowered_emeradic_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_emeradic_crystal_block.json new file mode 100644 index 000000000..6085302ea --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_emeradic_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowered_emeradic_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/empowered_enori_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_enori_crystal_block.json new file mode 100644 index 000000000..196211de2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_enori_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowered_enori_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/empowered_palis_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_palis_crystal_block.json new file mode 100644 index 000000000..96a7e9ea4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_palis_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowered_palis_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/empowered_restonia_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_restonia_crystal_block.json new file mode 100644 index 000000000..5d55957ec --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_restonia_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowered_restonia_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/empowered_void_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_void_crystal_block.json new file mode 100644 index 000000000..a0c45fa7f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/empowered_void_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowered_void_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/empowerer.json b/src/generated/resources/assets/actuallyadditions/blockstates/empowerer.json new file mode 100644 index 000000000..bd1ad29c5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/empowerer.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowerer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ender_casing.json b/src/generated/resources/assets/actuallyadditions/blockstates/ender_casing.json new file mode 100644 index 000000000..65daa4f19 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ender_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/ender_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ender_pearl_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/ender_pearl_block.json new file mode 100644 index 000000000..fb7031e9d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ender_pearl_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/ender_pearl_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/energizer.json b/src/generated/resources/assets/actuallyadditions/blockstates/energizer.json new file mode 100644 index 000000000..c067fb5ee --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/energizer.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/energizer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/enervator.json b/src/generated/resources/assets/actuallyadditions/blockstates/enervator.json new file mode 100644 index 000000000..a11be99a4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/enervator.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/enervator" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_block.json new file mode 100644 index 000000000..875cbdc8d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/enori_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_cluster.json new file mode 100644 index 000000000..db3d8d1a8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/enori_crystal_cluster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/enori_crystal_cluster" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_block.json new file mode 100644 index 000000000..548ea5e53 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/ethetic_green_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_block.json new file mode 100644 index 000000000..86c8a0c14 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/ethetic_white_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/farmer.json b/src/generated/resources/assets/actuallyadditions/blockstates/farmer.json new file mode 100644 index 000000000..9d1c767a5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/farmer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "actuallyadditions:block/farmer" + }, + "facing=south": { + "model": "actuallyadditions:block/farmer", + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/farmer", + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/farmer", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/feeder.json b/src/generated/resources/assets/actuallyadditions/blockstates/feeder.json new file mode 100644 index 000000000..c8309a893 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/feeder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/feeder" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/fermenting_barrel.json b/src/generated/resources/assets/actuallyadditions/blockstates/fermenting_barrel.json new file mode 100644 index 000000000..5ab046ed5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/fermenting_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/fermenting_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/firework_box.json b/src/generated/resources/assets/actuallyadditions/blockstates/firework_box.json new file mode 100644 index 000000000..d0ddf6110 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/firework_box.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/firework_box" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/flax.json b/src/generated/resources/assets/actuallyadditions/blockstates/flax.json new file mode 100644 index 000000000..7d5e155ed --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/flax.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/flax" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/fluid_collector.json b/src/generated/resources/assets/actuallyadditions/blockstates/fluid_collector.json new file mode 100644 index 000000000..2e7172afd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/fluid_collector.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/fluid_collector", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/fluid_collector" + }, + "facing=north": { + "model": "actuallyadditions:block/fluid_collector", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/fluid_collector", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/fluid_collector", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/fluid_collector", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/fluid_placer.json b/src/generated/resources/assets/actuallyadditions/blockstates/fluid_placer.json new file mode 100644 index 000000000..0b30e80ba --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/fluid_placer.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/fluid_placer", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/fluid_placer" + }, + "facing=north": { + "model": "actuallyadditions:block/fluid_placer", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/fluid_placer", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/fluid_placer", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/fluid_placer", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/greenhouse_glass.json b/src/generated/resources/assets/actuallyadditions/blockstates/greenhouse_glass.json new file mode 100644 index 000000000..4122f6feb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/greenhouse_glass.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/greenhouse_glass" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/heat_collector.json b/src/generated/resources/assets/actuallyadditions/blockstates/heat_collector.json new file mode 100644 index 000000000..8e9ca18c9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/heat_collector.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/heat_collector" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/iron_casing.json b/src/generated/resources/assets/actuallyadditions/blockstates/iron_casing.json new file mode 100644 index 000000000..ba766cf17 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/iron_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/iron_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json new file mode 100644 index 000000000..2c0030bc9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/item_viewer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json new file mode 100644 index 000000000..d65a337a2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/item_viewer_hopping" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_black.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_black.json new file mode 100644 index 000000000..5dc42b300 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_black.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_black" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_black" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_blue.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_blue.json new file mode 100644 index 000000000..8bbf1e819 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_blue.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_blue" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_blue" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_brown.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_brown.json new file mode 100644 index 000000000..9b8f787c6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_brown.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_brown" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_brown" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_cyan.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_cyan.json new file mode 100644 index 000000000..2893db58b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_cyan.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_cyan" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_cyan" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_gray.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_gray.json new file mode 100644 index 000000000..d05b18c14 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_gray.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_gray" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_gray" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_green.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_green.json new file mode 100644 index 000000000..804f8c125 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_green.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_green" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_green" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_blue.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_blue.json new file mode 100644 index 000000000..400dbbc63 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_blue.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_light_blue" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_light_blue" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_gray.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_gray.json new file mode 100644 index 000000000..4e1d0d58c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_light_gray.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_light_gray" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_light_gray" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_lime.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_lime.json new file mode 100644 index 000000000..347e076d5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_lime.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_lime" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_lime" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_magenta.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_magenta.json new file mode 100644 index 000000000..23a40f0b4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_magenta.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_magenta" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_magenta" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_orange.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_orange.json new file mode 100644 index 000000000..aab7cd573 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_orange.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_orange" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_orange" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_pink.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_pink.json new file mode 100644 index 000000000..568833975 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_pink.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_pink" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_pink" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_purple.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_purple.json new file mode 100644 index 000000000..2df28a07c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_purple.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_purple" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_purple" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_red.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_red.json new file mode 100644 index 000000000..4280fde9a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_red.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_red" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_red" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_white.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_white.json new file mode 100644 index 000000000..48e55aa7a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_white.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_white" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_white" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_yellow.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_yellow.json new file mode 100644 index 000000000..783f8174d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_yellow.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "actuallyadditions:block/lamp_yellow" + }, + "lit=true": { + "model": "actuallyadditions:block/lamp_yellow" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay.json new file mode 100644 index 000000000..2ecdc7a86 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/laser_relay" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced.json new file mode 100644 index 000000000..bbf55a90a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/laser_relay_advanced" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme.json new file mode 100644 index 000000000..f8525e850 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/laser_relay_extreme" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids.json new file mode 100644 index 000000000..d7f99a683 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/laser_relay_fluids" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item.json new file mode 100644 index 000000000..882b52686 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/laser_relay_item" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_advanced.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_advanced.json new file mode 100644 index 000000000..410d30544 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_advanced.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/laser_relay_item_advanced" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_casing.json b/src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_casing.json new file mode 100644 index 000000000..8fde2b321 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/lava_factory_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_controller.json b/src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_controller.json new file mode 100644 index 000000000..3ce906884 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lava_factory_controller.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "actuallyadditions:block/lava_factory_controller" + }, + "facing=south": { + "model": "actuallyadditions:block/lava_factory_controller", + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/lava_factory_controller", + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/lava_factory_controller", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/leaf_generator.json b/src/generated/resources/assets/actuallyadditions/blockstates/leaf_generator.json new file mode 100644 index 000000000..8266ada86 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/leaf_generator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "actuallyadditions:block/leaf_generator" + }, + "facing=south": { + "model": "actuallyadditions:block/leaf_generator", + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/leaf_generator", + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/leaf_generator", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/long_range_breaker.json b/src/generated/resources/assets/actuallyadditions/blockstates/long_range_breaker.json new file mode 100644 index 000000000..d84c392eb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/long_range_breaker.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/long_range_breaker", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/long_range_breaker" + }, + "facing=north": { + "model": "actuallyadditions:block/long_range_breaker", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/long_range_breaker", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/long_range_breaker", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/long_range_breaker", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/oil_generator.json b/src/generated/resources/assets/actuallyadditions/blockstates/oil_generator.json new file mode 100644 index 000000000..49f64c6a8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/oil_generator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "actuallyadditions:block/oil_generator" + }, + "facing=south": { + "model": "actuallyadditions:block/oil_generator", + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/oil_generator", + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/oil_generator", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_block.json new file mode 100644 index 000000000..5168cdfcf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/palis_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_cluster.json new file mode 100644 index 000000000..97f03ca9e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/palis_crystal_cluster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/palis_crystal_cluster" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/phantom_booster.json b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_booster.json new file mode 100644 index 000000000..39c9307e7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_booster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/phantom_booster" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/phantom_breaker.json b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_breaker.json new file mode 100644 index 000000000..da242b5b6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_breaker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/phantom_breaker" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/phantom_energyface.json b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_energyface.json new file mode 100644 index 000000000..e9da038d5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_energyface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/phantom_energyface" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/phantom_itemface.json b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_itemface.json new file mode 100644 index 000000000..ab6806ffd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_itemface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/phantom_itemface" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/phantom_liquiface.json b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_liquiface.json new file mode 100644 index 000000000..101fc0496 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_liquiface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/phantom_liquiface" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/phantom_placer.json b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_placer.json new file mode 100644 index 000000000..ba323a100 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_placer.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/phantom_placer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/phantom_redstoneface.json b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_redstoneface.json new file mode 100644 index 000000000..30c51a8bc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/phantom_redstoneface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/phantom_redstoneface" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/placer.json b/src/generated/resources/assets/actuallyadditions/blockstates/placer.json new file mode 100644 index 000000000..a823617cf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/placer.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "actuallyadditions:block/placer", + "x": 180 + }, + "facing=up": { + "model": "actuallyadditions:block/placer" + }, + "facing=north": { + "model": "actuallyadditions:block/placer", + "x": 90 + }, + "facing=south": { + "model": "actuallyadditions:block/placer", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/placer", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/placer", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/player_interface.json b/src/generated/resources/assets/actuallyadditions/blockstates/player_interface.json new file mode 100644 index 000000000..802105f7e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/player_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/player_interface" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace.json b/src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace.json new file mode 100644 index 000000000..3ddb99ac1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,lit=false": { + "model": "actuallyadditions:block/powered_furnace" + }, + "facing=south,lit=false": { + "model": "actuallyadditions:block/powered_furnace", + "y": 180 + }, + "facing=west,lit=false": { + "model": "actuallyadditions:block/powered_furnace", + "y": 270 + }, + "facing=east,lit=false": { + "model": "actuallyadditions:block/powered_furnace", + "y": 90 + }, + "facing=north,lit=true": { + "model": "actuallyadditions:block/powered_furnace" + }, + "facing=south,lit=true": { + "model": "actuallyadditions:block/powered_furnace", + "y": 180 + }, + "facing=west,lit=true": { + "model": "actuallyadditions:block/powered_furnace", + "y": 270 + }, + "facing=east,lit=true": { + "model": "actuallyadditions:block/powered_furnace", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ranged_collector.json b/src/generated/resources/assets/actuallyadditions/blockstates/ranged_collector.json new file mode 100644 index 000000000..499b6ee51 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ranged_collector.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/ranged_collector" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_block.json new file mode 100644 index 000000000..509ec8dd1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/restonia_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_cluster.json new file mode 100644 index 000000000..4e462ccde --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/restonia_crystal_cluster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/restonia_crystal_cluster" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/rice.json b/src/generated/resources/assets/actuallyadditions/blockstates/rice.json new file mode 100644 index 000000000..0bea707eb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/rice.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/rice" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/shock_suppressor.json b/src/generated/resources/assets/actuallyadditions/blockstates/shock_suppressor.json new file mode 100644 index 000000000..6d7cee0de --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/shock_suppressor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/shock_suppressor" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/tiny_torch.json b/src/generated/resources/assets/actuallyadditions/blockstates/tiny_torch.json new file mode 100644 index 000000000..30b013f35 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/tiny_torch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/tiny_torch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/vertical_digger.json b/src/generated/resources/assets/actuallyadditions/blockstates/vertical_digger.json new file mode 100644 index 000000000..dd939baa3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/vertical_digger.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "actuallyadditions:block/vertical_digger" + }, + "facing=south": { + "model": "actuallyadditions:block/vertical_digger", + "y": 180 + }, + "facing=west": { + "model": "actuallyadditions:block/vertical_digger", + "y": 270 + }, + "facing=east": { + "model": "actuallyadditions:block/vertical_digger", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_block.json new file mode 100644 index 000000000..65a406082 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/void_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_cluster.json new file mode 100644 index 000000000..5b3247c6e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/void_crystal_cluster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/void_crystal_cluster" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/wood_casing.json b/src/generated/resources/assets/actuallyadditions/blockstates/wood_casing.json new file mode 100644 index 000000000..4bd329f8a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/wood_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/wood_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/xp_solidifier.json b/src/generated/resources/assets/actuallyadditions/blockstates/xp_solidifier.json new file mode 100644 index 000000000..f2f6ec87c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/xp_solidifier.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/xp_solidifier" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/canola.json b/src/generated/resources/assets/actuallyadditions/models/block/canola.json new file mode 100644 index 000000000..a3ae80b4b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/canola.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/canola" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/coffee.json b/src/generated/resources/assets/actuallyadditions/models/block/coffee.json new file mode 100644 index 000000000..0176018f6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/coffee.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/coffee" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ender_casing.json b/src/generated/resources/assets/actuallyadditions/models/block/ender_casing.json new file mode 100644 index 000000000..b334e18de --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ender_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/ender_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ender_pearl_block.json b/src/generated/resources/assets/actuallyadditions/models/block/ender_pearl_block.json new file mode 100644 index 000000000..18d025157 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ender_pearl_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/ender_pearl_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_block.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_block.json new file mode 100644 index 000000000..3a190338a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_block.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_block.json new file mode 100644 index 000000000..9251bfb23 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/flax.json b/src/generated/resources/assets/actuallyadditions/models/block/flax.json new file mode 100644 index 000000000..4bca44192 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/flax.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/flax" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/iron_casing.json b/src/generated/resources/assets/actuallyadditions/models/block/iron_casing.json new file mode 100644 index 000000000..2f9125f3e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/iron_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/iron_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json new file mode 100644 index 000000000..cd6014011 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_black" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json new file mode 100644 index 000000000..9b1672eec --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json new file mode 100644 index 000000000..c52c3d4d0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_brown" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json new file mode 100644 index 000000000..f5f93bbe0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_cyan" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json new file mode 100644 index 000000000..f341bec92 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_gray" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json new file mode 100644 index 000000000..53a94037a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_green" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json new file mode 100644 index 000000000..fe2c421fe --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_light_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json new file mode 100644 index 000000000..743fcefc7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_light_gray" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json new file mode 100644 index 000000000..61b67742b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_lime" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json new file mode 100644 index 000000000..2346559d3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_magenta" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json new file mode 100644 index 000000000..54f478044 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_orange" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json new file mode 100644 index 000000000..bde4fa2a6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_pink" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json new file mode 100644 index 000000000..06ae88bed --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_purple" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json new file mode 100644 index 000000000..37904a2e2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_red" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json new file mode 100644 index 000000000..e163bd9eb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_white" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json new file mode 100644 index 000000000..a6c0e261d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_yellow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/rice.json b/src/generated/resources/assets/actuallyadditions/models/block/rice.json new file mode 100644 index 000000000..7861220a1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/rice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/rice" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/wood_casing.json b/src/generated/resources/assets/actuallyadditions/models/block/wood_casing.json new file mode 100644 index 000000000..f960a8909 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/wood_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/wood_casing" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java index 2e8aa77f5..b56ac662a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java @@ -30,6 +30,8 @@ public class ActuallyAdditionsData { generator.addProvider(generatorBlockTags); generator.addProvider(new ItemTagsGenerator(generator, generatorBlockTags, helper)); + generator.addProvider(new BlockStateGenerator(generator, helper)); + generator.addProvider(new LaserRecipeGenerator(generator)); generator.addProvider(new EmpoweringRecipeGenerator(generator)); generator.addProvider(new CrushingRecipeGenerator(generator)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java new file mode 100644 index 000000000..98f529a12 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java @@ -0,0 +1,210 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.data.ExistingFileHelper; + +import java.util.function.Supplier; + +public class BlockStateGenerator extends BlockStateProvider { + public BlockStateGenerator(DataGenerator gen, ExistingFileHelper exFileHelper) { + super(gen, ActuallyAdditions.MODID, exFileHelper); + } + + @Override + protected void registerStatesAndModels() { + // Fully Directional Blocks + fullyDirectionalBlock(ActuallyBlocks.ATOMIC_RECONSTRUCTOR); + fullyDirectionalBlock(ActuallyBlocks.BREAKER); + fullyDirectionalBlock(ActuallyBlocks.PLACER); + fullyDirectionalBlock(ActuallyBlocks.DROPPER); + fullyDirectionalBlock(ActuallyBlocks.FLUID_PLACER); + fullyDirectionalBlock(ActuallyBlocks.FLUID_COLLECTOR); + fullyDirectionalBlock(ActuallyBlocks.LONG_RANGE_BREAKER); + + // Horizontal Directional Blocks + horizontallyDirectionalBlock(ActuallyBlocks.FARMER); + //horizontallyDirectionalBlock(ActuallyBlocks.BIOREACTOR); + horizontallyDirectionalBlock(ActuallyBlocks.VERTICAL_DIGGER); + horizontallyDirectionalBlock(ActuallyBlocks.LEAF_GENERATOR); + horizontallyDirectionalBlock(ActuallyBlocks.COFFEE_MACHINE); + horizontallyDirectionalBlock(ActuallyBlocks.CRUSHER); + horizontallyDirectionalBlock(ActuallyBlocks.CRUSHER_DOUBLE); + horizontallyDirectionalBlock(ActuallyBlocks.POWERED_FURNACE); + horizontallyDirectionalBlock(ActuallyBlocks.COAL_GENERATOR); + horizontallyDirectionalBlock(ActuallyBlocks.OIL_GENERATOR); + //horizontallyDirectionalBlock(ActuallyBlocks.LAMP_CONTROLLER); //TODO missing + horizontallyDirectionalBlock(ActuallyBlocks.LAVA_FACTORY_CONTROLLER); + + // Standard Block + standardBlock(ActuallyBlocks.RESTONIA_CRYSTAL_CLUSTER); + standardBlock(ActuallyBlocks.PALIS_CRYSTAL_CLUSTER); + standardBlock(ActuallyBlocks.DIAMATINE_CRYSTAL_CLUSTER); + standardBlock(ActuallyBlocks.VOID_CRYSTAL_CLUSTER); + standardBlock(ActuallyBlocks.EMERADIC_CRYSTAL_CLUSTER); + standardBlock(ActuallyBlocks.ENORI_CRYSTAL_CLUSTER); + standardBlock(ActuallyBlocks.BATTERY_BOX); + standardBlock(ActuallyBlocks.ITEM_INTERFACE_HOPPING); + standardBlock(ActuallyBlocks.EMPOWERER); + standardBlock(ActuallyBlocks.TINY_TORCH); + standardBlock(ActuallyBlocks.SHOCK_SUPPRESSOR); + standardBlock(ActuallyBlocks.DISPLAY_STAND); + standardBlock(ActuallyBlocks.PLAYER_INTERFACE); + standardBlock(ActuallyBlocks.ITEM_INTERFACE); + standardBlock(ActuallyBlocks.FIREWORK_BOX); + standardBlock(ActuallyBlocks.RESTONIA_CRYSTAL); + standardBlock(ActuallyBlocks.PALIS_CRYSTAL); + standardBlock(ActuallyBlocks.DIAMATINE_CRYSTAL); + standardBlock(ActuallyBlocks.VOID_CRYSTAL); + standardBlock(ActuallyBlocks.EMERADIC_CRYSTAL); + standardBlock(ActuallyBlocks.ENORI_CRYSTAL); + standardBlock(ActuallyBlocks.EMPOWERED_RESTONIA_CRYSTAL); + standardBlock(ActuallyBlocks.EMPOWERED_PALIS_CRYSTAL); + standardBlock(ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL); + standardBlock(ActuallyBlocks.EMPOWERED_VOID_CRYSTAL); + standardBlock(ActuallyBlocks.EMPOWERED_EMERADIC_CRYSTAL); + standardBlock(ActuallyBlocks.EMPOWERED_ENORI_CRYSTAL); + standardBlock(ActuallyBlocks.LASER_RELAY); + standardBlock(ActuallyBlocks.LASER_RELAY_ADVANCED); + standardBlock(ActuallyBlocks.LASER_RELAY_EXTREME); + standardBlock(ActuallyBlocks.LASER_RELAY_FLUIDS); + standardBlock(ActuallyBlocks.LASER_RELAY_ITEM); + standardBlock(ActuallyBlocks.LASER_RELAY_ITEM_ADVANCED); + standardBlock(ActuallyBlocks.RANGED_COLLECTOR); + standardBlock(ActuallyBlocks.XP_SOLIDIFIER); + standardBlock(ActuallyBlocks.ENERGIZER); + standardBlock(ActuallyBlocks.ENERVATOR); + standardBlock(ActuallyBlocks.CANOLA_PRESS); + standardBlock(ActuallyBlocks.PHANTOM_ITEMFACE); + standardBlock(ActuallyBlocks.PHANTOM_PLACER); + standardBlock(ActuallyBlocks.PHANTOM_LIQUIFACE); + standardBlock(ActuallyBlocks.PHANTOM_ENERGYFACE); + standardBlock(ActuallyBlocks.PHANTOM_REDSTONEFACE); + standardBlock(ActuallyBlocks.PHANTOM_BREAKER); + standardBlock(ActuallyBlocks.FERMENTING_BARREL); + standardBlock(ActuallyBlocks.FEEDER); + standardBlock(ActuallyBlocks.HEAT_COLLECTOR); + standardBlock(ActuallyBlocks.GREENHOUSE_GLASS); + standardBlock(ActuallyBlocks.PHANTOM_BOOSTER); + + // Lamps + buildLitState(ActuallyBlocks.LAMP_WHITE); + buildLitState(ActuallyBlocks.LAMP_ORANGE); + buildLitState(ActuallyBlocks.LAMP_MAGENTA); + buildLitState(ActuallyBlocks.LAMP_LIGHT_BLUE); + buildLitState(ActuallyBlocks.LAMP_YELLOW); + buildLitState(ActuallyBlocks.LAMP_LIME); + buildLitState(ActuallyBlocks.LAMP_PINK); + buildLitState(ActuallyBlocks.LAMP_GRAY); + buildLitState(ActuallyBlocks.LAMP_LIGHT_GRAY); + buildLitState(ActuallyBlocks.LAMP_CYAN); + buildLitState(ActuallyBlocks.LAMP_PURPLE); + buildLitState(ActuallyBlocks.LAMP_BLUE); + buildLitState(ActuallyBlocks.LAMP_BROWN); + buildLitState(ActuallyBlocks.LAMP_GREEN); + buildLitState(ActuallyBlocks.LAMP_RED); + buildLitState(ActuallyBlocks.LAMP_BLACK); + + // TO BE SORTED + buildCubeAll(ActuallyBlocks.RICE); + buildCubeAll(ActuallyBlocks.CANOLA); + buildCubeAll(ActuallyBlocks.FLAX); + buildCubeAll(ActuallyBlocks.COFFEE); + + //buildCubeAll(ActuallyBlocks.CHARCOAL); //TODO hmm? + buildCubeAll(ActuallyBlocks.ENDER_CASING); + buildCubeAll(ActuallyBlocks.ENDER_PEARL_BLOCK); + buildCubeAll(ActuallyBlocks.IRON_CASING); + standardBlock(ActuallyBlocks.LAVA_FACTORY_CASING); + //buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTZ); //TODO HMM + buildCubeAll(ActuallyBlocks.WOOD_CASING); + + // Quartz + standardBlock(ActuallyBlocks.BLACK_QUARTZ_BLOCK); + //buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_SMOOTH); //TODO + standardBlock(ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK); + standardBlock(ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK); + //buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_BRICK); //TODO + buildCubeAll(ActuallyBlocks.ETHETIC_GREEN_BLOCK); + buildCubeAll(ActuallyBlocks.ETHETIC_WHITE_BLOCK); + +/* // Walls + wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_WALL.get(), modLoc("block/black_quartz_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_SMOOTH_QUARTZ_WALL.get(), modLoc("block/black_quartz_smooth_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get(), modLoc("block/black_quartz_chiseled_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL.get(), modLoc("block/black_quartz_pillar_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_BRICK_QUARTZ_WALL.get(), modLoc("block/black_quartz_brick_block")); + + wallBlock((WallBlock) ActuallyBlocks.GREEN_WALL.get(), modLoc("block/green_block")); + wallBlock((WallBlock) ActuallyBlocks.WHITE_WALL.get(), modLoc("block/white_block")); + + // Stairs + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), modLoc("block/black_quartz_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_SMOOTH_QUARTZ_STAIR.get(), modLoc("block/black_quartz_smooth_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_STAIR.get(), modLoc("block/black_quartz_chiseled_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_STAIR.get(), modLoc("block/black_quartz_pillar_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_BRICK_QUARTZ_STAIR.get(), modLoc("block/black_quartz_brick_block")); + + stairsBlock((StairsBlock) ActuallyBlocks.GREEN_STAIRS.get(), modLoc("block/green_block")); + stairsBlock((StairsBlock) ActuallyBlocks.WHITE_STAIRS.get(), modLoc("block/white_block")); + + // Slabs + slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_block"), modLoc("block/black_quartz_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_SMOOTH_QUARTZ_SLAB.get(), modLoc("block/black_quartz_smooth_block"), modLoc("block/black_quartz_smooth_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_SLAB.get(), modLoc("block/black_quartz_chiseled_block"), modLoc("block/black_quartz_chiseled_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_SLAB.get(), modLoc("block/black_quartz_pillar_block"), modLoc("block/black_quartz_pillar_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_BRICK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_brick_block"), modLoc("block/black_quartz_brick_block")); + + slabBlock((SlabBlock) ActuallyBlocks.GREEN_SLAB.get(), modLoc("block/green_block"), modLoc("block/green_block")); + slabBlock((SlabBlock) ActuallyBlocks.WHITE_SLAB.get(), modLoc("block/white_block"), modLoc("block/white_block"));*/ + + } + + + private void buildCubeAll(Supplier block) { + simpleBlock(block.get()); + } + + private void standardBlock(Supplier block) { + ResourceLocation name = block.get().getRegistryName(); + ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1])); + + assert name != null; + simpleBlock(block.get(), model); + } + + private void buildLitState(Supplier block) { + ResourceLocation name = block.get().getRegistryName(); + assert name != null; + + getVariantBuilder(block.get()) + .partialState().with(BlockStateProperties.LIT, false) + .addModels(ConfiguredModel.builder().modelFile(models().cubeAll(name.toString(), modLoc("block/" + name.getPath()))).build()) + .partialState().with(BlockStateProperties.LIT, true) + .addModels(ConfiguredModel.builder().modelFile(models().cubeAll(name.toString(), modLoc("block/" + name.getPath().replace("_block", "_on_block")))).build()); + } + + private void fullyDirectionalBlock(Supplier block) { + ResourceLocation name = block.get().getRegistryName(); + ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1])); + ModelFile verModel = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1] + "_ver")); + + assert name != null; + directionalBlock(block.get(), model); + } + + private void horizontallyDirectionalBlock(Supplier block) { + ResourceLocation name = block.get().getRegistryName(); + ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1])); + + assert name != null; + horizontalBlock(block.get(), model); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index f469f3074..f068cbb4c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -37,8 +37,11 @@ import de.ellpeck.actuallyadditions.mod.update.UpdateChecker; import de.ellpeck.actuallyadditions.mod.util.ResourceReloader; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.event.AddReloadListenerEvent; @@ -102,6 +105,7 @@ public class ActuallyAdditions { ActuallyRecipes.init(eventBus); ActuallyContainers.CONTAINERS.register(eventBus); ENTITIES.register(eventBus); + eventBus.addListener(this::onConfigReload); MinecraftForge.EVENT_BUS.addListener(this::serverStarted); MinecraftForge.EVENT_BUS.addListener(this::serverStopped); @@ -140,6 +144,11 @@ public class ActuallyAdditions { LensMining.init(); } + private void onConfigReload(ModConfig.ModConfigEvent event) { + Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(CommonConfig.OTHER.REDSTONECONFIGURATOR.get())); + CommonConfig.OTHER.redstoneConfigureItem = item != null?item: Items.AIR; + } + private void clientSetup(FMLClientSetupEvent event) { ActuallyAdditionsClient.setup(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java index 4148a2b3b..9a5650954 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java @@ -1,5 +1,8 @@ package de.ellpeck.actuallyadditions.mod.config; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeConfigSpec; public class CommonConfig { @@ -29,6 +32,8 @@ public class CommonConfig { public static ForgeConfigSpec.BooleanValue SUPER_DUPER_HARD_MODE; public static ForgeConfigSpec.BooleanValue MOST_BLAND_PERSON_EVER; public static ForgeConfigSpec.IntValue ELEVEN; + public static ForgeConfigSpec.ConfigValue REDSTONECONFIGURATOR; + public static Item redstoneConfigureItem = Items.AIR; public static void build() { @@ -83,6 +88,8 @@ public class CommonConfig { ELEVEN = BUILDER.comment("11?").defineInRange("whatIs11", 11, 0, 12); + REDSTONECONFIGURATOR = BUILDER.comment("define the item used to configure Redstone Mode").define("redstoneConfigurator", Items.REDSTONE_TORCH.getRegistryName().toString(), obj -> obj instanceof String && ResourceLocation.isValidResourceLocation((String) obj)); + BUILDER.pop(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java index 64c0deca5..6cf9cdb1b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.event; import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.IHudDisplay; +import de.ellpeck.actuallyadditions.mod.config.CommonConfig; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.data.WorldData; import de.ellpeck.actuallyadditions.mod.inventory.gui.EnergyDisplay; @@ -199,7 +200,7 @@ public class ClientEvents { if (StackUtil.isValid(stack) && stack.getItem() == ConfigValues.itemRedstoneTorchConfigurator) { expl = TextFormatting.GREEN + StringUtil.localize("info." + ActuallyAdditions.MODID + ".redstoneMode.validItem"); } else { - expl = TextFormatting.GRAY.toString() + TextFormatting.ITALIC + StringUtil.localizeFormatted("info." + ActuallyAdditions.MODID + ".redstoneMode.invalidItem", StringUtil.localize(ConfigValues.itemRedstoneTorchConfigurator.getDescriptionId() + ".name")); + expl = TextFormatting.GRAY.toString() + TextFormatting.ITALIC + StringUtil.localizeFormatted("info." + ActuallyAdditions.MODID + ".redstoneMode.invalidItem", StringUtil.localize(CommonConfig.OTHER.redstoneConfigureItem.getDescriptionId() + ".name")); } font.drawShadow(event.getMatrixStack(), expl, event.getWindow().getGuiScaledWidth() / 2f + 5, event.getWindow().getGuiScaledHeight() / 2f + 15, StringUtil.DECIMAL_COLOR_WHITE); } diff --git a/src/main/resources/assets/actuallyadditions/textures/block/advanced_item_laser_relay_block.png b/src/main/resources/assets/actuallyadditions/textures/block/advanced_item_laser_relay.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/advanced_item_laser_relay_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/advanced_item_laser_relay.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_block.png b/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_front (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_front (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/battery_box_block.png b/src/main/resources/assets/actuallyadditions/textures/block/battery_box.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/battery_box_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/battery_box.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/bio_reactor_block.png b/src/main/resources/assets/actuallyadditions/textures/block/bio_reactor.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/bio_reactor_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/bio_reactor.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_lotus_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_lotus.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_lotus_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_lotus.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/breaker_block.png b/src/main/resources/assets/actuallyadditions/textures/block/breaker.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/breaker_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/breaker.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/breaker_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/breaker_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/breaker_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/breaker_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/breaker_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/breaker_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/breaker_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/breaker_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/canola_block.png b/src/main/resources/assets/actuallyadditions/textures/block/canola.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/canola_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/canola.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/canola_press_block.png b/src/main/resources/assets/actuallyadditions/textures/block/canola_press (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/canola_press_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/canola_press (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/canola_press_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/canola_press_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/canola_press_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/canola_press_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/canola_block_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/canola_stage_2.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/canola_block_stage_2.png rename to src/main/resources/assets/actuallyadditions/textures/block/canola_stage_2.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/canola_block_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/canola_stage_3.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/canola_block_stage_3.png rename to src/main/resources/assets/actuallyadditions/textures/block/canola_stage_3.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/canola_block_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/canola_stage_4.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/canola_block_stage_4.png rename to src/main/resources/assets/actuallyadditions/textures/block/canola_stage_4.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/charcoal_block.png b/src/main/resources/assets/actuallyadditions/textures/block/charcoal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/charcoal_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/charcoal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block.png b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/coal_generator.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/coal_generator_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block_side.png b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_side.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block_side.png rename to src/main/resources/assets/actuallyadditions/textures/block/coal_generator_side.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coal_generator_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/coal_generator_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_block.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_machine_block.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_machine.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_machine_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee_machine.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_2.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_2.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_2.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_3.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_3.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_3.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_4.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_4.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_4.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_5.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_5.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_5.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_6.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_6.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_block_stage_6.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_6.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crusher_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crusher_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crusher_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crusher_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crusher_double_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_double.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crusher_double_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_double.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crusher_block_on.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crusher_block_on.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crusher_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crusher_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_enori.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_palis.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_void_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_void.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_block.png b/src/main/resources/assets/actuallyadditions/textures/block/directional_breaker.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/directional_breaker.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/directional_breaker_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/display_stand_block.png b/src/main/resources/assets/actuallyadditions/textures/block/display_stand.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/display_stand_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/display_stand.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/display_stand_block_side.png b/src/main/resources/assets/actuallyadditions/textures/block/display_stand_side (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/display_stand_block_side.png rename to src/main/resources/assets/actuallyadditions/textures/block/display_stand_side (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/dropper_block.png b/src/main/resources/assets/actuallyadditions/textures/block/dropper.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/dropper_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/dropper.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/dropper_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/dropper_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/dropper_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/dropper_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/dropper_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/dropper_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/dropper_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/dropper_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/empowerer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/empowerer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/empowerer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/empowerer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/ender_casing_block.png b/src/main/resources/assets/actuallyadditions/textures/block/ender_casing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/ender_casing_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/ender_casing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/enderpearl_block.png b/src/main/resources/assets/actuallyadditions/textures/block/ender_pearl_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/enderpearl_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/ender_pearl_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energizer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/energizer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/energizer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/energizer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energizer_block_side.png b/src/main/resources/assets/actuallyadditions/textures/block/energizer_side (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/energizer_block_side.png rename to src/main/resources/assets/actuallyadditions/textures/block/energizer_side (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energizer_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/energizer_top (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/energizer_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/energizer_top (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_block.png b/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_advanced_block.png b/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_advanced.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_advanced_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_advanced.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_extreme_block.png b/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_extreme.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_extreme_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_extreme.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/enervator_block.png b/src/main/resources/assets/actuallyadditions/textures/block/enervator.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/enervator_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/enervator.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/enervator_block_side.png b/src/main/resources/assets/actuallyadditions/textures/block/enervator_side (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/enervator_block_side.png rename to src/main/resources/assets/actuallyadditions/textures/block/enervator_side (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/enervator_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/enervator_top (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/enervator_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/enervator_top (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/esd_block.png b/src/main/resources/assets/actuallyadditions/textures/block/esd.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/esd_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/esd.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/esd_advanced_block.png b/src/main/resources/assets/actuallyadditions/textures/block/esd_advanced.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/esd_advanced_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/esd_advanced.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/green_block.png b/src/main/resources/assets/actuallyadditions/textures/block/ethetic_green_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/green_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/ethetic_green_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/white_block.png b/src/main/resources/assets/actuallyadditions/textures/block/ethetic_white_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/white_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/ethetic_white_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/farmer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/farmer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/farmer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/farmer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/farmer_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/farmer_front (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/farmer_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/farmer_front (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/farmer_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/farmer_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/farmer_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/farmer_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/feeder_block.png b/src/main/resources/assets/actuallyadditions/textures/block/feeder.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/feeder_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/feeder.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/feeder_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/feeder_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/feeder_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/feeder_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel_block.png b/src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/fermenting_barrel_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/firework_box_block.png b/src/main/resources/assets/actuallyadditions/textures/block/firework_box.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/firework_box_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/firework_box.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/firework_box_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/firework_box_top (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/firework_box_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/firework_box_top (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fishing_net_block.png b/src/main/resources/assets/actuallyadditions/textures/block/fishing_net (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fishing_net_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/fishing_net (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_block.png b/src/main/resources/assets/actuallyadditions/textures/block/flax.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/flax_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/flax.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_2.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_2.png rename to src/main/resources/assets/actuallyadditions/textures/block/flax_stage_2.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_3.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_3.png rename to src/main/resources/assets/actuallyadditions/textures/block/flax_stage_3.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_4.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_4.png rename to src/main/resources/assets/actuallyadditions/textures/block/flax_stage_4.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_5.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_5.png rename to src/main/resources/assets/actuallyadditions/textures/block/flax_stage_5.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_6.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_6.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/flax_block_stage_6.png rename to src/main/resources/assets/actuallyadditions/textures/block/flax_stage_6.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_block.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid_collector.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_front (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_front (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_placer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid_placer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_front (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_front (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluids_laser_relay_block.png b/src/main/resources/assets/actuallyadditions/textures/block/fluids_laser_relay.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/fluids_laser_relay_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluids_laser_relay.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/greenhouse_glass_block.png b/src/main/resources/assets/actuallyadditions/textures/block/greenhouse_glass.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/greenhouse_glass_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/greenhouse_glass.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_block.png b/src/main/resources/assets/actuallyadditions/textures/block/heat_collector.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/heat_collector_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/heat_collector.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/heat_collector_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/heat_collector_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_top (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/heat_collector_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/heat_collector_top (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block.png b/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_inside.png b/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_inside.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_inside.png rename to src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_inside.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/iron_casing_block.png b/src/main/resources/assets/actuallyadditions/textures/block/iron_casing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/iron_casing_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/iron_casing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow_block.png b/src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/iron_casing_snow_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_interface_block.png b/src/main/resources/assets/actuallyadditions/textures/block/item_interface.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_interface_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/item_interface.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_laser_relay_block.png b/src/main/resources/assets/actuallyadditions/textures/block/item_laser_relay.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_laser_relay_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/item_laser_relay.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/item_repairer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_repairer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/item_repairer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_repairer_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/item_repairer_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_top (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_repairer_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/item_repairer_top (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_black.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_black_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_black.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_brown.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_controller.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_front_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_front (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_front_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_front (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_green.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_green_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_green.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_lime.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_orange.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_pink.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_purple.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_red_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_red.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_red_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_red.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_white_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_white.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_white_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_white.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lava_factory_case_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lava_factory_case.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lava_factory_case_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lava_factory_case.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/lava_factory_controller_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_block.png b/src/main/resources/assets/actuallyadditions/textures/block/leaf_generator.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/leaf_generator.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/leaf_generator_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/miner_block.png b/src/main/resources/assets/actuallyadditions/textures/block/miner.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/miner_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/miner.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/miner_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/miner_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/miner_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/miner_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/miner_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/miner_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/miner_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/miner_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_block.png b/src/main/resources/assets/actuallyadditions/textures/block/oil_generator.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/oil_generator_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/oil_generator.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/oil_generator_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/oil_generator_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/oil_generator_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/oil_generator_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz_block.png b/src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantom_booster_block.png b/src/main/resources/assets/actuallyadditions/textures/block/phantom_booster.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/phantom_booster_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/phantom_booster.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantom_breaker_block.png b/src/main/resources/assets/actuallyadditions/textures/block/phantom_breaker.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/phantom_breaker_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/phantom_breaker.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantom_energyface_block.png b/src/main/resources/assets/actuallyadditions/textures/block/phantom_energyface.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/phantom_energyface_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/phantom_energyface.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantom_liquiface_block.png b/src/main/resources/assets/actuallyadditions/textures/block/phantom_liquiface.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/phantom_liquiface_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/phantom_liquiface.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantom_placer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/phantom_placer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/phantom_placer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/phantom_placer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantom_redstoneface_block.png b/src/main/resources/assets/actuallyadditions/textures/block/phantom_redstoneface.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/phantom_redstoneface_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/phantom_redstoneface.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_block.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/phantomface_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/phantomface.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/placer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/placer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/placer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/placer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/placer_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/placer_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/placer_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/placer_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/placer_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/placer_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/placer_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/placer_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/player_interface_block.png b/src/main/resources/assets/actuallyadditions/textures/block/player_interface.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/player_interface_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/player_interface.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_block.png b/src/main/resources/assets/actuallyadditions/textures/block/ranged_collector.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/ranged_collector.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_block.png b/src/main/resources/assets/actuallyadditions/textures/block/rice.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/rice_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/rice.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_2.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_2.png rename to src/main/resources/assets/actuallyadditions/textures/block/rice_stage_2.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_3.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_3.png rename to src/main/resources/assets/actuallyadditions/textures/block/rice_stage_3.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_4.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_4.png rename to src/main/resources/assets/actuallyadditions/textures/block/rice_stage_4.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_5.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_5.png rename to src/main/resources/assets/actuallyadditions/textures/block/rice_stage_5.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_6.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_6.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/rice_block_stage_6.png rename to src/main/resources/assets/actuallyadditions/textures/block/rice_stage_6.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/shock_suppressor_block.png b/src/main/resources/assets/actuallyadditions/textures/block/shock_suppressor.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/shock_suppressor_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/shock_suppressor.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/smiley_cloud_block.png b/src/main/resources/assets/actuallyadditions/textures/block/smiley_cloud.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/smiley_cloud_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/smiley_cloud.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/solar_panel_block.png b/src/main/resources/assets/actuallyadditions/textures/block/solar_panel.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/solar_panel_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/solar_panel.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/tiny_torch_block.png b/src/main/resources/assets/actuallyadditions/textures/block/tiny_torch.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/tiny_torch_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/tiny_torch.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block.png b/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/treasure_chest.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_top (2).png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_top (2).png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/wood_casing_block.png b/src/main/resources/assets/actuallyadditions/textures/block/wood_casing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/wood_casing_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/wood_casing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_block.png b/src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/xp_solidifier_top.png