From 468dca5797f6e45e7bdd5904243733f7d78a4d0d Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Thu, 25 Nov 2021 14:27:45 -0600 Subject: [PATCH] more things --- src/generated/resources/.cache/cache | 218 +++++- .../blockstates/black_quartz_brick.json | 7 + .../blockstates/black_quartz_brick_stair.json | 209 +++++ .../blockstates/black_quartz_brick_wall.json | 90 +++ .../blockstates/black_quartz_pillar.json | 7 + .../black_quartz_pillar_block.json | 7 - .../black_quartz_pillar_stair.json | 209 +++++ .../blockstates/black_quartz_pillar_wall.json | 90 +++ .../blockstates/black_quartz_slab.json | 13 + .../blockstates/black_quartz_stair.json | 209 +++++ .../blockstates/black_quartz_wall.json | 90 +++ .../blockstates/chiseled_black_quartz.json | 7 + .../chiseled_black_quartz_block.json | 7 - .../chiseled_black_quartz_stair.json | 209 +++++ .../chiseled_black_quartz_wall.json | 90 +++ .../blockstates/ethetic_green_stairs.json | 209 +++++ .../blockstates/ethetic_green_wall.json | 90 +++ .../blockstates/ethetic_white_stairs.json | 209 +++++ .../blockstates/ethetic_white_wall.json | 90 +++ .../blockstates/smooth_black_quartz.json | 7 + .../blockstates/smooth_black_quartz_slab.json | 13 + .../smooth_black_quartz_stair.json | 209 +++++ .../blockstates/smooth_black_quartz_wall.json | 90 +++ .../models/block/black_quartz_brick.json | 6 + .../block/black_quartz_brick_stair.json | 8 + .../block/black_quartz_brick_stair_inner.json | 8 + .../block/black_quartz_brick_stair_outer.json | 8 + .../block/black_quartz_brick_wall_post.json | 6 + .../block/black_quartz_brick_wall_side.json | 6 + .../black_quartz_brick_wall_side_tall.json | 6 + .../block/black_quartz_pillar_stair.json | 8 + .../black_quartz_pillar_stair_inner.json | 8 + .../black_quartz_pillar_stair_outer.json | 8 + .../block/black_quartz_pillar_wall_post.json | 6 + .../block/black_quartz_pillar_wall_side.json | 6 + .../black_quartz_pillar_wall_side_tall.json | 6 + .../models/block/black_quartz_slab.json | 8 + .../models/block/black_quartz_slab_top.json | 8 + .../models/block/black_quartz_stair.json | 8 + .../block/black_quartz_stair_inner.json | 8 + .../block/black_quartz_stair_outer.json | 8 + .../models/block/black_quartz_wall_post.json | 6 + .../models/block/black_quartz_wall_side.json | 6 + .../block/black_quartz_wall_side_tall.json | 6 + .../block/chiseled_black_quartz_stair.json | 8 + .../chiseled_black_quartz_stair_inner.json | 8 + .../chiseled_black_quartz_stair_outer.json | 8 + .../chiseled_black_quartz_wall_post.json | 6 + .../chiseled_black_quartz_wall_side.json | 6 + .../chiseled_black_quartz_wall_side_tall.json | 6 + .../models/block/ethetic_green_stairs.json | 8 + .../block/ethetic_green_stairs_inner.json | 8 + .../block/ethetic_green_stairs_outer.json | 8 + .../models/block/ethetic_green_wall_post.json | 6 + .../models/block/ethetic_green_wall_side.json | 6 + .../block/ethetic_green_wall_side_tall.json | 6 + .../models/block/ethetic_white_stairs.json | 8 + .../block/ethetic_white_stairs_inner.json | 8 + .../block/ethetic_white_stairs_outer.json | 8 + .../models/block/ethetic_white_wall_post.json | 6 + .../models/block/ethetic_white_wall_side.json | 6 + .../block/ethetic_white_wall_side_tall.json | 6 + .../models/block/smooth_black_quartz.json | 6 + .../block/smooth_black_quartz_slab.json | 8 + .../block/smooth_black_quartz_slab_top.json | 8 + .../block/smooth_black_quartz_stair.json | 8 + .../smooth_black_quartz_stair_inner.json | 8 + .../smooth_black_quartz_stair_outer.json | 8 + .../block/smooth_black_quartz_wall_post.json | 6 + .../block/smooth_black_quartz_wall_side.json | 6 + .../smooth_black_quartz_wall_side_tall.json | 6 + .../models/item/black_quartz_brick.json | 3 + .../models/item/black_quartz_brick_slab.json | 3 + .../models/item/black_quartz_brick_stair.json | 3 + .../models/item/black_quartz_brick_wall.json | 3 + .../models/item/black_quartz_pillar.json | 3 + .../item/black_quartz_pillar_block.json | 3 - .../models/item/chiseled_black_quartz.json | 3 + .../item/chiseled_black_quartz_block.json | 3 - .../models/item/diamatine_axe.json | 6 + .../models/item/diamatine_boots.json | 6 + .../models/item/diamatine_chest.json | 6 + .../models/item/diamatine_helmet.json | 6 + .../models/item/diamatine_hoe.json | 6 + .../models/item/diamatine_leggings.json | 6 + .../models/item/diamatine_pickaxe.json | 6 + .../models/item/diamatine_shovel.json | 6 + .../models/item/diamatine_sword.json | 6 + .../models/item/drill_black.json | 6 + .../models/item/drill_blue.json | 6 + .../models/item/drill_brown.json | 6 + .../models/item/drill_cyan.json | 6 + .../models/item/drill_gray.json | 6 + .../models/item/drill_green.json | 6 + .../models/item/drill_light_blue.json | 6 + .../models/item/drill_light_gray.json | 6 + .../models/item/drill_lime.json | 6 + .../models/item/drill_magenta.json | 6 + .../models/item/drill_orange.json | 6 + .../models/item/drill_pink.json | 6 + .../models/item/drill_purple.json | 6 + .../models/item/drill_red.json | 6 + .../item/drill_upgrade_block_placing.json | 6 + .../item/drill_upgrade_five_by_five.json | 6 + .../models/item/drill_upgrade_fortune.json | 6 + .../models/item/drill_upgrade_fortune_ii.json | 6 + .../models/item/drill_upgrade_silk_touch.json | 6 + .../models/item/drill_upgrade_speed.json | 6 + .../models/item/drill_upgrade_speed_ii.json | 6 + .../models/item/drill_upgrade_speed_iii.json | 6 + .../item/drill_upgrade_three_by_three.json | 6 + .../models/item/drill_white.json | 6 + .../models/item/drill_yellow.json | 6 + .../models/item/emeradic_axe.json | 6 + .../models/item/emeradic_boots.json | 6 + .../models/item/emeradic_chest.json | 6 + .../models/item/emeradic_helmet.json | 6 + .../models/item/emeradic_hoe.json | 6 + .../models/item/emeradic_leggings.json | 6 + .../models/item/emeradic_pickaxe.json | 6 + .../models/item/emeradic_shovel.json | 6 + .../models/item/emeradic_sword.json | 6 + .../models/item/enori_axe.json | 6 + .../models/item/enori_boots.json | 6 + .../models/item/enori_chest.json | 6 + .../models/item/enori_helmet.json | 6 + .../models/item/enori_hoe.json | 6 + .../models/item/enori_leggings.json | 6 + .../models/item/enori_pickaxe.json | 6 + .../models/item/enori_shovel.json | 6 + .../models/item/enori_sword.json | 6 + .../models/item/lens_of_certain_death.json | 6 + .../models/item/lens_of_detonation.json | 6 + .../models/item/lens_of_disenchanting.json | 6 + .../models/item/lens_of_the_killer.json | 6 + .../models/item/lens_of_the_miner.json | 6 + .../models/item/palis_axe.json | 6 + .../models/item/palis_boots.json | 6 + .../models/item/palis_chest.json | 6 + .../models/item/palis_helmet.json | 6 + .../models/item/palis_hoe.json | 6 + .../models/item/palis_leggings.json | 6 + .../models/item/palis_pickaxe.json | 6 + .../models/item/palis_shovel.json | 6 + .../models/item/palis_sword.json | 6 + .../models/item/quartz_axe.json | 6 + .../models/item/quartz_boots.json | 6 + .../models/item/quartz_chest.json | 6 + .../models/item/quartz_helmet.json | 6 + .../models/item/quartz_hoe.json | 6 + .../models/item/quartz_leggings.json | 6 + .../models/item/quartz_pickaxe.json | 6 + .../models/item/quartz_shovel.json | 6 + .../models/item/quartz_sword.json | 6 + .../models/item/restonia_axe.json | 6 + .../models/item/restonia_boots.json | 6 + .../models/item/restonia_chest.json | 6 + .../models/item/restonia_helmet.json | 6 + .../models/item/restonia_hoe.json | 6 + .../models/item/restonia_leggings.json | 6 + .../models/item/restonia_pickaxe.json | 6 + .../models/item/restonia_shovel.json | 6 + .../models/item/restonia_sword.json | 6 + .../models/item/smooth_black_quartz.json | 3 + .../models/item/smooth_black_quartz_slab.json | 3 + .../item/smooth_black_quartz_stair.json | 3 + .../models/item/smooth_black_quartz_wall.json | 3 + .../models/item/void_axe.json | 6 + .../models/item/void_boots.json | 6 + .../models/item/void_chest.json | 6 + .../models/item/void_helmet.json | 6 + .../models/item/void_hoe.json | 6 + .../models/item/void_leggings.json | 6 + .../models/item/void_pickaxe.json | 6 + .../models/item/void_shovel.json | 6 + .../models/item/void_sword.json | 6 + .../recipes/black_quartz_pillar_slab.json | 2 +- .../recipes/black_quartz_pillar_stair.json | 2 +- .../recipes/black_quartz_pillar_wall.json | 2 +- .../recipes/black_quartz_slab.json | 2 +- .../recipes/black_quartz_stair.json | 2 +- .../recipes/black_quartz_wall.json | 2 +- .../recipes/chiseled_black_quartz_slab.json | 2 +- .../recipes/chiseled_black_quartz_stair.json | 2 +- .../recipes/chiseled_black_quartz_wall.json | 2 +- .../{drill.json => drill_light_blue.json} | 2 +- .../recipes/quartz_aiot.json | 10 +- .../{axe_quartz.json => quartz_axe.json} | 2 +- .../{boots_quartz.json => quartz_boots.json} | 2 +- .../{chest_quartz.json => quartz_chest.json} | 2 +- .../{helm_quartz.json => quartz_helmet.json} | 2 +- .../{hoe_quartz.json => quartz_hoe.json} | 2 +- ...pants_quartz.json => quartz_leggings.json} | 2 +- ...ickaxe_quartz.json => quartz_pickaxe.json} | 2 +- ...{shovel_quartz.json => quartz_shovel.json} | 2 +- .../{sword_quartz.json => quartz_sword.json} | 2 +- .../recipes/vertical_digger.json | 2 +- .../actuallyadditions/tags/items/drills.json | 22 + .../data/BlockRecipeGenerator.java | 20 +- .../data/BlockStateGenerator.java | 60 +- .../data/ItemRecipeGenerator.java | 8 +- .../data/ItemTagsGenerator.java | 22 +- .../mod/blocks/ActuallyBlocks.java | 76 +- .../mod/blocks/BlockShockSuppressor.java | 13 +- .../mod/event/CommonEvents.java | 6 +- .../mod/inventory/ContainerBag.java | 6 +- .../mod/inventory/ContainerDrill.java | 10 +- .../mod/inventory/ContainerFilter.java | 6 +- .../mod/items/ActuallyItems.java | 87 ++- .../items/{ItemDrill.java => DrillItem.java} | 4 +- .../actuallyadditions/mod/items/ItemBag.java | 4 +- .../mod/items/ItemFilter.java | 2 +- .../mod/misc/BannerHelper.java | 2 +- .../apiimpl/LaserRelayConnectionHandler.java | 4 +- .../mod/tile/FilterSettings.java | 4 +- .../TileEntityLaserRelayItemAdvanced.java | 6 +- .../mod/tile/TileEntityVerticalDigger.java | 4 +- .../block/crystal_cluster_restonia.json | 728 ------------------ ...ne.json => diamatine_crystal_cluster.json} | 4 +- ...oid.json => emeradic_crystal_cluster.json} | 4 +- ..._palis.json => enori_crystal_cluster.json} | 4 +- ...ergy_laser_relay.json => laser_relay.json} | 0 ...dvanced.json => laser_relay_advanced.json} | 0 ..._extreme.json => laser_relay_extreme.json} | 0 ...ser_relay.json => laser_relay_fluids.json} | 0 ...laser_relay.json => laser_relay_item.json} | 0 ...ay.json => laser_relay_item_advanced.json} | 0 ...ory_case.json => lava_factory_casing.json} | 0 ...l_breaker.json => long_range_breaker.json} | 0 ..._enori.json => palis_crystal_cluster.json} | 4 +- ...dic.json => restonia_crystal_cluster.json} | 4 +- .../{miner.json => vertical_digger.json} | 0 .../models/block/void_crystal_cluster.json | 728 ++++++++++++++++++ ...rtz_smooth.png => smooth_black_quartz.png} | Bin ...nt.png => drill_upgrade_block_placing.png} | Bin ..._ii.png => drill_upgrade_five_by_five.png} | Bin ...ugment_i.png => drill_upgrade_fortune.png} | Bin ...nt_ii.png => drill_upgrade_fortune_ii.png} | Bin ...gment.png => drill_upgrade_silk_touch.png} | Bin ..._augment_i.png => drill_upgrade_speed.png} | Bin ...ment_ii.png => drill_upgrade_speed_ii.png} | Bin ...nt_iii.png => drill_upgrade_speed_iii.png} | Bin ...i.png => drill_upgrade_three_by_three.png} | Bin 243 files changed, 4231 insertions(+), 972 deletions(-) create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_slab.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_stairs.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_stairs.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_inner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_outer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_inner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_outer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_slab.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_axe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_boots.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_chest.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_helmet.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_hoe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_leggings.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_pickaxe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_shovel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_sword.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_black.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_blue.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_brown.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_cyan.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_gray.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_green.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_light_blue.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_light_gray.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_lime.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_magenta.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_orange.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_pink.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_purple.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_red.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_block_placing.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_five_by_five.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune_ii.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_silk_touch.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_ii.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_iii.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_three_by_three.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_white.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/drill_yellow.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_axe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_boots.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_chest.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_helmet.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_hoe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_leggings.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_pickaxe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_shovel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emeradic_sword.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_axe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_boots.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_chest.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_helmet.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_hoe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_leggings.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_pickaxe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_shovel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/enori_sword.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lens_of_certain_death.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lens_of_detonation.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lens_of_disenchanting.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_killer.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_miner.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_axe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_boots.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_chest.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_helmet.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_hoe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_leggings.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_pickaxe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_shovel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/palis_sword.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_axe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_boots.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_chest.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_helmet.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_hoe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_leggings.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_pickaxe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_shovel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_sword.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_axe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_boots.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_chest.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_helmet.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_hoe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_leggings.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_pickaxe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_shovel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_sword.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_slab.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_stair.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_axe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_boots.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_chest.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_helmet.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_hoe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_leggings.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_pickaxe.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_shovel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_sword.json rename src/generated/resources/data/actuallyadditions/recipes/{drill.json => drill_light_blue.json} (88%) rename src/generated/resources/data/actuallyadditions/recipes/{axe_quartz.json => quartz_axe.json} (84%) rename src/generated/resources/data/actuallyadditions/recipes/{boots_quartz.json => quartz_boots.json} (80%) rename src/generated/resources/data/actuallyadditions/recipes/{chest_quartz.json => quartz_chest.json} (81%) rename src/generated/resources/data/actuallyadditions/recipes/{helm_quartz.json => quartz_helmet.json} (79%) rename src/generated/resources/data/actuallyadditions/recipes/{hoe_quartz.json => quartz_hoe.json} (84%) rename src/generated/resources/data/actuallyadditions/recipes/{pants_quartz.json => quartz_leggings.json} (80%) rename src/generated/resources/data/actuallyadditions/recipes/{pickaxe_quartz.json => quartz_pickaxe.json} (83%) rename src/generated/resources/data/actuallyadditions/recipes/{shovel_quartz.json => quartz_shovel.json} (83%) rename src/generated/resources/data/actuallyadditions/recipes/{sword_quartz.json => quartz_sword.json} (84%) create mode 100644 src/generated/resources/data/actuallyadditions/tags/items/drills.json rename src/main/java/de/ellpeck/actuallyadditions/mod/items/{ItemDrill.java => DrillItem.java} (99%) delete mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia.json rename src/main/resources/assets/actuallyadditions/models/block/{crystal_cluster_diamatine.json => diamatine_crystal_cluster.json} (99%) rename src/main/resources/assets/actuallyadditions/models/block/{crystal_cluster_void.json => emeradic_crystal_cluster.json} (99%) rename src/main/resources/assets/actuallyadditions/models/block/{crystal_cluster_palis.json => enori_crystal_cluster.json} (99%) rename src/main/resources/assets/actuallyadditions/models/block/{energy_laser_relay.json => laser_relay.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{energy_laser_relay_advanced.json => laser_relay_advanced.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{energy_laser_relay_extreme.json => laser_relay_extreme.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{fluids_laser_relay.json => laser_relay_fluids.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{item_laser_relay.json => laser_relay_item.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{advanced_item_laser_relay.json => laser_relay_item_advanced.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{lava_factory_case.json => lava_factory_casing.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{directional_breaker.json => long_range_breaker.json} (100%) rename src/main/resources/assets/actuallyadditions/models/block/{crystal_cluster_enori.json => palis_crystal_cluster.json} (99%) rename src/main/resources/assets/actuallyadditions/models/block/{crystal_cluster_emeradic.json => restonia_crystal_cluster.json} (99%) rename src/main/resources/assets/actuallyadditions/models/block/{miner.json => vertical_digger.json} (100%) create mode 100644 src/main/resources/assets/actuallyadditions/models/block/void_crystal_cluster.json rename src/main/resources/assets/actuallyadditions/textures/block/{black_quartz_smooth.png => smooth_black_quartz.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_block_placing_augment.png => drill_upgrade_block_placing.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_mining_augment_ii.png => drill_upgrade_five_by_five.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_fortune_augment_i.png => drill_upgrade_fortune.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_fortune_augment_ii.png => drill_upgrade_fortune_ii.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_silk_touch_augment.png => drill_upgrade_silk_touch.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_speed_augment_i.png => drill_upgrade_speed.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_speed_augment_ii.png => drill_upgrade_speed_ii.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_speed_augment_iii.png => drill_upgrade_speed_iii.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{drill_mining_augment_i.png => drill_upgrade_three_by_three.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 82df05bac..4cf55ac7c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,11 +1,21 @@ 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 +34149701048c649099766e007482c213634b64ff assets/actuallyadditions/blockstates/black_quartz_brick.json +7ddec82b65e9ded21ce7660667de04d57d4aee2e assets/actuallyadditions/blockstates/black_quartz_brick_stair.json +25d8557a7efa16df9937a8716bf92587a96fef3f assets/actuallyadditions/blockstates/black_quartz_brick_wall.json +7bfcbabb2be2ce988d2c6295b64c610ac86b0e5a assets/actuallyadditions/blockstates/black_quartz_pillar.json +73a53fb6db64ec85e180e9d493f7dca51d29da62 assets/actuallyadditions/blockstates/black_quartz_pillar_stair.json +c93b89c4b673b6063148666b2eb13dec98918532 assets/actuallyadditions/blockstates/black_quartz_pillar_wall.json +93fa4eb3c85c9d1abade9e6aa46ff60d28b37e7e assets/actuallyadditions/blockstates/black_quartz_slab.json +ac5d75bda4dc24894fb380d5e3ec751a0aa5c498 assets/actuallyadditions/blockstates/black_quartz_stair.json +146faa2ebbb31f320f8b336f6e675fce6faac2db assets/actuallyadditions/blockstates/black_quartz_wall.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 +fa4b0e570d8e71600fbe11c00a0ab6dc8b5f4c1d assets/actuallyadditions/blockstates/chiseled_black_quartz.json +c2fe87cf0b2fea00b52ab59cd6a90d3d876b1218 assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json +72431d7f0f3e60f7c9f4b7d611f8bea899be67e2 assets/actuallyadditions/blockstates/chiseled_black_quartz_wall.json c1000550e4021ad6cc2aabcc1f3ecf8abfdd8f8e assets/actuallyadditions/blockstates/coal_generator.json d884a36f1c222aaf5c3c3947df93f2f43fd6e2b5 assets/actuallyadditions/blockstates/coffee.json 033082834217900e98bd37dc5d6f09c484bd374a assets/actuallyadditions/blockstates/coffee_machine.json @@ -31,7 +41,11 @@ a3c46ac1c997e30f9fb4ecff56dbd573ddf8135d assets/actuallyadditions/blockstates/en ac4f3f406105875df9f544407fa90ea309b0fc0e assets/actuallyadditions/blockstates/enori_crystal_block.json 0c2bad99ce171f7d39b08337581622884fb4590c assets/actuallyadditions/blockstates/enori_crystal_cluster.json 35b61ff98befecc8b05f7dee0e637e826b84f7ed assets/actuallyadditions/blockstates/ethetic_green_block.json +ac57e23465b05691acc847791a842373d5dafdd9 assets/actuallyadditions/blockstates/ethetic_green_stairs.json +3130a8cd65712b849d65a7c5b8318ae700ff2a38 assets/actuallyadditions/blockstates/ethetic_green_wall.json 8cea4e84d6ef2a891eb674ea233483d6cfd7f489 assets/actuallyadditions/blockstates/ethetic_white_block.json +14b1cd50b24403a138788acdaa712ac68d063ad9 assets/actuallyadditions/blockstates/ethetic_white_stairs.json +86182c30409bd728f24ea88329f7a336a37c5fe2 assets/actuallyadditions/blockstates/ethetic_white_wall.json 43d7b4a1155efbb3c3a12a93386acea7a478be7e assets/actuallyadditions/blockstates/farmer.json d3d487fb2552edd781c69e01a03a8f527ee850af assets/actuallyadditions/blockstates/feeder.json 04dad3573abb79b915c577134f7f3ce630470b6d assets/actuallyadditions/blockstates/fermenting_barrel.json @@ -89,13 +103,44 @@ d89ce6c2187bf08f01097ce02c32aeacfb467bbf assets/actuallyadditions/blockstates/re 3c9ed33d3ed07283e498550cd6a1a2f08511dee9 assets/actuallyadditions/blockstates/restonia_crystal_cluster.json 52881b57e3b0b26b6db676d80d4baa99f2123a5a assets/actuallyadditions/blockstates/rice.json 32b6a5617cdd7da766baf9493225b5c7e23b9379 assets/actuallyadditions/blockstates/shock_suppressor.json +3ced2b46b1ff173f301c3b974c8e3c0daf1cbb74 assets/actuallyadditions/blockstates/smooth_black_quartz.json +70261df033eb7c5df7a6af6712edc3f591887a5d assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json +2c9ae5d0f4abad246bd917ba75f590cf2450a64e assets/actuallyadditions/blockstates/smooth_black_quartz_stair.json +f3eed009d0b974f21e8b7d451db6781d425d7a77 assets/actuallyadditions/blockstates/smooth_black_quartz_wall.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 +603fde57b4e160224a172864ddf8ee00d64faef9 assets/actuallyadditions/models/block/black_quartz_brick.json +86d0fcfa3d838ecba3b69d2622ee9a65a1fc0761 assets/actuallyadditions/models/block/black_quartz_brick_stair.json +c63316f946b8ec3036a8b1aa6275878aa09bf075 assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json +00251523c9f345b1288ec82d887a5f2a5d0bba7f assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json +53c838ff2493574ced216e12b8bc21bb6eba220f assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json +e2b29160c0875094eb2dfc4f5ccb3e1509b2997c assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json +d0d4a1df5593fb0edd5a988a39833d8e1ecd6d95 assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json +76d19965d724cc5b75afdd033aebcf77d6fc73ca assets/actuallyadditions/models/block/black_quartz_pillar_stair.json +64d5c9b8977648377998475ffc7f1a0dfe33b1f5 assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json +c194df4a08122824f1ec1f22e349e786b1d5de81 assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json +962a6f9757de4118b2982024ca95e2bc9c5dbfe4 assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json +50a8ef9032b881e812fc538aac95a3c099d6b9ed assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json +7aea68d951b2e5a517ee58eedb8e75cb194077e6 assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json +083fb4bd3798638a201622c862de746c1cbc810d assets/actuallyadditions/models/block/black_quartz_slab.json +91ea14049fc7e62d2c856d8acbd19cd8b9212a2c assets/actuallyadditions/models/block/black_quartz_slab_top.json +ccd748ead38fa09fb686efa9cc193b5c61eaa629 assets/actuallyadditions/models/block/black_quartz_stair.json +0035d8f6fb226d91ab008cc525b559c72800f1fe assets/actuallyadditions/models/block/black_quartz_stair_inner.json +063d8b753fdef01c74084085796727c484838184 assets/actuallyadditions/models/block/black_quartz_stair_outer.json +6ea8cbda56da7effb30e981cf66c614ba69b3f58 assets/actuallyadditions/models/block/black_quartz_wall_post.json +aaae106f09e541df265e78675b8eb2a4be2f1199 assets/actuallyadditions/models/block/black_quartz_wall_side.json +a7af20db102a9197ff88f356b15031e3e9121df9 assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json e3b1972935fa68ca5feaad8f7412530df5d6b8a2 assets/actuallyadditions/models/block/canola.json +6e817718346f261ea91a10b0574d08b4096c02f5 assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json +0804049dcbe7c278d49f693e67033afd74f60eb2 assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json +ae101e4ec80ab2b81df26df5df3bb6c0c08e9aad assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json +01e91c35e29cab6704384dfaede259571ada4f54 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json +81eb43a610c45715eab09a5783def0a8ad8b4cc1 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json +97adebca5794224da6862e210cabdb18bd2662eb assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json b68aaef024c240ac11ad9b7848fe1eef745f0ffc assets/actuallyadditions/models/block/coffee.json f24ca8230a335b41da86c330f3336f13fcdf4d4d assets/actuallyadditions/models/block/diamatine_crystal_block.json bc00149f995b4169127b072a2a123a2c8d747d8e assets/actuallyadditions/models/block/emeradic_crystal_block.json @@ -109,7 +154,19 @@ a45f3846f8637a6b66d613d5a185a792e25ac77d assets/actuallyadditions/models/block/e 3f86a2ce93e109ef575273c43edc075bc919de76 assets/actuallyadditions/models/block/ender_pearl_block.json 17e75d9c9dd4c1e5de89bbd69c8f145b7c05cec0 assets/actuallyadditions/models/block/enori_crystal_block.json 5b274d745475e1f01d9f0565531447e9da86ad6a assets/actuallyadditions/models/block/ethetic_green_block.json +f7bd1a7bd3e54ab93b91a2ea4dd597d6d032d3af assets/actuallyadditions/models/block/ethetic_green_stairs.json +b032d447e7318be73e2bbbf9790a5cec7a493c92 assets/actuallyadditions/models/block/ethetic_green_stairs_inner.json +bb8022c64188b68f86a6b2ff206c9587748f1626 assets/actuallyadditions/models/block/ethetic_green_stairs_outer.json +c2e07fab2f2edc7480b34c34223f9579f810dcea assets/actuallyadditions/models/block/ethetic_green_wall_post.json +e1973714592859182479b2789d30f6276db076ff assets/actuallyadditions/models/block/ethetic_green_wall_side.json +abdea771a10db33f477bf3ff95ff323ae736d485 assets/actuallyadditions/models/block/ethetic_green_wall_side_tall.json 3f5f9a6ad3d87756e54af6a2bc0c8a44038343dc assets/actuallyadditions/models/block/ethetic_white_block.json +6e5a4afcbb86f14741d38bfc4310fa0ffe029b57 assets/actuallyadditions/models/block/ethetic_white_stairs.json +2dea7573ae915cac1e367f92ec9f55355394098f assets/actuallyadditions/models/block/ethetic_white_stairs_inner.json +35c33a1aa42722c645008f4d555aec476d910951 assets/actuallyadditions/models/block/ethetic_white_stairs_outer.json +f895e4a41bb6aec09b1ee345ee217b302a42657a assets/actuallyadditions/models/block/ethetic_white_wall_post.json +b86818bb91d27799c350e7bbd30d6d53638eec0d assets/actuallyadditions/models/block/ethetic_white_wall_side.json +07e66f431a2729354d3420667532616591cd2c4e assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json ae0b77900f38b8af43b992b839d7460478a99dc4 assets/actuallyadditions/models/block/flax.json b23b86dd6bf3d1e9790ce97bb309765d738bc8fe assets/actuallyadditions/models/block/iron_casing.json fec26190d66a1a3e309e195cfcbd8e84c5d2683a assets/actuallyadditions/models/block/lamp_black.json @@ -131,6 +188,15 @@ e48e76012740860d213f33ecffc49317f18a42e1 assets/actuallyadditions/models/block/l fa0040bf5801821cde761a2b959235756aa004e9 assets/actuallyadditions/models/block/palis_crystal_block.json 0d22ae782351d009d7329ba954e54921a207a64b assets/actuallyadditions/models/block/restonia_crystal_block.json bf348e13cbaf0532bc254c9efa92350ae8b0023c assets/actuallyadditions/models/block/rice.json +e88af7a450835bf59c7618e6e64095bbd6a192b3 assets/actuallyadditions/models/block/smooth_black_quartz.json +6f0b096436e8b9e003547eac6c861550661a641b assets/actuallyadditions/models/block/smooth_black_quartz_slab.json +551424ae87c25a50448c996bc735443507d275d8 assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json +358aaeefc2a03eb2d8f0bfe0aefdf81571c01a2f assets/actuallyadditions/models/block/smooth_black_quartz_stair.json +0d98e67cd664880c1c7f092cc075e3463890605c assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json +f7ba92a8150edfb218926e69620e24e1a87312e0 assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json +b27eedd1eff8bb30aa06ff25c1887a2420d7cc2e assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json +cd7a27e47f23d69f2f2da86731b19a2241983cd5 assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json +f8941eef6c901c52753ca1872fee30ac3c2d3d92 assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json 292e546009c16dc7d5e38b4faa8ce84baaaa2242 assets/actuallyadditions/models/block/void_crystal_block.json 83da16f21abc2ec8361ecc3b1bda2852d48dbd97 assets/actuallyadditions/models/block/wood_casing.json 0753c814deb4cc275d0fce0b87ec12ba1b12c0eb assets/actuallyadditions/models/item/advanced_coil.json @@ -142,7 +208,11 @@ bbd32f2ac5a2a55332aa9b73fd06aa1462fdd29a assets/actuallyadditions/models/item/ba 44c0a208ef528d296e7532a834d6563d7cd90922 assets/actuallyadditions/models/item/bio_reactor.json 08f5dfde00eed3a0686cfd09efae9b08c3d1a28a assets/actuallyadditions/models/item/black_quartz.json 37d49b21bf16128d58a5d63d742508891a114ece assets/actuallyadditions/models/item/black_quartz_block.json -50075e8e8b428b161113d45d583f6eae5e8360f3 assets/actuallyadditions/models/item/black_quartz_pillar_block.json +70442a5aa4ab7106269725fac9ca1a1a9fc48189 assets/actuallyadditions/models/item/black_quartz_brick.json +14391f4c4d029a354d40a7aa26af4f279dba6684 assets/actuallyadditions/models/item/black_quartz_brick_slab.json +c3cf76ca67515c059d3eaf6b70369151a4f29831 assets/actuallyadditions/models/item/black_quartz_brick_stair.json +d461cc6c1a14ba13d5de7c3dfa0f3af8d0dc414d assets/actuallyadditions/models/item/black_quartz_brick_wall.json +cdb50a0d9a8401414d51902b8832f55779e28d2a assets/actuallyadditions/models/item/black_quartz_pillar.json 5614453539110f6214c52d47c12aa1ce05447d53 assets/actuallyadditions/models/item/black_quartz_pillar_slab.json 3bd2d755493ff85b07dff3cb31d0cc040e6150c5 assets/actuallyadditions/models/item/black_quartz_pillar_stair.json af5c7ad8debbfecef494103c8655e5edf7e40bf9 assets/actuallyadditions/models/item/black_quartz_pillar_wall.json @@ -154,7 +224,7 @@ f3282e55e71d26a32cee1287881ac2d5e91c30a8 assets/actuallyadditions/models/item/ca 08c70d561c219bb4c6d21b5f56192df81f054e0a assets/actuallyadditions/models/item/canola_press.json 0507025fadef30e363cbc825265576c782880f7b assets/actuallyadditions/models/item/canola_seeds.json b0f7c3915b646ccd27ca6ff40517e19e2a0fb7ef assets/actuallyadditions/models/item/canolaoil.json -36179c5cc77dc38364a1931f2fabbf846ef9c39d assets/actuallyadditions/models/item/chiseled_black_quartz_block.json +8a56761a86355ab762cc1b878b2759ce79b5a2bd assets/actuallyadditions/models/item/chiseled_black_quartz.json 27c8ed9e39b600161a6a327db0ac53e10acc13bb assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json 0b574626d1648584c3afa6ee0ccc974fb68bb425 assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json 59e1e2bddb67512960f5011fa4926d0dcd32b58c assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json @@ -170,21 +240,64 @@ aeacd7ca465c19d6cbcef25e61023397c4472ab3 assets/actuallyadditions/models/item/cr 3a9cfcb0a3bec43f6556b3bdab09731758a36cc2 assets/actuallyadditions/models/item/crystallized_canola_seed.json da3b2fa50416d61d8b3683ee74f9572b36f4fea3 assets/actuallyadditions/models/item/crystaloil.json ec0cdeb022c4e0bc43c0fd5d3e3e758361f7ebe2 assets/actuallyadditions/models/item/diamatine_aiot.json +9e7e70f1efd1fdc83d78d0526657c229acf7293d assets/actuallyadditions/models/item/diamatine_axe.json +04cc1e040d286dbf4e8b828b52a76829ed51e14a assets/actuallyadditions/models/item/diamatine_boots.json +da70aeb59016906e7f33962b8c5495e9c152b2f9 assets/actuallyadditions/models/item/diamatine_chest.json 71adfaafb36d576dd765201c529acfc0658066ce assets/actuallyadditions/models/item/diamatine_crystal.json 491736b20e628a539c9bb2472d499c03cdbc3760 assets/actuallyadditions/models/item/diamatine_crystal_block.json 297827c231b1ef558dc89085993b270014730c51 assets/actuallyadditions/models/item/diamatine_crystal_cluster.json 000679e52c9ef83a874d53c2df83d4f79db4b2f0 assets/actuallyadditions/models/item/diamatine_crystal_shard.json +ffecaedc7f93c583286ea861c0c98791305a0a59 assets/actuallyadditions/models/item/diamatine_helmet.json +ca4a1f8f4693b25fa330046e0d98166837306736 assets/actuallyadditions/models/item/diamatine_hoe.json +8cb448698814ed775d58d129e20c381961941228 assets/actuallyadditions/models/item/diamatine_leggings.json +c4ac3c9aa45c9de7a4bde35c39b7319a6985a81a assets/actuallyadditions/models/item/diamatine_pickaxe.json +7fac46c297edcfe8a9016ea9774edec7ca6e9b28 assets/actuallyadditions/models/item/diamatine_shovel.json +306227b32b761fa7d197510fdd6a5bee47999230 assets/actuallyadditions/models/item/diamatine_sword.json 6f5307c394a079b45f70e8f08cc3e370aeca5f52 assets/actuallyadditions/models/item/diamond_aiot.json 57d05111bf8aa9c36234a4dbaecaa9fe86126331 assets/actuallyadditions/models/item/display_stand.json 830e1315602d6dd7ccc4b38860895ce4790c145c assets/actuallyadditions/models/item/double_battery.json e854b0c11915e363f5c7e9052ac3afa2bca0a47a assets/actuallyadditions/models/item/dough.json +aabeafebcb8f5d9290b5414da4b41abbf245b107 assets/actuallyadditions/models/item/drill_black.json +75b95f08897a7898f6f3c957a10c902f7a4c29a6 assets/actuallyadditions/models/item/drill_blue.json +d240c122f6901e3137d53e3835582484008636c4 assets/actuallyadditions/models/item/drill_brown.json a4bce6204f1a53bd4ddf84480ce057d795d4cff7 assets/actuallyadditions/models/item/drill_core.json +948653afaa8303d64f63708d8ef3f1679543c92e assets/actuallyadditions/models/item/drill_cyan.json +cacee622ba8c4c345c4059876b452d1b39fd3a86 assets/actuallyadditions/models/item/drill_gray.json +ccf64bc6b6b3b41227318c09b18bec9496e3c73c assets/actuallyadditions/models/item/drill_green.json +f3fc6ee086e900a86d3940c5881a47de1b5d3e81 assets/actuallyadditions/models/item/drill_light_blue.json +bf970616f648d8e05048f297f56fad96626875af assets/actuallyadditions/models/item/drill_light_gray.json +d5c4a2c158dbce46d30c8bd2386a012f1a27b818 assets/actuallyadditions/models/item/drill_lime.json +b2cedb019edc65d3901e83712da6e0b0dc4d2687 assets/actuallyadditions/models/item/drill_magenta.json +fae0c03a118f76c0368a13837d55783de35cbf49 assets/actuallyadditions/models/item/drill_orange.json +ed9b155498b1efbced4c8e1c26a69b5b9f5abe30 assets/actuallyadditions/models/item/drill_pink.json +a7a88b0e5100fc411f43cc969af5135609c032c8 assets/actuallyadditions/models/item/drill_purple.json +9e306bc4b229af324d45382a469caf06e4c2c8e4 assets/actuallyadditions/models/item/drill_red.json +b8ccba28aa43349108bb82a6296635a9086ae45e assets/actuallyadditions/models/item/drill_upgrade_block_placing.json +081a9d5455b81baeab2fe59589608703db87305e assets/actuallyadditions/models/item/drill_upgrade_five_by_five.json +11d733dc8f253f229d81d4dbc154ac1d6b644b7d assets/actuallyadditions/models/item/drill_upgrade_fortune.json +87d026217fa2fe9ce2279fcf1b2798696254eaca assets/actuallyadditions/models/item/drill_upgrade_fortune_ii.json +981f2bb8c8a5e9d2f0e7f36f479e7cb92289ad14 assets/actuallyadditions/models/item/drill_upgrade_silk_touch.json +de8f613e18a36c391fc5ff0353573f8df0c9cba7 assets/actuallyadditions/models/item/drill_upgrade_speed.json +590b23b77c7296c7cd41e0d4d7c5f973192f40f8 assets/actuallyadditions/models/item/drill_upgrade_speed_ii.json +baa03369b781f4ca7bd9fac5ba1b7d1075566832 assets/actuallyadditions/models/item/drill_upgrade_speed_iii.json +a89b2e2adef696116e8fa9cfd3a76686a45bcfff assets/actuallyadditions/models/item/drill_upgrade_three_by_three.json +92b01e19a49bb23c379c29955a0438e1eb8dd8c1 assets/actuallyadditions/models/item/drill_white.json +7824efe710d936cef44998e197b49a8433c1c1f9 assets/actuallyadditions/models/item/drill_yellow.json ef9ec5b31db12805460edb62f611c67973ac18ba assets/actuallyadditions/models/item/dropper.json 4b8852132e20b7dd8e00a9c34e20c3a2c11d9a23 assets/actuallyadditions/models/item/emeradic_aiot.json +3bd2946a4b692c94378729e98fa7d8c6a75cd0d4 assets/actuallyadditions/models/item/emeradic_axe.json +1b28a2ffb84777e3d60a63fc61cad5ba5f30a577 assets/actuallyadditions/models/item/emeradic_boots.json +0cddaa86241703d2ac166172cb5d8049d24e2098 assets/actuallyadditions/models/item/emeradic_chest.json 98dbddad6525f949e17613d12047d18537f841fa assets/actuallyadditions/models/item/emeradic_crystal.json 083818321ae732cb35a63b5cc78c99df16d649f4 assets/actuallyadditions/models/item/emeradic_crystal_block.json 282f140a42261eaabd2096e3562d7919faf331a0 assets/actuallyadditions/models/item/emeradic_crystal_cluster.json 23c126fbe081d6eba753aa26dfe70b6753562453 assets/actuallyadditions/models/item/emeradic_crystal_shard.json +0a31211bac47e8d59023790adc3797602f31d1c9 assets/actuallyadditions/models/item/emeradic_helmet.json +ac21d5995a062f1dda81b773345ae57f8561cb10 assets/actuallyadditions/models/item/emeradic_hoe.json +154b131984e141fc688228103a195768180cec38 assets/actuallyadditions/models/item/emeradic_leggings.json +bb7a2ccf98db52964ddeab40faf8131ccc26b54c assets/actuallyadditions/models/item/emeradic_pickaxe.json +1c10c3878a34ec5c8b2cece3edb9dbb5fa33d530 assets/actuallyadditions/models/item/emeradic_shovel.json +53ab26f5ffd8ad380fea2a54cb17e42262735021 assets/actuallyadditions/models/item/emeradic_sword.json 687455af97a8ed03a26c457c86e3c5ef89052b06 assets/actuallyadditions/models/item/empowered_canola_seed.json 76c232f0aca82d81b1cbe48a1710ba68a9e274ef assets/actuallyadditions/models/item/empowered_diamatine_crystal.json d7948c3ad4bf22f0efa6e669de7a559c27b52aae assets/actuallyadditions/models/item/empowered_diamatine_crystal_block.json @@ -209,10 +322,19 @@ df3d37e900946dc1198f04c837de897089528847 assets/actuallyadditions/models/item/en accc66e54be6fcc7b86a7ce166ed15a5dd24e2fe assets/actuallyadditions/models/item/engineers_goggles.json 16e04b03519bf74512b27670eba0be85159be60d assets/actuallyadditions/models/item/engineers_goggles_advanced.json 4ce9cdeb273ad2dae586c9d5c97cd1d78aa64e95 assets/actuallyadditions/models/item/enori_aiot.json +9da6d04e1afdb1605234f885bdb00581ab4e21da assets/actuallyadditions/models/item/enori_axe.json +792b648a3ec5c6aaa304db5d249fd818f092e132 assets/actuallyadditions/models/item/enori_boots.json +c1c34b6ddfc22f9be215b9b4cd99485f37522423 assets/actuallyadditions/models/item/enori_chest.json ce947ce66c2f81aa41e5659b6341d44c07705525 assets/actuallyadditions/models/item/enori_crystal.json 8111195e2a23422d407f962d588e9cda39f3a0ce assets/actuallyadditions/models/item/enori_crystal_block.json c3af20ba50f5e6db6a5f13bc94c5b85646e938fa assets/actuallyadditions/models/item/enori_crystal_cluster.json 56a05bd6769e0d392a2532da911254e5cf0d05c5 assets/actuallyadditions/models/item/enori_crystal_shard.json +2ca56d563000f0ac4a880e1c70ee16e96591ee71 assets/actuallyadditions/models/item/enori_helmet.json +fb640c28e67d6f8371452f516caf213b782357c1 assets/actuallyadditions/models/item/enori_hoe.json +8e9938fd557deb4cc956a8b46d3e9e863d0fbfc1 assets/actuallyadditions/models/item/enori_leggings.json +a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/enori_pickaxe.json +3b242598d0f2f6a4ad68ba825be8ad40c3b3a938 assets/actuallyadditions/models/item/enori_shovel.json +26c0ad839f51a9f49d254d966c98738ebf2b6906 assets/actuallyadditions/models/item/enori_sword.json 547a18a0434aa8526dce6ab2727bc05674480611 assets/actuallyadditions/models/item/ethetic_green_block.json 29c5b35219bfb4bb1276297b0c92d235a39c9d2b assets/actuallyadditions/models/item/ethetic_green_slab.json 661f1b449d78ea517012204f1c2a47bd0f892fca assets/actuallyadditions/models/item/ethetic_green_stairs.json @@ -272,15 +394,29 @@ f3866a691bfbeccf2f0ce2c77e07eae3b5e4d8c5 assets/actuallyadditions/models/item/la b4cd7ab571dc72bb2588984258d23fb9c9fd82e7 assets/actuallyadditions/models/item/leaf_blower.json c7fdd35353e69e5df8437757520e96083682470a assets/actuallyadditions/models/item/leaf_generator.json 6db963902c4d6aa4f652a70390d5b1fb7da5b320 assets/actuallyadditions/models/item/lens.json +d3ef5005e52ec0b9ea04d579e7826c9debc5d733 assets/actuallyadditions/models/item/lens_of_certain_death.json fad02970d504f675d2f20a70839108d04130e2b9 assets/actuallyadditions/models/item/lens_of_color.json +957870ab7fe4a286b5ae98554a2cae445d9efd99 assets/actuallyadditions/models/item/lens_of_detonation.json +1397562e04099c8b44fec910962aaea4a967e6bd assets/actuallyadditions/models/item/lens_of_disenchanting.json +a1da5a212c8f8454a1e632e083986fc86cbe8de7 assets/actuallyadditions/models/item/lens_of_the_killer.json +3247178d5c1350c2a93e544687c12a88cf28a363 assets/actuallyadditions/models/item/lens_of_the_miner.json 55ce74cb71c0db54712382cd61f2c27214201c94 assets/actuallyadditions/models/item/long_range_breaker.json abf136ca89e5d896fd9ae6f89d0113d5793b3b1c assets/actuallyadditions/models/item/netherite_aiot.json cec09548b75f7f3e2079e75e1aaf5253e2f318ba assets/actuallyadditions/models/item/oil_generator.json 0dc90f8c2d8cc17f4859d196c4ab22caf52e7bd1 assets/actuallyadditions/models/item/palis_aiot.json +8a77539480881e4fa9ea005fc3aedf2d1cb96591 assets/actuallyadditions/models/item/palis_axe.json +29f970ca565c5c644753d5620e7067d4be4dbfaf assets/actuallyadditions/models/item/palis_boots.json +0f3a678af7ca6a190f1c67912ee70cbb015d3b5a assets/actuallyadditions/models/item/palis_chest.json 2efd31a4444f9ee02724c541f3935b3dca0060d1 assets/actuallyadditions/models/item/palis_crystal.json cd1128cdfd0de67aed5e2f18fbc04252300758d1 assets/actuallyadditions/models/item/palis_crystal_block.json d504e45345c3edde0c3ce18df5c49bbf8638c91d assets/actuallyadditions/models/item/palis_crystal_cluster.json 7532d0658f9d7d266ebaa9b4e19ab1f8fa40b3df assets/actuallyadditions/models/item/palis_crystal_shard.json +7b1188381f2f6027ccf90a60a31608e328140215 assets/actuallyadditions/models/item/palis_helmet.json +3084f4f936248f5ba8ee824589b6c44d5a0bd5c6 assets/actuallyadditions/models/item/palis_hoe.json +ffaaa1313bcf109c56f6559188a76c423974337e assets/actuallyadditions/models/item/palis_leggings.json +c3d4f372ba0830107b923c775ec4cb56fdaf689c assets/actuallyadditions/models/item/palis_pickaxe.json +71a10bd7ab54b34dd69c72786fdfbb8481fd55c6 assets/actuallyadditions/models/item/palis_shovel.json +7f56c1c9431ae3e145363418db9f7c1ce84cf280 assets/actuallyadditions/models/item/palis_sword.json 03fa340861a47433fcf4d70e617e7cf359c98d19 assets/actuallyadditions/models/item/paper_cone.json a0e9339d3e9cdd9dcb28e5053f4017c6f13ee22d assets/actuallyadditions/models/item/phantom_booster.json b5470f03099362062e21d0d9dcb045da8d7b29d4 assets/actuallyadditions/models/item/phantom_breaker.json @@ -296,15 +432,33 @@ ead41eb85786ee32e480cd9e63b5f261150782ec assets/actuallyadditions/models/item/ph 070e1d9e4bfb52dffc7d2bbf02f504374d97c502 assets/actuallyadditions/models/item/powered_furnace.json 5bd39a6929e7aae1ea79ae43886375a87c99ede8 assets/actuallyadditions/models/item/quadruple_battery.json 0f44823c6679515075a2dab5136e0b252eb8f9d9 assets/actuallyadditions/models/item/quartz_aiot.json +7bba09610775eb952d606503b2a3d1cf53c879ff assets/actuallyadditions/models/item/quartz_axe.json +54fb808aed07fcfb05f00a106ec5702741bc4039 assets/actuallyadditions/models/item/quartz_boots.json +2925dd7f88077a3b4785896bc1629e578ce6431c assets/actuallyadditions/models/item/quartz_chest.json +eb82609dc88ed0191e68c525c85709eaf7e56a3e assets/actuallyadditions/models/item/quartz_helmet.json +4faca792b10bc25242c6a4b2a169bef4c43e0b5b assets/actuallyadditions/models/item/quartz_hoe.json +e7defe0b4ca9c8de825236c45430005dd52e7006 assets/actuallyadditions/models/item/quartz_leggings.json +af0512cfb813e6fb43bb920db3eb1f1c2976ace6 assets/actuallyadditions/models/item/quartz_pickaxe.json +10afec0e4b4f4adfab5e4286455ffc2c5b1f845f assets/actuallyadditions/models/item/quartz_shovel.json +bb0fbcacce026c672b8d98db22694fd2b6eefb20 assets/actuallyadditions/models/item/quartz_sword.json 7f7a44a1afcbfbe63bc55be016a81dc265515b24 assets/actuallyadditions/models/item/quintuple_battery.json d8cf56e92afa1ea98eead8af208cc6281c815ede assets/actuallyadditions/models/item/ranged_collector.json 12b62d8ed574812fb48d32e416b3c9f4ebf70ec8 assets/actuallyadditions/models/item/refinedcanolaoil.json a607d6e415c04d4aa4128446c3dbb40b9aafc5d5 assets/actuallyadditions/models/item/resonant_rice.json 68d8873d46bfbe65112f29bc4b1159e586d6705f assets/actuallyadditions/models/item/restonia_aiot.json +5300d3a0ece8b26a0bc0631df9151bebaef8a1b9 assets/actuallyadditions/models/item/restonia_axe.json +5ceb9b78fdc192c7b916df639da93dc5114e850f assets/actuallyadditions/models/item/restonia_boots.json +ee6d8f4060c3859a981f804b4a84cb296ad9b15d assets/actuallyadditions/models/item/restonia_chest.json 44330b1183805e9e9961cedf7f5693e833c45509 assets/actuallyadditions/models/item/restonia_crystal.json e1ac2543ec64ac16a79eb40ece195c260911d9bb assets/actuallyadditions/models/item/restonia_crystal_block.json b7162b0c606ec8d39ebf2012fc0316a390f23c6d assets/actuallyadditions/models/item/restonia_crystal_cluster.json abb3269b59d79295ac25bc1d89eb223ea0ee454a assets/actuallyadditions/models/item/restonia_crystal_shard.json +be08ee91e3e969850ef7d9e8c6dc15f877c330db assets/actuallyadditions/models/item/restonia_helmet.json +da001039f100f0ba02bdcf057fc64a937ef9ee90 assets/actuallyadditions/models/item/restonia_hoe.json +f10850d62ce98922b620a23ff83739c2507bc788 assets/actuallyadditions/models/item/restonia_leggings.json +9d03f0ca60290dcecc7469c14f81f7ef28f4424a assets/actuallyadditions/models/item/restonia_pickaxe.json +788f21d60d8c266a7abc12bddffa7a63b3fc4ed3 assets/actuallyadditions/models/item/restonia_shovel.json +bb5a27e6545bd6d9e5935ea59b1fb59c640b4fd6 assets/actuallyadditions/models/item/restonia_sword.json f456241999745258c54b26e50aed4fdd2a995d9e assets/actuallyadditions/models/item/rice.json 01fab8eae5a0823bbafd4834dce65a8a427de320 assets/actuallyadditions/models/item/rice_dough.json dcfcded1a57642706d6fc9bc7bdcf5338b18d183 assets/actuallyadditions/models/item/rice_seeds.json @@ -314,6 +468,10 @@ c48d9fe3a0051a30496348f7dc22dc142be3a063 assets/actuallyadditions/models/item/ri 6d2c70e9d473147c72b70fbea292f90dd50ab5c2 assets/actuallyadditions/models/item/ring_of_magnetizing.json 8334f0d8c5364b930a8d674cfe86f8b4461b03f3 assets/actuallyadditions/models/item/shock_suppressor.json ef7f9a92f8b47c3de7f732172f7bb0d996b38718 assets/actuallyadditions/models/item/single_battery.json +843e08a0ce8c30af2b87afb105ce8e37e82b5e53 assets/actuallyadditions/models/item/smooth_black_quartz.json +8c66fd0c6618256da1e66524ebb1261f3ec34faa assets/actuallyadditions/models/item/smooth_black_quartz_slab.json +db82f63202197fa244540886e29d283df392afee assets/actuallyadditions/models/item/smooth_black_quartz_stair.json +1888c23243844ba23e9e979737cf8e302ee7d24c assets/actuallyadditions/models/item/smooth_black_quartz_wall.json 90f07fa285908351a3a486bcab320352b4697500 assets/actuallyadditions/models/item/solidified_experience.json 1ba6c5a40ec762bae26cbca11afea7a76a24f85c assets/actuallyadditions/models/item/stone_aiot.json 1905e7a72f7b8dfebbe177105540c57d9b365385 assets/actuallyadditions/models/item/teleport_staff.json @@ -324,11 +482,20 @@ f6c37b58efbc2db0451fc7f373979635be37358a assets/actuallyadditions/models/item/tr 181f54a35065333fef383f61d837b83d57dfbf5f assets/actuallyadditions/models/item/triple_battery.json 15e8675d650eb7639154dc7730207c33c8c05f29 assets/actuallyadditions/models/item/vertical_digger.json 9c0b2c0b89a809f2e0f30ac70a51e70d46bbef07 assets/actuallyadditions/models/item/void_aiot.json +861ae2abeaca3a3f16ceeffefc15764c6b845b60 assets/actuallyadditions/models/item/void_axe.json +2e765dce52513b9411e01d0ee5cb8e9003429b10 assets/actuallyadditions/models/item/void_boots.json +638ea6ecc2739a77198d1afe03f8eac9e70b751e assets/actuallyadditions/models/item/void_chest.json a42cb031c408a93ddbf94a5b7f1b496b3cc18086 assets/actuallyadditions/models/item/void_crystal.json 5ecd8ffdb80cd831e4997489e1126cf62dcfe554 assets/actuallyadditions/models/item/void_crystal_block.json 637116b594ddef84e14b6fb0e8bcc1a562bb2bdf assets/actuallyadditions/models/item/void_crystal_cluster.json 2f41506237d3707d2f87b6b37df2e03467091d8b assets/actuallyadditions/models/item/void_crystal_shard.json +f3f1c5ac565bf8694ac5d3ec96d254346460df5f assets/actuallyadditions/models/item/void_helmet.json +ca235c3014cc9cbf2ed399db17f3740df21edb68 assets/actuallyadditions/models/item/void_hoe.json +e62936f8ce3af90b6d6b1d9e379e3164d338e9c6 assets/actuallyadditions/models/item/void_leggings.json +ee36da9a021297b34b30e4979c30eb63835b2a6b assets/actuallyadditions/models/item/void_pickaxe.json 1c0eb44eca6ed5e0b36dcd783f81b4e3557ff5b4 assets/actuallyadditions/models/item/void_sack.json +3130b0d1d84eb76ae29a402c6f6720d6c5eb0dfd assets/actuallyadditions/models/item/void_shovel.json +885555ad87ba088765384763091c87f05ed388f1 assets/actuallyadditions/models/item/void_sword.json 1e696d711eb5de97f86aa70c53e915369deb38fb assets/actuallyadditions/models/item/water_bowl.json 4309a1169749dc7b9e79ba5a37c4f4f7a8206dea assets/actuallyadditions/models/item/wings_of_the_bats.json f68d37fcdaf57ec06518d5974cbf540e6c45d271 assets/actuallyadditions/models/item/wood_casing.json @@ -337,21 +504,18 @@ f657eabc7321de0b05cf92d9ebdd6f5215a685b5 assets/actuallyadditions/models/item/wo 0b1ab8963077c90a5104b516eab36e56c8a07057 assets/actuallyadditions/models/item/xp_solidifier.json 64711e28d6fb7579f1ba2fed4a46440e213a2fac data/actuallyadditions/recipes/advanced_coil.json a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json -7055f56220327a93e05330d3ba779d360c79c41d data/actuallyadditions/recipes/axe_quartz.json 3d899eb727ee209cce77eae52985ea8ed1fc2455 data/actuallyadditions/recipes/basic_coil.json a4b4ff66a1d3387791b1bd72e461cdc62558a054 data/actuallyadditions/recipes/battery_box.json -5ba46742bff7dbc31c3ef64a4b3ab021df4e1c79 data/actuallyadditions/recipes/black_quartz_pillar_slab.json -141bfc11e38b358e2c53f59e816509a25b61bccd data/actuallyadditions/recipes/black_quartz_pillar_stair.json -c6cb7541b7390b0af525b3b6854a943e461b1a03 data/actuallyadditions/recipes/black_quartz_pillar_wall.json -6c045ca364ea3483083fe3be01f15508d485402a data/actuallyadditions/recipes/black_quartz_slab.json -f1d41941b332faf0b495353f27ea83287643e044 data/actuallyadditions/recipes/black_quartz_stair.json -c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_quartz_wall.json +055626518ac34b3b4bcc958d57b54742cb998b6d data/actuallyadditions/recipes/black_quartz_pillar_slab.json +8b516024aa00d646c0ca68d7a11cf19cb7d2157e data/actuallyadditions/recipes/black_quartz_pillar_stair.json +84ec8503325e4d25c2daa3e0cd6e6d257f054714 data/actuallyadditions/recipes/black_quartz_pillar_wall.json +40ebb6a5ceb6261718bbc743b008d0d9a0b19a62 data/actuallyadditions/recipes/black_quartz_slab.json +3a1ca20a2a34773cf870a19cefcfcbd1ecace4ea data/actuallyadditions/recipes/black_quartz_stair.json +fdb7147cb436f86110f14f47c64e5b2f7752ff73 data/actuallyadditions/recipes/black_quartz_wall.json 398ad1cb070aa294671f0294515fc7695042fd05 data/actuallyadditions/recipes/booklet.json -9840b640a62e061baaecc74efd1e7455c59b35e9 data/actuallyadditions/recipes/boots_quartz.json -696e9cc478fd04fd21565b9513317cf9f124d4bd data/actuallyadditions/recipes/chest_quartz.json -7dc02da1ff58eb4ff48e305437d4857c31cbd5c9 data/actuallyadditions/recipes/chiseled_black_quartz_slab.json -bf1b5de98f29c2dabe25a143c8e63d2c0cd6ea72 data/actuallyadditions/recipes/chiseled_black_quartz_stair.json -9d779585266046738b4bcf7447b918ec09b65f95 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json +7368949cc578346218a12dfa5a7b7aa1417b29f5 data/actuallyadditions/recipes/chiseled_black_quartz_slab.json +8f87f77de99044dd191ec3ce41cdbdf7e4fd8b6e data/actuallyadditions/recipes/chiseled_black_quartz_stair.json +98edded65a2b79858892885d6c4a70a3e530dc79 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json b76b843a60a1c456a11d3bb932a93ab3753d6f58 data/actuallyadditions/recipes/crushing/bone_crusher.json bbd4aaaa994eadfc1a6e9dff8ae1f3b39ed3bcf8 data/actuallyadditions/recipes/diamatine_aiot.json @@ -367,8 +531,8 @@ b1e0a6df05d27df901dc8a1ebd2cde5a59f42d28 data/actuallyadditions/recipes/diamatin 293cecfa94d22e62bd817a3964e82dca4479d44d data/actuallyadditions/recipes/diamond_aiot.json abb220fb19dea7cf9afcd30fbe533d21b7c4e9c0 data/actuallyadditions/recipes/display_stand.json f3465f5a05a931f4e5933508c2bc56de9c9eafe5 data/actuallyadditions/recipes/double_battery.json -ef62734da6e9390059172de27f7a7f1f5dae507d data/actuallyadditions/recipes/drill.json 87c4d75a0dec26318530fec94b00c0e05727b3db data/actuallyadditions/recipes/drill_core.json +a53695aa069fdc09f3bf7d941896771baf8ad9fb data/actuallyadditions/recipes/drill_light_blue.json b39949bb1fcfa2bba60108fec687234c2bba659f data/actuallyadditions/recipes/drill_upgrade_block_placing.json aa86730bb0446a79eea7bf52aaa24ea7d4630d91 data/actuallyadditions/recipes/drill_upgrade_five_by_five.json 6385d8e13209de4fb34f18d6ff6b6c0cd5b83c30 data/actuallyadditions/recipes/drill_upgrade_fortune.json @@ -425,8 +589,6 @@ c5ef6af5b4a1c108a1995e29f4889df68e4b1ee5 data/actuallyadditions/recipes/ethetic_ 6ed420df34b5b17fcef2ad2c3f4fb4ed35bf739d data/actuallyadditions/recipes/firework_box.json 7faeab31bd3d1e7a935a3f36d82cdd54466a72e4 data/actuallyadditions/recipes/gold_aiot.json e86bd38ee24e97ed93d4b133af3850594e7b45de data/actuallyadditions/recipes/handheld_filler.json -70fae569768590dbb504c2f9c1be30fc215a0410 data/actuallyadditions/recipes/helm_quartz.json -770bd7b359f455847ccf8e599227f9cdd053fe09 data/actuallyadditions/recipes/hoe_quartz.json a65757e5037582adc3b69b21b533af3f045c0eb8 data/actuallyadditions/recipes/iron_aiot.json ad12750777cb66c3e9f1943a83bcd83c0fe635d1 data/actuallyadditions/recipes/item_viewer.json 4a13de3f3dc0874020c283ecf29eaea2fdf13693 data/actuallyadditions/recipes/item_viewer_hopping.json @@ -480,11 +642,18 @@ b0b8c23e30fa6890c6cb3b4bcb0c21170e6e6cfd data/actuallyadditions/recipes/palis_le 30e05bdfb1edfcbdcf6b8a6b08723f5100cc3b73 data/actuallyadditions/recipes/palis_pickaxe.json c91d538c767c582f8dbd9008c59d2069b253d85b data/actuallyadditions/recipes/palis_shovel.json 34f63da2e20810935ec211fb1a5e7cfc5d6d19e3 data/actuallyadditions/recipes/palis_sword.json -758d6f5eb78f8c51edbf50520207e25fae2c3956 data/actuallyadditions/recipes/pants_quartz.json 4590b472dcb90700ea525a3c6ac3f325458fab19 data/actuallyadditions/recipes/phantom_connector.json -651e953fb75005cae3875b80c710111b2063d298 data/actuallyadditions/recipes/pickaxe_quartz.json 68e7d4bd5e6ea852ef57ff5032d922a9a703fd77 data/actuallyadditions/recipes/quadruple_battery.json -f324a61d01222af796b76c18bbaca72df7b32a1b data/actuallyadditions/recipes/quartz_aiot.json +fe64f278992ae37581a7b50e0870b222d9e9577e data/actuallyadditions/recipes/quartz_aiot.json +d64fe5965c8274ca27a5fcb0a83d372ed817e62f data/actuallyadditions/recipes/quartz_axe.json +9d0bac4fbfb1cecc3ee454f6f04a860ee4ba464c data/actuallyadditions/recipes/quartz_boots.json +5582b81f5260d044ca40904045bf24dd8ed0486d data/actuallyadditions/recipes/quartz_chest.json +1f686e86e054c7a643f2d95ba95d881b900f23ea data/actuallyadditions/recipes/quartz_helmet.json +7b0ad1808a43f25be6e4b3b5178530604e6894eb data/actuallyadditions/recipes/quartz_hoe.json +cad5f57e191a6c291c59a35b801ab8187e2db42b data/actuallyadditions/recipes/quartz_leggings.json +1dc20d283ec2957671cc2baf5582116e5a82e226 data/actuallyadditions/recipes/quartz_pickaxe.json +2e37928c7dedac93160a28a1c426ce941b2c4d68 data/actuallyadditions/recipes/quartz_shovel.json +24cbc8e823ab250e9cee664318e66d29935dcb13 data/actuallyadditions/recipes/quartz_sword.json 6797b2f74af9eb67a8ea6bdfa198cab7052db2a0 data/actuallyadditions/recipes/quintuple_battery.json a43458d6498aed37aa8d8d62bfda5edade6e8ee0 data/actuallyadditions/recipes/restonia_aiot.json 6a81d06737e33b6d4803c10ad5972a657711b88e data/actuallyadditions/recipes/restonia_axe.json @@ -499,15 +668,13 @@ a63b57c27d8548ddd13d64d18b098d4f5c127a30 data/actuallyadditions/recipes/restonia 5b104e2c32eafdf802743d0e8d4c1a7e14071668 data/actuallyadditions/recipes/rice_slime.json 85d2537a973d520c9eaaf2f15109c265faa2df3a data/actuallyadditions/recipes/rice_slime_potion.json d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_suppressor.json -f1c767de96e510e34af65d40164103f35cc3f2fc data/actuallyadditions/recipes/shovel_quartz.json 655fab699bb97ec252deb61d91fbef6f4738fe1c data/actuallyadditions/recipes/single_battery.json 8ebd738f3968564e22ba6841eb821e5064c78588 data/actuallyadditions/recipes/stone_aiot.json -6e59e0a3ef8eac77dc6523d2eadcd5acdc3e70d6 data/actuallyadditions/recipes/sword_quartz.json bc7a41d9f36cc43e146e0b727b6f439cc0d29343 data/actuallyadditions/recipes/teleport_staff.json bdf7dbf563485903e444400d341e56d0bf308481 data/actuallyadditions/recipes/tiny_torch.json b1761a179c6a6a45cc5a8246680d65c45651911d data/actuallyadditions/recipes/travelers_sack.json aac4c1515b4751f768da8b374aa3e0299ff8c760 data/actuallyadditions/recipes/triple_battery.json -54d64e82e95c22167b1a281cda38c30daa2c3c15 data/actuallyadditions/recipes/vertical_digger.json +d8611ae9f616794678bb7f2d0c253383f09e8b27 data/actuallyadditions/recipes/vertical_digger.json f46b86ca16cf25043322489c3395b90940eed604 data/actuallyadditions/recipes/void_aiot.json abbd86e0bc48510a70807d96ba98a2eb56d68937 data/actuallyadditions/recipes/void_axe.json 98016acf226a9ad674c62bdf7243127a7f5443ba data/actuallyadditions/recipes/void_boots.json @@ -522,4 +689,5 @@ e70c181f8b01b51148f00cb8cb943a40ceb01dd1 data/actuallyadditions/recipes/void_swo 17503be947b6e654606f28e6d07d197eb91abc88 data/actuallyadditions/recipes/wings_of_the_bats.json 5d0b3e0b27c0a7f82438fd24673866ce087d47f0 data/actuallyadditions/recipes/wooden_aiot.json a18f00e11fa55ff1b767eeab7a4756c2e0e93429 data/actuallyadditions/tags/items/coffee_beans.json +2290b1829e049ab3002f3576379ad58f6d7b6ace data/actuallyadditions/tags/items/drills.json 8c1e24d7377b6bdf64c13643d94c3826ac925c25 data/actuallyadditions/tags/items/tiny_coals.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick.json new file mode 100644 index 000000000..64daac4d6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/black_quartz_brick" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_stair.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_stair.json new file mode 100644 index 000000000..a9816597f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_stair.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_brick_stair" + }, + "facing=north,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_brick_stair_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_wall.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_wall.json new file mode 100644 index 000000000..8e5bd11ae --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json new file mode 100644 index 000000000..2a83b088a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/black_quartz_pillar" + } + } +} \ 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 deleted file mode 100644 index 906f79fe1..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/black_quartz_pillar_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_stair.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_stair.json new file mode 100644 index 000000000..d8eb0f56f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_stair.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_pillar_stair" + }, + "facing=north,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_pillar_stair_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_wall.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_wall.json new file mode 100644 index 000000000..cf99405d0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_pillar_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_slab.json new file mode 100644 index 000000000..657be44eb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "actuallyadditions:block/black_quartz_slab_top" + }, + "type=bottom": { + "model": "actuallyadditions:block/black_quartz_slab" + }, + "type=double": { + "model": "actuallyadditions:block/black_quartz_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_stair.json new file mode 100644 index 000000000..9e038b4d5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_stair.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "actuallyadditions:block/black_quartz_stair" + }, + "facing=north,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/black_quartz_stair_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/black_quartz_stair_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_wall.json new file mode 100644 index 000000000..a7d772606 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/black_quartz_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz.json new file mode 100644 index 000000000..419093ec1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/chiseled_black_quartz" + } + } +} \ 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 deleted file mode 100644 index 998349201..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/chiseled_black_quartz_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json new file mode 100644 index 000000000..1c47f18e2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair" + }, + "facing=north,half=top,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/chiseled_black_quartz_stair_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_wall.json new file mode 100644 index 000000000..28547424c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_black_quartz_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_stairs.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_stairs.json new file mode 100644 index 000000000..c01ae553a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_green_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_green_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_wall.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_wall.json new file mode 100644 index 000000000..6f8fa3182 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_green_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_stairs.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_stairs.json new file mode 100644 index 000000000..b04f0ed62 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "actuallyadditions:block/ethetic_white_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/ethetic_white_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_wall.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_wall.json new file mode 100644 index 000000000..675517d41 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/ethetic_white_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz.json b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz.json new file mode 100644 index 000000000..2acc1d4b2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/smooth_black_quartz" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json new file mode 100644 index 000000000..f8d20f048 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "actuallyadditions:block/smooth_black_quartz_slab_top" + }, + "type=bottom": { + "model": "actuallyadditions:block/smooth_black_quartz_slab" + }, + "type=double": { + "model": "actuallyadditions:block/smooth_black_quartz" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_stair.json new file mode 100644 index 000000000..efb2b0a45 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_stair.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "actuallyadditions:block/smooth_black_quartz_stair" + }, + "facing=north,half=top,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "actuallyadditions:block/smooth_black_quartz_stair_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_wall.json new file mode 100644 index 000000000..cd40074cf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/smooth_black_quartz_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick.json new file mode 100644 index 000000000..81cb145a9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/black_quartz_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json new file mode 100644 index 000000000..bd48b6011 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_brick", + "bottom": "actuallyadditions:block/black_quartz_brick", + "top": "actuallyadditions:block/black_quartz_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json new file mode 100644 index 000000000..8805d863c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_brick", + "bottom": "actuallyadditions:block/black_quartz_brick", + "top": "actuallyadditions:block/black_quartz_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json new file mode 100644 index 000000000..deecb1f70 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_brick", + "bottom": "actuallyadditions:block/black_quartz_brick", + "top": "actuallyadditions:block/black_quartz_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json new file mode 100644 index 000000000..77bda8c10 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/black_quartz_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json new file mode 100644 index 000000000..7e39a7de7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/black_quartz_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json new file mode 100644 index 000000000..1de5432c5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/black_quartz_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json new file mode 100644 index 000000000..4dec46f22 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_pillar", + "bottom": "actuallyadditions:block/black_quartz_pillar", + "top": "actuallyadditions:block/black_quartz_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json new file mode 100644 index 000000000..48de63295 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_pillar", + "bottom": "actuallyadditions:block/black_quartz_pillar", + "top": "actuallyadditions:block/black_quartz_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json new file mode 100644 index 000000000..5b4fd6a02 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_pillar", + "bottom": "actuallyadditions:block/black_quartz_pillar", + "top": "actuallyadditions:block/black_quartz_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json new file mode 100644 index 000000000..7abcae3cf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/black_quartz_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json new file mode 100644 index 000000000..3e7017a58 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/black_quartz_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json new file mode 100644 index 000000000..1d1d14067 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/black_quartz_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json new file mode 100644 index 000000000..c39c24c48 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "actuallyadditions:block/black_quartz", + "bottom": "actuallyadditions:block/black_quartz", + "top": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json new file mode 100644 index 000000000..a51370a2c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "actuallyadditions:block/black_quartz", + "bottom": "actuallyadditions:block/black_quartz", + "top": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json new file mode 100644 index 000000000..439761a31 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz", + "bottom": "actuallyadditions:block/black_quartz", + "top": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json new file mode 100644 index 000000000..de2846d66 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz", + "bottom": "actuallyadditions:block/black_quartz", + "top": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json new file mode 100644 index 000000000..aed4dac29 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz", + "bottom": "actuallyadditions:block/black_quartz", + "top": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json new file mode 100644 index 000000000..7982914c1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json new file mode 100644 index 000000000..6c4f06cf0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json new file mode 100644 index 000000000..ebe6946f7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json new file mode 100644 index 000000000..aa16cc03b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_chiseled", + "bottom": "actuallyadditions:block/black_quartz_chiseled", + "top": "actuallyadditions:block/black_quartz_chiseled" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json new file mode 100644 index 000000000..08e684389 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_chiseled", + "bottom": "actuallyadditions:block/black_quartz_chiseled", + "top": "actuallyadditions:block/black_quartz_chiseled" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json new file mode 100644 index 000000000..aa7b7fce1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "actuallyadditions:block/black_quartz_chiseled", + "bottom": "actuallyadditions:block/black_quartz_chiseled", + "top": "actuallyadditions:block/black_quartz_chiseled" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json new file mode 100644 index 000000000..4cc8739af --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/black_quartz_chiseled" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json new file mode 100644 index 000000000..f2787c3de --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/black_quartz_chiseled" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json new file mode 100644 index 000000000..8b181631b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/black_quartz_chiseled" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs.json new file mode 100644 index 000000000..0cc3b8c69 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "actuallyadditions:block/ethetic_green_block", + "bottom": "actuallyadditions:block/ethetic_green_block", + "top": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_inner.json new file mode 100644 index 000000000..2a37c3183 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "actuallyadditions:block/ethetic_green_block", + "bottom": "actuallyadditions:block/ethetic_green_block", + "top": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_outer.json new file mode 100644 index 000000000..e5b25840a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "actuallyadditions:block/ethetic_green_block", + "bottom": "actuallyadditions:block/ethetic_green_block", + "top": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_post.json new file mode 100644 index 000000000..58553db86 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side.json new file mode 100644 index 000000000..e8907eb0c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side_tall.json new file mode 100644 index 000000000..9c0ebdd3a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs.json new file mode 100644 index 000000000..6d1824d39 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "actuallyadditions:block/ethetic_white_block", + "bottom": "actuallyadditions:block/ethetic_white_block", + "top": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_inner.json new file mode 100644 index 000000000..cbaf8eb43 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "actuallyadditions:block/ethetic_white_block", + "bottom": "actuallyadditions:block/ethetic_white_block", + "top": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_outer.json new file mode 100644 index 000000000..9ccbfa1f6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "actuallyadditions:block/ethetic_white_block", + "bottom": "actuallyadditions:block/ethetic_white_block", + "top": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_post.json new file mode 100644 index 000000000..226b15a52 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side.json new file mode 100644 index 000000000..97cb530a1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json new file mode 100644 index 000000000..5282f08f1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz.json new file mode 100644 index 000000000..4b724432b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json new file mode 100644 index 000000000..d5a67a154 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "actuallyadditions:block/smooth_black_quartz", + "bottom": "actuallyadditions:block/smooth_black_quartz", + "top": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json new file mode 100644 index 000000000..7ef97175b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "actuallyadditions:block/smooth_black_quartz", + "bottom": "actuallyadditions:block/smooth_black_quartz", + "top": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json new file mode 100644 index 000000000..ef8375af0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "actuallyadditions:block/smooth_black_quartz", + "bottom": "actuallyadditions:block/smooth_black_quartz", + "top": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json new file mode 100644 index 000000000..cacfaa886 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "actuallyadditions:block/smooth_black_quartz", + "bottom": "actuallyadditions:block/smooth_black_quartz", + "top": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json new file mode 100644 index 000000000..a17c19ead --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "actuallyadditions:block/smooth_black_quartz", + "bottom": "actuallyadditions:block/smooth_black_quartz", + "top": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json new file mode 100644 index 000000000..ffc29ad77 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json new file mode 100644 index 000000000..a29498efe --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json new file mode 100644 index 000000000..90c03b46c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/smooth_black_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick.json new file mode 100644 index 000000000..6e8c04eba --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_brick" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_slab.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_slab.json new file mode 100644 index 000000000..74384e05b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_stair.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_stair.json new file mode 100644 index 000000000..7aaf97b08 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_stair.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_brick_stair" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json new file mode 100644 index 000000000..4854dcf32 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_brick_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json new file mode 100644 index 000000000..712bc01d0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_pillar" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json deleted file mode 100644 index f87890559..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/black_quartz_pillar_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz.json new file mode 100644 index 000000000..eecad923e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/chiseled_black_quartz" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json deleted file mode 100644 index 1653c3b8f..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/chiseled_black_quartz_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_axe.json new file mode 100644 index 000000000..0b1da10a2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_boots.json new file mode 100644 index 000000000..966cbc086 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_chest.json new file mode 100644 index 000000000..465e45fc0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_helmet.json new file mode 100644 index 000000000..7034c8db5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_hoe.json new file mode 100644 index 000000000..f4912f055 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_leggings.json new file mode 100644 index 000000000..acdbcefee --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_pickaxe.json new file mode 100644 index 000000000..1d311f4e4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_shovel.json new file mode 100644 index 000000000..7c90b73d2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_sword.json new file mode 100644 index 000000000..1d792f4dd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamatine_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_black.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_black.json new file mode 100644 index 000000000..3c8b77367 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_black" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_blue.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_blue.json new file mode 100644 index 000000000..12c848533 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_brown.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_brown.json new file mode 100644 index 000000000..720a1da9e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_brown" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_cyan.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_cyan.json new file mode 100644 index 000000000..57401e2d4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_cyan" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_gray.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_gray.json new file mode 100644 index 000000000..af5bb7a38 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_gray" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_green.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_green.json new file mode 100644 index 000000000..abd44298e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_green" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_light_blue.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_light_blue.json new file mode 100644 index 000000000..c970e518c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_light_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_light_gray.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_light_gray.json new file mode 100644 index 000000000..793bf31b8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_light_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_light_gray" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_lime.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_lime.json new file mode 100644 index 000000000..fcef18872 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_lime" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_magenta.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_magenta.json new file mode 100644 index 000000000..ab979eda9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_magenta" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_orange.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_orange.json new file mode 100644 index 000000000..46f73f4b3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_orange" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_pink.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_pink.json new file mode 100644 index 000000000..0adadd17f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_pink" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_purple.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_purple.json new file mode 100644 index 000000000..2f7936e0a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_purple" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_red.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_red.json new file mode 100644 index 000000000..ed703dcc1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_red" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_block_placing.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_block_placing.json new file mode 100644 index 000000000..956feecc3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_block_placing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_block_placing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_five_by_five.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_five_by_five.json new file mode 100644 index 000000000..3a8e2f90e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_five_by_five.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_five_by_five" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune.json new file mode 100644 index 000000000..8e4c54456 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_fortune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune_ii.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune_ii.json new file mode 100644 index 000000000..a3eb9d369 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_fortune_ii.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_fortune_ii" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_silk_touch.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_silk_touch.json new file mode 100644 index 000000000..164ad5caf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_silk_touch.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_silk_touch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed.json new file mode 100644 index 000000000..ef64f55d7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_speed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_ii.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_ii.json new file mode 100644 index 000000000..c18d8c262 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_ii.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_speed_ii" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_iii.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_iii.json new file mode 100644 index 000000000..fb755be9b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_speed_iii.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_speed_iii" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_three_by_three.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_three_by_three.json new file mode 100644 index 000000000..b1398706d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_upgrade_three_by_three.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_upgrade_three_by_three" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_white.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_white.json new file mode 100644 index 000000000..b8babe122 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_white" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/drill_yellow.json b/src/generated/resources/assets/actuallyadditions/models/item/drill_yellow.json new file mode 100644 index 000000000..a75e61c77 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/drill_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/drill_yellow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_axe.json new file mode 100644 index 000000000..4c6154973 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_boots.json new file mode 100644 index 000000000..487f083f7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_chest.json new file mode 100644 index 000000000..c1959dc07 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_helmet.json new file mode 100644 index 000000000..0e80e8f78 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_hoe.json new file mode 100644 index 000000000..4a22e5d50 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_leggings.json new file mode 100644 index 000000000..832a63979 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_pickaxe.json new file mode 100644 index 000000000..1004c2858 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_shovel.json new file mode 100644 index 000000000..4837929ca --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_sword.json new file mode 100644 index 000000000..9cc329211 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/emeradic_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_axe.json new file mode 100644 index 000000000..5c4447854 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_boots.json new file mode 100644 index 000000000..a016decfe --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_chest.json new file mode 100644 index 000000000..9610240d6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_helmet.json new file mode 100644 index 000000000..8bd6229db --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_hoe.json new file mode 100644 index 000000000..edd6b2311 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_leggings.json new file mode 100644 index 000000000..d0e91f4da --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_pickaxe.json new file mode 100644 index 000000000..11aa4ab81 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_shovel.json new file mode 100644 index 000000000..1e351607e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_sword.json new file mode 100644 index 000000000..1c0991e9c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/enori_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lens_of_certain_death.json b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_certain_death.json new file mode 100644 index 000000000..2f7c8b70c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_certain_death.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/lens_of_certain_death" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lens_of_detonation.json b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_detonation.json new file mode 100644 index 000000000..108b1e37d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_detonation.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/lens_of_detonation" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lens_of_disenchanting.json b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_disenchanting.json new file mode 100644 index 000000000..b4448ef8c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_disenchanting.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/lens_of_disenchanting" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_killer.json b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_killer.json new file mode 100644 index 000000000..8639270c0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_killer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/lens_of_the_killer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_miner.json b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_miner.json new file mode 100644 index 000000000..fee5f6666 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lens_of_the_miner.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/lens_of_the_miner" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_axe.json new file mode 100644 index 000000000..e0d3135c7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_boots.json new file mode 100644 index 000000000..887a4eaaf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_chest.json new file mode 100644 index 000000000..9dd7293d4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_helmet.json new file mode 100644 index 000000000..3d3aad718 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_hoe.json new file mode 100644 index 000000000..dd2642248 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_leggings.json new file mode 100644 index 000000000..22b8d8e52 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_pickaxe.json new file mode 100644 index 000000000..5cae80126 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_shovel.json new file mode 100644 index 000000000..5b1aa53c1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_sword.json new file mode 100644 index 000000000..cf5087062 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/palis_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_axe.json new file mode 100644 index 000000000..c55474307 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_boots.json new file mode 100644 index 000000000..72309eed3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_chest.json new file mode 100644 index 000000000..58fbde52d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_helmet.json new file mode 100644 index 000000000..3a79f4fe3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_hoe.json new file mode 100644 index 000000000..349a79d0e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_leggings.json new file mode 100644 index 000000000..5d4e3b269 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_pickaxe.json new file mode 100644 index 000000000..df1e595ae --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_shovel.json new file mode 100644 index 000000000..40ba73bc9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_sword.json new file mode 100644 index 000000000..2ac4e1b5c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/quartz_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_axe.json new file mode 100644 index 000000000..8bfc4f32e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_boots.json new file mode 100644 index 000000000..593052e35 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_chest.json new file mode 100644 index 000000000..2f34a3e05 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_helmet.json new file mode 100644 index 000000000..62ac47cc8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_hoe.json new file mode 100644 index 000000000..bd36306e5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_leggings.json new file mode 100644 index 000000000..aaa08da4a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_pickaxe.json new file mode 100644 index 000000000..de78f9f83 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_shovel.json new file mode 100644 index 000000000..ec2f6bed9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_sword.json new file mode 100644 index 000000000..bfa7bb71e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz.json b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz.json new file mode 100644 index 000000000..2c415bf81 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/smooth_black_quartz" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_slab.json new file mode 100644 index 000000000..c4afd6a05 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/smooth_black_quartz_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_stair.json new file mode 100644 index 000000000..b2bc317e5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_stair.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/smooth_black_quartz_stair" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json new file mode 100644 index 000000000..5c371ec64 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/smooth_black_quartz_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/void_axe.json new file mode 100644 index 000000000..1a4b2988a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/void_boots.json new file mode 100644 index 000000000..bebe6043e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/void_chest.json new file mode 100644 index 000000000..026027b7d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/void_helmet.json new file mode 100644 index 000000000..f41b40124 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/void_hoe.json new file mode 100644 index 000000000..4ec131636 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/void_leggings.json new file mode 100644 index 000000000..2537d5d00 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/void_pickaxe.json new file mode 100644 index 000000000..8ba470942 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/void_shovel.json new file mode 100644 index 000000000..a348b973f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/void_sword.json new file mode 100644 index 000000000..bbf8ac5e4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json index 6f4b41881..5808354cd 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json @@ -5,7 +5,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar_block" + "item": "actuallyadditions:black_quartz_pillar" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json index 9de42d733..06450e120 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json @@ -7,7 +7,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar_block" + "item": "actuallyadditions:black_quartz_pillar" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json index 1a17d094c..21bca3d17 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json @@ -6,7 +6,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar_block" + "item": "actuallyadditions:black_quartz_pillar" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json index fb023fef0..36874093a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json @@ -5,7 +5,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar_block" + "item": "actuallyadditions:black_quartz_pillar" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json index 0e99ba405..cf380801d 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json @@ -7,7 +7,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar_block" + "item": "actuallyadditions:black_quartz_pillar" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json index b5c296669..d68eb69b7 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json @@ -6,7 +6,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar_block" + "item": "actuallyadditions:black_quartz_pillar" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json index b10a9b2d0..7bbc2d90b 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json +++ b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json @@ -5,7 +5,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:chiseled_black_quartz_block" + "item": "actuallyadditions:chiseled_black_quartz" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json index 55547f6d9..4f4469597 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json +++ b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json @@ -7,7 +7,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:chiseled_black_quartz_block" + "item": "actuallyadditions:chiseled_black_quartz" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json index 4834620a2..9fd615239 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json +++ b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json @@ -6,7 +6,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:chiseled_black_quartz_block" + "item": "actuallyadditions:chiseled_black_quartz" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill.json b/src/generated/resources/data/actuallyadditions/recipes/drill_light_blue.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/drill.json rename to src/generated/resources/data/actuallyadditions/recipes/drill_light_blue.json index 87a6c6c07..7f486784f 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/drill.json +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_light_blue.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "actuallyadditions:drill" + "item": "actuallyadditions:drill_light_blue" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/quartz_aiot.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_aiot.json index f374504c3..aef06ba92 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/quartz_aiot.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_aiot.json @@ -2,19 +2,19 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "actuallyadditions:axe_quartz" + "item": "actuallyadditions:quartz_axe" }, { - "item": "actuallyadditions:pickaxe_quartz" + "item": "actuallyadditions:quartz_pickaxe" }, { - "item": "actuallyadditions:sword_quartz" + "item": "actuallyadditions:quartz_sword" }, { - "item": "actuallyadditions:shovel_quartz" + "item": "actuallyadditions:quartz_shovel" }, { - "item": "actuallyadditions:hoe_quartz" + "item": "actuallyadditions:quartz_hoe" } ], "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/axe_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_axe.json similarity index 84% rename from src/generated/resources/data/actuallyadditions/recipes/axe_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_axe.json index 57911431b..97ecc679a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/axe_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:axe_quartz" + "item": "actuallyadditions:quartz_axe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/boots_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_boots.json similarity index 80% rename from src/generated/resources/data/actuallyadditions/recipes/boots_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_boots.json index 61a817848..7332619d6 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/boots_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_boots.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:boots_quartz" + "item": "actuallyadditions:quartz_boots" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/chest_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_chest.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/recipes/chest_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_chest.json index dc6e348e5..12d05e84b 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chest_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_chest.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:chest_quartz" + "item": "actuallyadditions:quartz_chest" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/helm_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_helmet.json similarity index 79% rename from src/generated/resources/data/actuallyadditions/recipes/helm_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_helmet.json index a0309b159..0e0497aa7 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/helm_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_helmet.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:helm_quartz" + "item": "actuallyadditions:quartz_helmet" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hoe_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_hoe.json similarity index 84% rename from src/generated/resources/data/actuallyadditions/recipes/hoe_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_hoe.json index 269bed05e..ae93864bd 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/hoe_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:hoe_quartz" + "item": "actuallyadditions:quartz_hoe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pants_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_leggings.json similarity index 80% rename from src/generated/resources/data/actuallyadditions/recipes/pants_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_leggings.json index 221a35b24..371264436 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pants_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_leggings.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "actuallyadditions:pants_quartz" + "item": "actuallyadditions:quartz_leggings" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_pickaxe.json similarity index 83% rename from src/generated/resources/data/actuallyadditions/recipes/pickaxe_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_pickaxe.json index 48fa3c915..1ca073c86 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/pickaxe_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:pickaxe_quartz" + "item": "actuallyadditions:quartz_pickaxe" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/shovel_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_shovel.json similarity index 83% rename from src/generated/resources/data/actuallyadditions/recipes/shovel_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_shovel.json index 79f587d31..e04fd793a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/shovel_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:shovel_quartz" + "item": "actuallyadditions:quartz_shovel" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/sword_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/quartz_sword.json similarity index 84% rename from src/generated/resources/data/actuallyadditions/recipes/sword_quartz.json rename to src/generated/resources/data/actuallyadditions/recipes/quartz_sword.json index 8bf63e369..ad14316d3 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/sword_quartz.json +++ b/src/generated/resources/data/actuallyadditions/recipes/quartz_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "actuallyadditions:sword_quartz" + "item": "actuallyadditions:quartz_sword" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json b/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json index 7da7b7d0d..47327fda9 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json +++ b/src/generated/resources/data/actuallyadditions/recipes/vertical_digger.json @@ -16,7 +16,7 @@ "item": "actuallyadditions:empowered_void_crystal" }, "D": { - "item": "actuallyadditions:drill" + "tag": "actuallyadditions:drills" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/tags/items/drills.json b/src/generated/resources/data/actuallyadditions/tags/items/drills.json new file mode 100644 index 000000000..92ded93ec --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/tags/items/drills.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "actuallyadditions:drill_light_blue", + "actuallyadditions:drill_black", + "actuallyadditions:drill_black", + "actuallyadditions:drill_blue", + "actuallyadditions:drill_brown", + "actuallyadditions:drill_cyan", + "actuallyadditions:drill_gray", + "actuallyadditions:drill_green", + "actuallyadditions:drill_light_gray", + "actuallyadditions:drill_lime", + "actuallyadditions:drill_magenta", + "actuallyadditions:drill_orange", + "actuallyadditions:drill_pink", + "actuallyadditions:drill_purple", + "actuallyadditions:drill_red", + "actuallyadditions:drill_white", + "actuallyadditions:drill_yellow" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index c270c7448..1248bbfb3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -79,35 +79,35 @@ public class BlockRecipeGenerator extends RecipeProvider { .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE) .define('I', ActuallyBlocks.IRON_CASING.get()) .define('C', ActuallyItems.EMPOWERED_VOID_CRYSTAL.get()) - .define('D', ActuallyItems.DRILL.get()) + .define('D', ActuallyTags.Items.DRILLS) .save(consumer); //Black Quartz Wall - Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer); + Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer); //Black Quartz Slab - Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer); + Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer); //Black Quartz Stairs - Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer); + Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer); //Pillar Black Quartz Wall - Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer); + Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer); //Pillar Black Quartz Slab - Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer); + Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer); //Pillar Black Quartz Stairs - Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer); + Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer); //Chiseled Black Quartz Wall - Recipe.wall(ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer); + Recipe.wall(ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), consumer); //Chiseled Black Quartz Slab - Recipe.slab(ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer); + Recipe.slab(ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), consumer); //Chiseled Black Quartz Stairs - Recipe.stairs(ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer); + Recipe.stairs(ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), consumer); //Ethetic White Wall Recipe.wall(ActuallyBlocks.ETHETIC_WHITE_WALL.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), consumer); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java index a25c97739..6073e2a68 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java @@ -3,6 +3,9 @@ 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.block.SlabBlock; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.WallBlock; import net.minecraft.data.DataGenerator; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.ResourceLocation; @@ -127,43 +130,40 @@ public class BlockStateGenerator extends BlockStateProvider { 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 + standardBlock(ActuallyBlocks.BLACK_QUARTZ); + buildCubeAll(ActuallyBlocks.SMOOTH_BLACK_QUARTZ); + standardBlock(ActuallyBlocks.CHISELED_BLACK_QUARTZ); + standardBlock(ActuallyBlocks.BLACK_QUARTZ_PILLAR); + buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_BRICK); 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")); + // Walls + wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_WALL.get(), modLoc("block/black_quartz")); + wallBlock((WallBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.get(), modLoc("block/smooth_black_quartz")); + wallBlock((WallBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get(), modLoc("block/black_quartz_chiseled")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get(), modLoc("block/black_quartz_pillar")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get(), modLoc("block/black_quartz_brick")); + wallBlock((WallBlock) ActuallyBlocks.ETHETIC_GREEN_WALL.get(), modLoc("block/ethetic_green_block")); + wallBlock((WallBlock) ActuallyBlocks.ETHETIC_WHITE_WALL.get(), modLoc("block/ethetic_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")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), modLoc("block/black_quartz")); + stairsBlock((StairsBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.get(), modLoc("block/smooth_black_quartz")); + stairsBlock((StairsBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(), modLoc("block/black_quartz_chiseled")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(), modLoc("block/black_quartz_pillar")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.get(), modLoc("block/black_quartz_brick")); + stairsBlock((StairsBlock) ActuallyBlocks.ETHETIC_GREEN_STAIRS.get(), modLoc("block/ethetic_green_block")); + stairsBlock((StairsBlock) ActuallyBlocks.ETHETIC_WHITE_STAIRS.get(), modLoc("block/ethetic_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"));*/ + slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_block"), modLoc("block/black_quartz")); + slabBlock((SlabBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.get(), modLoc("block/smooth_black_quartz"), modLoc("block/smooth_black_quartz")); + //slabBlock((SlabBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_chiseled"), modLoc("block/black_quartz_chiseled")); + //slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(), modLoc("block/black_quartz_pillar"), modLoc("block/black_quartz_pillar")); + //slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.get(), modLoc("block/black_quartz_brick"), modLoc("block/black_quartz_brick")); + //slabBlock((SlabBlock) ActuallyBlocks.ETHETIC_GREEN_SLAB.get(), modLoc("block/ethetic_green_block"), modLoc("block/ethetic_green_block")); + //slabBlock((SlabBlock) ActuallyBlocks.ETHETIC_WHITE_SLAB.get(), modLoc("block/ethetic_white_block"), modLoc("block/ethetic_white_block")); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index 35f613357..130b3d3fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -206,8 +206,8 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('F', Items.FLINT) .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); - //Drill //TODO is this still being colorable? - Recipe.shaped(ActuallyItems.DRILL.get()) + //Drill //TODO the rest of the coloring recipes + Recipe.shaped(ActuallyItems.DRILL_MAIN.get()) .pattern("DDD") .pattern("CRC") .pattern("III") @@ -470,7 +470,7 @@ public class ItemRecipeGenerator extends RecipeProvider { } protected void generateEquipment(Consumer consumer) { - addToolAndArmorRecipes(consumer, ActuallyItems.BLACK_QUARTZ, ActuallyItems.PICKAXE_QUARTZ, ActuallyItems.SWORD_QUARTZ, ActuallyItems.AXE_QUARTZ, ActuallyItems.SHOVEL_QUARTZ, ActuallyItems.HOE_QUARTZ, ActuallyItems.HELM_QUARTZ, ActuallyItems.CHEST_QUARTZ, ActuallyItems.PANTS_QUARTZ, ActuallyItems.BOOTS_QUARTZ); + addToolAndArmorRecipes(consumer, ActuallyItems.BLACK_QUARTZ, ActuallyItems.QUARTZ_PICKAXE, ActuallyItems.QUARTZ_SWORD, ActuallyItems.QUARTZ_AXE, ActuallyItems.QUARTZ_SHOVEL, ActuallyItems.QUARTZ_HOE, ActuallyItems.QUARTZ_HELMET, ActuallyItems.QUARTZ_CHEST, ActuallyItems.QUARTZ_LEGGINGS, ActuallyItems.QUARTZ_BOOTS); addToolAndArmorRecipes(consumer, ActuallyItems.RESTONIA_CRYSTAL, ActuallyItems.RESTONIA_PICKAXE, ActuallyItems.RESTONIA_SWORD, ActuallyItems.RESTONIA_AXE, ActuallyItems.RESTONIA_SHOVEL, ActuallyItems.RESTONIA_HOE, ActuallyItems.RESTONIA_HELMET, ActuallyItems.RESTONIA_CHEST, ActuallyItems.RESTONIA_LEGGINGS, ActuallyItems.RESTONIA_BOOTS); addToolAndArmorRecipes(consumer, ActuallyItems.EMERADIC_CRYSTAL, ActuallyItems.EMERADIC_PICKAXE, ActuallyItems.EMERADIC_SWORD, ActuallyItems.EMERADIC_AXE, ActuallyItems.EMERADIC_SHOVEL, ActuallyItems.EMERADIC_HOE, ActuallyItems.EMERADIC_HELMET, ActuallyItems.EMERADIC_CHEST, ActuallyItems.EMERADIC_LEGGINGS, ActuallyItems.EMERADIC_BOOTS); addToolAndArmorRecipes(consumer, ActuallyItems.ENORI_CRYSTAL, ActuallyItems.ENORI_PICKAXE, ActuallyItems.ENORI_SWORD, ActuallyItems.ENORI_AXE, ActuallyItems.ENORI_SHOVEL, ActuallyItems.ENORI_HOE, ActuallyItems.ENORI_HELMET, ActuallyItems.ENORI_CHEST, ActuallyItems.ENORI_LEGGINGS, ActuallyItems.ENORI_BOOTS); @@ -487,7 +487,7 @@ public class ItemRecipeGenerator extends RecipeProvider { addPaxel(consumer, ActuallyItems.DIAMOND_AIOT, Items.DIAMOND_AXE, Items.DIAMOND_PICKAXE, Items.DIAMOND_SWORD, Items.DIAMOND_SHOVEL, Items.DIAMOND_HOE); addPaxel(consumer, ActuallyItems.NETHERITE_AIOT, Items.NETHERITE_AXE, Items.NETHERITE_PICKAXE, Items.NETHERITE_SWORD, Items.NETHERITE_SHOVEL, Items.NETHERITE_HOE); - addPaxel(consumer, ActuallyItems.QUARTZ_AIOT, ActuallyItems.AXE_QUARTZ, ActuallyItems.PICKAXE_QUARTZ, ActuallyItems.SWORD_QUARTZ, ActuallyItems.SHOVEL_QUARTZ, ActuallyItems.HOE_QUARTZ); + addPaxel(consumer, ActuallyItems.QUARTZ_AIOT, ActuallyItems.QUARTZ_AXE, ActuallyItems.QUARTZ_PICKAXE, ActuallyItems.QUARTZ_SWORD, ActuallyItems.QUARTZ_SHOVEL, ActuallyItems.QUARTZ_HOE); addPaxel(consumer, ActuallyItems.RESTONIA_AIOT, ActuallyItems.RESTONIA_AXE, ActuallyItems.RESTONIA_PICKAXE, ActuallyItems.RESTONIA_SWORD, ActuallyItems.RESTONIA_SHOVEL, ActuallyItems.RESTONIA_HOE); addPaxel(consumer, ActuallyItems.EMERADIC_AIOT, ActuallyItems.EMERADIC_AXE, ActuallyItems.EMERADIC_PICKAXE, ActuallyItems.EMERADIC_SWORD, ActuallyItems.EMERADIC_SHOVEL, ActuallyItems.EMERADIC_HOE); addPaxel(consumer, ActuallyItems.PALIS_AIOT, ActuallyItems.PALIS_AXE, ActuallyItems.PALIS_PICKAXE, ActuallyItems.PALIS_SWORD, ActuallyItems.PALIS_SHOVEL, ActuallyItems.PALIS_HOE); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java index 926a0805d..44d5a7306 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java @@ -17,17 +17,17 @@ public class ItemTagsGenerator extends ItemTagsProvider { @Override protected void addTags() { - this.tag(ActuallyTags.Items.COFFEE_BEANS) + tag(ActuallyTags.Items.COFFEE_BEANS) .add(ActuallyItems.COFFEE_BEANS.get()); - this.tag(ActuallyTags.Items.TINY_COALS) - .add(ActuallyItems.TINY_COAL.get()) - .add(ActuallyItems.TINY_CHARCOAL.get()); - // getOrCreateBuilder(ActuallyTags.Items.DRILLS).add( - // ActuallyItems.DRILL_MAIN.get(), - // ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLUE.get(), ActuallyItems.DRILL_BROWN.get(), - // ActuallyItems.DRILL_CYAN.get(), ActuallyItems.DRILL_GRAY.get(), ActuallyItems.DRILL_GREEN.get(), ActuallyItems.DRILL_LIGHT_GRAY.get(), - // ActuallyItems.DRILL_LIME.get(), ActuallyItems.DRILL_MAGENTA.get(), ActuallyItems.DRILL_ORANGE.get(), ActuallyItems.DRILL_PINK.get(), - // ActuallyItems.DRILL_PURPLE.get(), ActuallyItems.DRILL_RED.get(), ActuallyItems.DRILL_WHITE.get(), ActuallyItems.DRILL_YELLOW.get() - // ); + tag(ActuallyTags.Items.TINY_COALS) + .add(ActuallyItems.TINY_COAL.get()) + .add(ActuallyItems.TINY_CHARCOAL.get()); + tag(ActuallyTags.Items.DRILLS).add( + ActuallyItems.DRILL_MAIN.get(), + ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLUE.get(), ActuallyItems.DRILL_BROWN.get(), + ActuallyItems.DRILL_CYAN.get(), ActuallyItems.DRILL_GRAY.get(), ActuallyItems.DRILL_GREEN.get(), ActuallyItems.DRILL_LIGHT_GRAY.get(), + ActuallyItems.DRILL_LIME.get(), ActuallyItems.DRILL_MAGENTA.get(), ActuallyItems.DRILL_ORANGE.get(), ActuallyItems.DRILL_PINK.get(), + ActuallyItems.DRILL_PURPLE.get(), ActuallyItems.DRILL_RED.get(), ActuallyItems.DRILL_WHITE.get(), ActuallyItems.DRILL_YELLOW.get() + ); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index 675f1f73f..cd2e64413 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -209,49 +209,45 @@ public final class ActuallyBlocks { public static final AABlockReg ENDER_PEARL_BLOCK = new AABlockReg<>("ender_pearl_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_GREEN_BLOCK = new AABlockReg<>("ethetic_green_block", () -> new ActuallyBlock(miscBlockProperties), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_WHITE_BLOCK = new AABlockReg<>("ethetic_white_block", () -> new ActuallyBlock(miscBlockProperties), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_BLOCK = new AABlockReg<>("black_quartz_block", () -> new ActuallyBlock(miscBlockProperties), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_PILLAR_BLOCK = new AABlockReg<>("black_quartz_pillar_block", () -> new ActuallyBlock(miscBlockProperties), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg CHISELED_BLACK_QUARTZ_BLOCK = new AABlockReg<>("chiseled_black_quartz_block", () -> new ActuallyBlock(miscBlockProperties), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg ETHETIC_GREEN_BLOCK = new AABlockReg<>("ethetic_green_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg ETHETIC_WHITE_BLOCK = new AABlockReg<>("ethetic_white_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_GREEN_STAIRS = new AABlockReg<>("ethetic_green_stairs", () -> new StairsBlock(() -> ETHETIC_GREEN_BLOCK.get().defaultBlockState(), AbstractBlock.Properties.copy(ETHETIC_GREEN_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_WHITE_STAIRS = new AABlockReg<>("ethetic_white_stairs", () -> new StairsBlock(() -> ETHETIC_WHITE_BLOCK.get().defaultBlockState(), AbstractBlock.Properties.copy(ETHETIC_WHITE_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_STAIR = new AABlockReg<>("black_quartz_stair", () -> new StairsBlock(() -> BLACK_QUARTZ_BLOCK.get().defaultBlockState(), AbstractBlock.Properties.copy(BLACK_QUARTZ_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg CHISELED_BLACK_QUARTZ_STAIR = new AABlockReg<>("chiseled_black_quartz_stair", () -> new StairsBlock(() -> CHISELED_BLACK_QUARTZ_BLOCK.get().defaultBlockState(), AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_PILLAR_STAIR = new AABlockReg<>("black_quartz_pillar_stair", () -> new StairsBlock(() -> BLACK_QUARTZ_PILLAR_BLOCK.get().defaultBlockState(), AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); + //Black Quartz + public static final AABlockReg BLACK_QUARTZ = new AABlockReg<>("black_quartz_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_PILLAR = new AABlockReg<>("black_quartz_pillar", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg CHISELED_BLACK_QUARTZ = new AABlockReg<>("chiseled_black_quartz", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg SMOOTH_BLACK_QUARTZ = new AABlockReg<>("smooth_black_quartz", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_BRICK = new AABlockReg<>("black_quartz_brick", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + + //Walls + public static final AABlockReg ETHETIC_GREEN_WALL = new AABlockReg<>("ethetic_green_wall", () -> new WallBlock(AbstractBlock.Properties.copy(ETHETIC_GREEN_BLOCK.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg ETHETIC_WHITE_WALL = new AABlockReg<>("ethetic_white_wall", () -> new WallBlock(AbstractBlock.Properties.copy(ETHETIC_WHITE_BLOCK.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_WALL = new AABlockReg<>("black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg CHISELED_BLACK_QUARTZ_WALL = new AABlockReg<>("chiseled_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg SMOOTH_BLACK_QUARTZ_WALL = new AABlockReg<>("smooth_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_BRICK_WALL = new AABlockReg<>("black_quartz_brick_wall", () -> new WallBlock(AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_PILLAR_WALL = new AABlockReg<>("black_quartz_pillar_wall", () -> new WallBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + + //Slabs + public static final AABlockReg ETHETIC_GREEN_SLAB = new AABlockReg<>("ethetic_green_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(ETHETIC_GREEN_BLOCK.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg ETHETIC_WHITE_SLAB = new AABlockReg<>("ethetic_white_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(ETHETIC_WHITE_BLOCK.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_SLAB = new AABlockReg<>("black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg CHISELED_BLACK_QUARTZ_SLAB = new AABlockReg<>("chiseled_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_PILLAR_SLAB = new AABlockReg<>("black_quartz_pillar_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg SMOOTH_BLACK_QUARTZ_SLAB = new AABlockReg<>("smooth_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_BRICK_SLAB = new AABlockReg<>("black_quartz_brick_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + + + //Stairs + public static final AABlockReg ETHETIC_GREEN_STAIRS = new AABlockReg<>("ethetic_green_stairs", () -> new StairsBlock(() -> ETHETIC_GREEN_BLOCK.get().defaultBlockState(), AbstractBlock.Properties.copy(ETHETIC_GREEN_BLOCK.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg ETHETIC_WHITE_STAIRS = new AABlockReg<>("ethetic_white_stairs", () -> new StairsBlock(() -> ETHETIC_WHITE_BLOCK.get().defaultBlockState(), AbstractBlock.Properties.copy(ETHETIC_WHITE_BLOCK.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_STAIR = new AABlockReg<>("black_quartz_stair", () -> new StairsBlock(() -> BLACK_QUARTZ.get().defaultBlockState(), AbstractBlock.Properties.copy(BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg CHISELED_BLACK_QUARTZ_STAIR = new AABlockReg<>("chiseled_black_quartz_stair", () -> new StairsBlock(() -> CHISELED_BLACK_QUARTZ.get().defaultBlockState(), AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_PILLAR_STAIR = new AABlockReg<>("black_quartz_pillar_stair", () -> new StairsBlock(() -> BLACK_QUARTZ_PILLAR.get().defaultBlockState(), AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg SMOOTH_BLACK_QUARTZ_STAIR = new AABlockReg<>("smooth_black_quartz_stair", () -> new StairsBlock(() -> BLACK_QUARTZ_PILLAR.get().defaultBlockState(), AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_BRICK_STAIR = new AABlockReg<>("black_quartz_brick_stair", () -> new StairsBlock(() -> BLACK_QUARTZ_PILLAR.get().defaultBlockState(), AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_GREEN_WALL = new AABlockReg<>("ethetic_green_wall", () -> new WallBlock(AbstractBlock.Properties.copy(ETHETIC_GREEN_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_WHITE_WALL = new AABlockReg<>("ethetic_white_wall", () -> new WallBlock(AbstractBlock.Properties.copy(ETHETIC_WHITE_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_WALL = new AABlockReg<>("black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg CHISELED_BLACK_QUARTZ_WALL = new AABlockReg<>("chiseled_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_PILLAR_WALL = new AABlockReg<>("black_quartz_pillar_wall", () -> new WallBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_GREEN_SLAB = new AABlockReg<>("ethetic_green_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(ETHETIC_GREEN_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg ETHETIC_WHITE_SLAB = new AABlockReg<>("ethetic_white_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(ETHETIC_WHITE_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_SLAB = new AABlockReg<>("black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg CHISELED_BLACK_QUARTZ_SLAB = new AABlockReg<>("chiseled_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(CHISELED_BLACK_QUARTZ_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_PILLAR_SLAB = new AABlockReg<>("black_quartz_pillar_slab", () -> new SlabBlock(AbstractBlock.Properties.copy(BLACK_QUARTZ_PILLAR_BLOCK.get())), - (b) -> new AABlockItem(b, defaultBlockItemProperties)); // Other Misc Blocks diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java index 2bdd8741d..b84cb8a97 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java @@ -10,8 +10,8 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityShockSuppressor; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; @@ -24,11 +24,12 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class BlockShockSuppressor extends BlockContainerBase { +public class BlockShockSuppressor extends Block { public BlockShockSuppressor() { super(ActuallyBlocks.defaultPickProps(0, 20F, 2000.0F)); @@ -87,11 +88,17 @@ public class BlockShockSuppressor extends BlockContainerBase { } } + @Nullable @Override - public TileEntity newBlockEntity(IBlockReader worldIn) { + public TileEntity createTileEntity(BlockState state, IBlockReader world) { return new TileEntityShockSuppressor(); } + @Override + public boolean hasTileEntity(BlockState state) { + return true; + } + @Override public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { return Shapes.SUPPRESSOR_SHAPE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java index cd86dd88c..db510db7b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java @@ -17,8 +17,8 @@ import de.ellpeck.actuallyadditions.mod.data.PlayerData; import de.ellpeck.actuallyadditions.mod.data.WorldData; import de.ellpeck.actuallyadditions.mod.inventory.ContainerBag; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; +import de.ellpeck.actuallyadditions.mod.items.DrillItem; import de.ellpeck.actuallyadditions.mod.items.ItemBag; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; @@ -72,7 +72,7 @@ public class CommonEvents { boolean isVoid = ((ItemBag) invStack.getItem()).isVoid; ItemStackHandlerAA inv = new ItemStackHandlerAA(ContainerBag.getSlotAmount(isVoid)); - ItemDrill.loadSlotsFromNBT(inv, invStack); + DrillItem.loadSlotsFromNBT(inv, invStack); FilterSettings filter = new FilterSettings(4, false, false, false, false, 0, 0); filter.readFromNBT(invStack.getOrCreateTag(), "Filter"); @@ -107,7 +107,7 @@ public class CommonEvents { if (changed) { if (!isVoid) { - ItemDrill.writeSlotsToNBT(inv, invStack); + DrillItem.writeSlotsToNBT(inv, invStack); } event.setResult(Event.Result.ALLOW); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java index 718f355a0..22d9ddd3a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java @@ -16,8 +16,8 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotDeletion; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.mod.items.DrillItem; import de.ellpeck.actuallyadditions.mod.items.ItemBag; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; @@ -101,7 +101,7 @@ public class ContainerBag extends Container implements IButtonReactor { ItemStack stack = inventory.getSelected(); if (StackUtil.isValid(stack) && stack.getItem() instanceof ItemBag) { - ItemDrill.loadSlotsFromNBT(this.bagInventory, inventory.getSelected()); + DrillItem.loadSlotsFromNBT(this.bagInventory, inventory.getSelected()); if (stack.hasTag()) { CompoundNBT compound = stack.getOrCreateTag(); this.filter.readFromNBT(compound, "Filter"); @@ -226,7 +226,7 @@ public class ContainerBag extends Container implements IButtonReactor { public void removed(PlayerEntity player) { ItemStack stack = this.inventory.getSelected(); if (StackUtil.isValid(stack) && stack.getItem() instanceof ItemBag) { - ItemDrill.writeSlotsToNBT(this.bagInventory, this.inventory.getSelected()); + DrillItem.writeSlotsToNBT(this.bagInventory, this.inventory.getSelected()); CompoundNBT compound = stack.getOrCreateTag(); this.filter.writeToNBT(compound, "Filter"); compound.putBoolean("AutoInsert", this.autoInsert); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java index 77b887a2a..3a35fb5b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; +import de.ellpeck.actuallyadditions.mod.items.DrillItem; import de.ellpeck.actuallyadditions.mod.items.ItemDrillUpgrade; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; import de.ellpeck.actuallyadditions.mod.util.StackUtil; @@ -62,8 +62,8 @@ public class ContainerDrill extends Container { } ItemStack stack = inventory.getSelected(); - if (StackUtil.isValid(stack) && stack.getItem() instanceof ItemDrill) { - ItemDrill.loadSlotsFromNBT(this.drillInventory, inventory.getSelected()); + if (StackUtil.isValid(stack) && stack.getItem() instanceof DrillItem) { + DrillItem.loadSlotsFromNBT(this.drillInventory, inventory.getSelected()); } } @@ -129,8 +129,8 @@ public class ContainerDrill extends Container { @Override public void removed(PlayerEntity player) { ItemStack stack = this.inventory.getSelected(); - if (StackUtil.isValid(stack) && stack.getItem() instanceof ItemDrill) { - ItemDrill.writeSlotsToNBT(this.drillInventory, this.inventory.getSelected()); + if (StackUtil.isValid(stack) && stack.getItem() instanceof DrillItem) { + DrillItem.writeSlotsToNBT(this.drillInventory, this.inventory.getSelected()); } super.removed(player); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java index 09893c47c..e42d14c0a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; +import de.ellpeck.actuallyadditions.mod.items.DrillItem; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; @@ -59,7 +59,7 @@ public class ContainerFilter extends Container { ItemStack stack = inventory.getSelected(); if (SlotFilter.isFilter(stack)) { - ItemDrill.loadSlotsFromNBT(this.filterInventory, inventory.getSelected()); + DrillItem.loadSlotsFromNBT(this.filterInventory, inventory.getSelected()); } } @@ -122,7 +122,7 @@ public class ContainerFilter extends Container { public void removed(PlayerEntity player) { ItemStack stack = this.inventory.getSelected(); if (SlotFilter.isFilter(stack)) { - ItemDrill.writeSlotsToNBT(this.filterInventory, this.inventory.getSelected()); + DrillItem.writeSlotsToNBT(this.filterInventory, this.inventory.getSelected()); } super.removed(player); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java index a37e5b6e5..471230611 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -34,17 +34,10 @@ import java.util.Set; public final class ActuallyItems { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ActuallyAdditions.MODID); - // REMOVE ME - @Deprecated - public static final RegistryObject itemMisc = ITEMS.register("misc", ItemBase::new); - // MISC ITEMS // public static final RegistryObject CANOLA = ITEMS.register("canola", ItemBase::new); public static final RegistryObject COFFEE_CUP = ITEMS.register("coffee_cup", ItemBase::new); public static final RegistryObject PAPER_CONE = ITEMS.register("paper_cone", ItemBase::new); - public static final RegistryObject MASHED_FOOD = ITEMS.register("mashed_food", ItemBase::new); - public static final RegistryObject KNIFE_BLADE = ITEMS.register("knife_blade", ItemBase::new); - public static final RegistryObject KNIFE_HANDLE = ITEMS.register("knife_handle", ItemBase::new); public static final RegistryObject DOUGH = ITEMS.register("dough", ItemBase::new); public static final RegistryObject RING = ITEMS.register("ring", ItemBase::new); public static final RegistryObject BASIC_COIL = ITEMS.register("basic_coil", ItemBase::new); @@ -66,12 +59,8 @@ public final class ActuallyItems { public static final RegistryObject EMPTY_CUP = ITEMS.register("empty_cup", ItemBase::new); public static final RegistryObject BATS_WING = ITEMS.register("bats_wing", ItemBase::new); public static final RegistryObject DRILL_CORE = ITEMS.register("drill_core", ItemBase::new); - public static final RegistryObject BLACK_DYE = ITEMS.register("black_dye", ItemBase::new); public static final RegistryObject LENS = ITEMS.register("lens", ItemBase::new); public static final RegistryObject ENDER_STAR = ITEMS.register("ender_star", ItemBase::new); - public static final RegistryObject SPAWNER_SHARD = ITEMS.register("spawner_shard", ItemBase::new); - public static final RegistryObject BIOMASS = ITEMS.register("biomass", ItemBase::new); - public static final RegistryObject BIOCOAL = ITEMS.register("biocoal", ItemBase::new); public static final RegistryObject CRYSTALLIZED_CANOLA_SEED = ITEMS.register("crystallized_canola_seed", ItemBase::new); public static final RegistryObject EMPOWERED_CANOLA_SEED = ITEMS.register("empowered_canola_seed", ItemBase::new); @@ -126,10 +115,27 @@ public final class ActuallyItems { public static final RegistryObject ITEM_BOOKLET = ITEMS.register("booklet", ItemBooklet::new); public static final RegistryObject RING_OF_GROWTH = ITEMS.register("ring_of_growth", ItemGrowthRing::new); public static final RegistryObject RING_OF_MAGNETIZING = ITEMS.register("ring_of_magnetizing", ItemMagnetRing::new); - //public static final RegistryObject WATER_REMOVAL_RING = ITEMS.register("water_removal_ring", ItemWaterRemovalRing::new); public static final RegistryObject TELEPORT_STAFF = ITEMS.register("teleport_staff", ItemTeleStaff::new); public static final RegistryObject WINGS_OF_THE_BATS = ITEMS.register("wings_of_the_bats", ItemWingsOfTheBats::new); - public static final RegistryObject DRILL = ITEMS.register("drill", ItemDrill::new); + + public static final RegistryObject DRILL_MAIN = ITEMS.register("drill_light_blue", DrillItem::new); + public static final RegistryObject DRILL_BLACK = ITEMS.register("drill_black", DrillItem::new); + public static final RegistryObject DRILL_BLUE = ITEMS.register("drill_blue", DrillItem::new); + public static final RegistryObject DRILL_BROWN = ITEMS.register("drill_brown", DrillItem::new); + public static final RegistryObject DRILL_CYAN = ITEMS.register("drill_cyan", DrillItem::new); + public static final RegistryObject DRILL_GRAY = ITEMS.register("drill_gray", DrillItem::new); + public static final RegistryObject DRILL_GREEN = ITEMS.register("drill_green", DrillItem::new); + public static final RegistryObject DRILL_LIGHT_GRAY = ITEMS.register("drill_light_gray", DrillItem::new); + public static final RegistryObject DRILL_LIME = ITEMS.register("drill_lime", DrillItem::new); + public static final RegistryObject DRILL_MAGENTA = ITEMS.register("drill_magenta", DrillItem::new); + public static final RegistryObject DRILL_ORANGE = ITEMS.register("drill_orange", DrillItem::new); + public static final RegistryObject DRILL_PINK = ITEMS.register("drill_pink", DrillItem::new); + public static final RegistryObject DRILL_PURPLE = ITEMS.register("drill_purple", DrillItem::new); + public static final RegistryObject DRILL_RED = ITEMS.register("drill_red", DrillItem::new); + public static final RegistryObject DRILL_WHITE = ITEMS.register("drill_white", DrillItem::new); + public static final RegistryObject DRILL_YELLOW = ITEMS.register("drill_yellow", DrillItem::new); + + public static final RegistryObject SINGLE_BATTERY = ITEMS.register("single_battery", () -> new ItemBattery(200000, 1000)); public static final RegistryObject DOUBLE_BATTERY = ITEMS.register("double_battery", () -> new ItemBattery(350000, 5000)); public static final RegistryObject TRIPLE_BATTERY = ITEMS.register("triple_battery", () -> new ItemBattery(600000, 10000)); @@ -145,21 +151,21 @@ public final class ActuallyItems { public static final RegistryObject DRILL_UPGRADE_FIVE_BY_FIVE = ITEMS.register("drill_upgrade_five_by_five", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)); public static final RegistryObject DRILL_UPGRADE_BLOCK_PLACING = ITEMS.register("drill_upgrade_block_placing", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.PLACER)); public static final RegistryObject FERTILIZER = ITEMS.register("fertilizer", ItemFertilizer::new); - // public static final RegistryObject COFFEE = ITEMS.register("coffee", ItemCoffee::new); + // public static final RegistryObject COFFEE = ITEMS.register("coffee", ItemCoffee::new); //TODO flatten public static final RegistryObject PHANTOM_CONNECTOR = ITEMS.register("phantom_connector", ItemPhantomConnector::new); public static final RegistryObject RESONANT_RICE = ITEMS.register("resonant_rice", ItemResonantRice::new); - public static final RegistryObject FOOD = ITEMS.register("food", ItemBase::new); //just... food? //TODO - public static final RegistryObject JAM = ITEMS.register("jam", ItemJams::new); + //public static final RegistryObject FOOD = ITEMS.register("food", ItemBase::new); //just... food? //TODO + //public static final RegistryObject JAM = ITEMS.register("jam", ItemJams::new); //TODO flatten public static final RegistryObject KNIFE = ITEMS.register("knife", ItemKnife::new); public static final RegistryObject CRAFTER_ON_A_STICK = ITEMS.register("crafter_on_a_stick", ItemCrafterOnAStick::new); - public static final RegistryObject DUST = ITEMS.register("dust", ItemDust::new); + //public static final RegistryObject DUST = ITEMS.register("dust", ItemDust::new); //TODO flatten public static final RegistryObject SOLIDIFIED_EXPERIENCE = ITEMS.register("solidified_experience", ItemSolidifiedExperience::new); public static final RegistryObject LEAF_BLOWER = ITEMS.register("leaf_blower", () -> new ItemLeafBlower(false)); public static final RegistryObject ADVANCED_LEAF_BLOWER = ITEMS.register("advanced_leaf_blower", () -> new ItemLeafBlower(true)); - // TODO [port] unflatten - public static final RegistryObject POTION_RING = ITEMS.register("potion_ring", () -> new ItemPotionRing(false)); - public static final RegistryObject POTION_RING_ADVANCED = ITEMS.register("potion_ring_advanced", () -> new ItemPotionRing(true)); + // TODO [port] flatten + //public static final RegistryObject POTION_RING = ITEMS.register("potion_ring", () -> new ItemPotionRing(false)); + //public static final RegistryObject POTION_RING_ADVANCED = ITEMS.register("potion_ring_advanced", () -> new ItemPotionRing(true)); public static final RegistryObject HAIRY_BALL = ITEMS.register("hairy_ball", ItemHairBall::new); public static final RegistryObject COFFEE_BEANS = ITEMS.register("coffee_beans", ItemCoffeeBean::new); @@ -170,16 +176,16 @@ public final class ActuallyItems { public static final RegistryObject COFFEE_SEEDS = ITEMS.register("coffee_seeds", ItemBase::new); //() -> new ItemSeed("seedCoffeeBeans", ActuallyBlocks.COFFEE, COFFEE_BEANS, 0)); // TOOLS & ARMOR - public static final RegistryObject HELM_QUARTZ = ITEMS.register("helm_quartz", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.HEAD)); - public static final RegistryObject CHEST_QUARTZ = ITEMS.register("chest_quartz", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.CHEST)); - public static final RegistryObject PANTS_QUARTZ = ITEMS.register("pants_quartz", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.LEGS)); - public static final RegistryObject BOOTS_QUARTZ = ITEMS.register("boots_quartz", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.FEET)); + public static final RegistryObject QUARTZ_HELMET = ITEMS.register("quartz_helmet", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.HEAD)); + public static final RegistryObject QUARTZ_CHEST = ITEMS.register("quartz_chest", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.CHEST)); + public static final RegistryObject QUARTZ_LEGGINGS = ITEMS.register("quartz_leggings", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.LEGS)); + public static final RegistryObject QUARTZ_BOOTS = ITEMS.register("quartz_boots", () -> new ItemArmorAA(ArmorMaterials.QUARTZ, EquipmentSlotType.FEET)); - public static final RegistryObject PICKAXE_QUARTZ = ITEMS.register("pickaxe_quartz", () -> new ItemPickaxeAA(ToolMaterials.BLACK_QUARTZ)); - public static final RegistryObject AXE_QUARTZ = ITEMS.register("axe_quartz", () -> new ItemAxeAA(ToolMaterials.BLACK_QUARTZ)); - public static final RegistryObject SHOVEL_QUARTZ = ITEMS.register("shovel_quartz", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.BLACK_QUARTZ)); - public static final RegistryObject SWORD_QUARTZ = ITEMS.register("sword_quartz", () -> new ItemSwordAA(ToolMaterials.BLACK_QUARTZ)); - public static final RegistryObject HOE_QUARTZ = ITEMS.register("hoe_quartz", () -> new ItemHoeAA(ToolMaterials.BLACK_QUARTZ)); + public static final RegistryObject QUARTZ_PICKAXE = ITEMS.register("quartz_pickaxe", () -> new ItemPickaxeAA(ToolMaterials.BLACK_QUARTZ)); + public static final RegistryObject QUARTZ_AXE = ITEMS.register("quartz_axe", () -> new ItemAxeAA(ToolMaterials.BLACK_QUARTZ)); + public static final RegistryObject QUARTZ_SHOVEL = ITEMS.register("quartz_shovel", ItemBase::new); //() -> new ItemShovelAA(ToolMaterials.BLACK_QUARTZ)); + public static final RegistryObject QUARTZ_SWORD = ITEMS.register("quartz_sword", () -> new ItemSwordAA(ToolMaterials.BLACK_QUARTZ)); + public static final RegistryObject QUARTZ_HOE = ITEMS.register("quartz_hoe", () -> new ItemHoeAA(ToolMaterials.BLACK_QUARTZ)); public static final RegistryObject WOODEN_AIOT = ITEMS.register("wooden_aiot", () -> new AllInOneTool(ItemTier.WOOD)); public static final RegistryObject STONE_AIOT = ITEMS.register("stone_aiot", () -> new AllInOneTool(ItemTier.STONE)); public static final RegistryObject IRON_AIOT = ITEMS.register("iron_aiot", () -> new AllInOneTool(ItemTier.IRON)); @@ -269,14 +275,13 @@ public final class ActuallyItems { HANDHELD_FILLER, TRAVELERS_SACK, VOID_SACK, WORM, PLAYER_PROBE, FILTER, WATER_BOWL, PAPER_CONE, DOUGH, RING, BASIC_COIL, ADVANCED_COIL, RICE_DOUGH, TINY_COAL, TINY_CHARCOAL, RICE_SLIMEBALL, /*CANOLA,*/ EMPTY_CUP, BATS_WING, DRILL_CORE, LENS, ENDER_STAR, CRYSTALLIZED_CANOLA_SEED, EMPOWERED_CANOLA_SEED, LENS_OF_COLOR, -/* LENS_OF_DETONATION, LENS_OF_CERTAIN_DEATH, LENS_OF_THE_KILLER, LENS_OF_DISENCHANTING, LENS_OF_THE_MINER,*/ + LENS_OF_DETONATION, LENS_OF_CERTAIN_DEATH, LENS_OF_THE_KILLER, LENS_OF_DISENCHANTING, LENS_OF_THE_MINER, LASER_WRENCH, TELEPORT_STAFF, WINGS_OF_THE_BATS, SINGLE_BATTERY, DOUBLE_BATTERY, TRIPLE_BATTERY, QUADRUPLE_BATTERY, QUINTUPLE_BATTERY, -/* DRILL_BLACK, DRILL_BLUE, DRILL_BROWN, DRILL_CYAN, DRILL_GRAY, DRILL_GREEN, DRILL_MAIN, DRILL_LIGHT_GRAY, - DRILL_LIME, DRILL_MAGENTA, DRILL_ORANGE, DRILL_PINK, DRILL_PURPLE, DRILL_RED, DRILL_WHITE, DRILL_YELLOW, DRILL_SPEED_AUGMENT_I, - DRILL_SPEED_AUGMENT_II, DRILL_SPEED_AUGMENT_III, DRILL_SILK_TOUCH_AUGMENT, DRILL_FORTUNE_AUGMENT_I, DRILL_FORTUNE_AUGMENT_II, - DRILL_MINING_AUGMENT_I, DRILL_MINING_AUGMENT_II, DRILL_BLOCK_PLACING_AUGMENT, */ - FERTILIZER, COFFEE_CUP, PHANTOM_CONNECTOR, - RESONANT_RICE, + DRILL_BLACK, DRILL_BLUE, DRILL_BROWN, DRILL_CYAN, DRILL_GRAY, DRILL_GREEN, DRILL_MAIN, DRILL_LIGHT_GRAY, + DRILL_LIME, DRILL_MAGENTA, DRILL_ORANGE, DRILL_PINK, DRILL_PURPLE, DRILL_RED, DRILL_WHITE, DRILL_YELLOW, + DRILL_UPGRADE_SPEED, DRILL_UPGRADE_SPEED_II, DRILL_UPGRADE_SPEED_III, DRILL_UPGRADE_SILK_TOUCH, + DRILL_UPGRADE_FORTUNE, DRILL_UPGRADE_FORTUNE_II, DRILL_UPGRADE_THREE_BY_THREE, DRILL_UPGRADE_FIVE_BY_FIVE, DRILL_UPGRADE_BLOCK_PLACING, + FERTILIZER, COFFEE_CUP, PHANTOM_CONNECTOR, RESONANT_RICE, /* FOOD_CHEESE, FOOD_PUMPKIN_STEW, FOOD_CARROT_JUICE, FOOD_FISH_N_CHIPS, FOOD_FRENCH_FRIES, FOOD_FRENCH_FRY, FOOD_SPAGHETTI, FOOD_NOODLE, FOOD_CHOCOLATE_CAKE, FOOD_CHOCOLATE, FOOD_TOAST, FOOD_SUBMARINE_SANDWICH, FOOD_BIG_COOKIE, FOOD_HAMBURGER, FOOD_PIZZA, FOOD_BAGUETTE, FOOD_RICE, FOOD_RICE_BREAD, FOOD_DOUGHNUT, FOOD_TOAST_O_CHOCOLATE, @@ -292,7 +297,15 @@ public final class ActuallyItems { ADVANCED_RING_OF_JUMP_BOOST, ADVANCED_RING_OF_REGENERATION, ADVANCED_RING_OF_RESISTANCE, ADVANCED_RING_OF_FIRE_RESISTANCE, ADVANCED_RING_OF_WATER_BREATHING, ADVANCED_RING_OF_INVISIBILITY, ADVANCED_RING_OF_NIGHT_VISION,*/ HAIRY_BALL, - COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, COFFEE_SEEDS + COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, COFFEE_SEEDS , + QUARTZ_HELMET, QUARTZ_CHEST, QUARTZ_LEGGINGS, QUARTZ_BOOTS, QUARTZ_PICKAXE, QUARTZ_AXE, QUARTZ_SHOVEL, QUARTZ_SWORD, QUARTZ_HOE, + WOODEN_AIOT, STONE_AIOT, IRON_AIOT, GOLD_AIOT, DIAMOND_AIOT, NETHERITE_AIOT, QUARTZ_AIOT, + RESTONIA_PICKAXE, RESTONIA_AXE, RESTONIA_SHOVEL, RESTONIA_SWORD, RESTONIA_HOE, RESTONIA_HELMET, RESTONIA_CHEST, RESTONIA_LEGGINGS, RESTONIA_BOOTS, RESTONIA_AIOT, + PALIS_PICKAXE, PALIS_AXE, PALIS_SHOVEL, PALIS_SWORD, PALIS_HOE, PALIS_HELMET, PALIS_CHEST, PALIS_LEGGINGS, PALIS_BOOTS, PALIS_AIOT, + DIAMATINE_PICKAXE, DIAMATINE_AXE, DIAMATINE_SHOVEL, DIAMATINE_SWORD, DIAMATINE_HOE, DIAMATINE_HELMET, DIAMATINE_CHEST, DIAMATINE_LEGGINGS, DIAMATINE_BOOTS, DIAMATINE_AIOT, + VOID_PICKAXE, VOID_AXE, VOID_SHOVEL, VOID_SWORD, VOID_HOE, VOID_HELMET, VOID_CHEST, VOID_LEGGINGS, VOID_BOOTS, VOID_AIOT, + EMERADIC_PICKAXE, EMERADIC_AXE, EMERADIC_SHOVEL, EMERADIC_SWORD, EMERADIC_HOE, EMERADIC_HELMET, EMERADIC_CHEST, EMERADIC_LEGGINGS, EMERADIC_BOOTS, EMERADIC_AIOT, + ENORI_PICKAXE, ENORI_AXE, ENORI_SHOVEL, ENORI_SWORD, ENORI_HOE, ENORI_HELMET, ENORI_CHEST, ENORI_LEGGINGS, ENORI_BOOTS, ENORI_AIOT ); public static Item.Properties defaultProps() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java similarity index 99% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java index 629ebbb5d..7e482bd5b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java @@ -49,12 +49,12 @@ import net.minecraftforge.items.IItemHandlerModifiable; import javax.annotation.Nullable; -public class ItemDrill extends ItemEnergy { +public class DrillItem extends ItemEnergy { public static final int HARVEST_LEVEL = 4; private static final int ENERGY_USE = 100; - public ItemDrill() { + public DrillItem() { super(ActuallyItems.defaultProps().defaultDurability(0).stacksTo(1).addToolType(ToolType.SHOVEL, HARVEST_LEVEL).addToolType(ToolType.PICKAXE, HARVEST_LEVEL), 250000, 1000); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java index d93e253ff..d060e4486 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java @@ -51,7 +51,7 @@ public class ItemBag extends ItemBase { boolean changed = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, context.getClickedFace()) .map(cap -> { boolean localChanged = false; - ItemDrill.loadSlotsFromNBT(inv, stack); + DrillItem.loadSlotsFromNBT(inv, stack); for (int j = 0; j < inv.getSlots(); j++) { ItemStack invStack = inv.getStackInSlot(j); @@ -74,7 +74,7 @@ public class ItemBag extends ItemBase { }).orElse(false); if (changed) { - ItemDrill.writeSlotsToNBT(inv, stack); + DrillItem.writeSlotsToNBT(inv, stack); } } return ActionResultType.SUCCESS; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java index 2b023c251..ef5c6f484 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java @@ -49,7 +49,7 @@ public class ItemFilter extends ItemBase { super.appendHoverText(stack, worldIn, tooltip, flagIn); ItemStackHandlerAA inv = new ItemStackHandlerAA(ContainerFilter.SLOT_AMOUNT); - ItemDrill.loadSlotsFromNBT(inv, stack); + DrillItem.loadSlotsFromNBT(inv, stack); for (int i = 0; i < inv.getSlots(); i++) { ItemStack slot = inv.getStackInSlot(i); if (StackUtil.isValid(slot)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java index b4cbb07f3..1b752d30d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; public final class BannerHelper { public static void init() { - addCraftingPattern("drill", new ItemStack(ActuallyItems.DRILL.get())); + addCraftingPattern("drill", new ItemStack(ActuallyItems.DRILL_MAIN.get())); addCraftingPattern("leaf_blo", new ItemStack(ActuallyItems.LEAF_BLOWER.get())); addCraftingPattern("phan_con", new ItemStack(ActuallyItems.PHANTOM_CONNECTOR.get())); addCraftingPattern("book", new ItemStack(ActuallyItems.ITEM_BOOKLET.get())); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/LaserRelayConnectionHandler.java index 5be23870c..22df52945 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/LaserRelayConnectionHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/LaserRelayConnectionHandler.java @@ -70,13 +70,13 @@ public final class LaserRelayConnectionHandler implements ILaserRelayConnectionH @Override public ConcurrentSet getConnectionsFor(BlockPos relay, World world) { ConcurrentSet allPairs = new ConcurrentSet<>(); - for (Network aNetwork : WorldData.get(world).laserRelayNetworks) { +/* for (Network aNetwork : WorldData.get(world).laserRelayNetworks) { for (IConnectionPair pair : aNetwork.connections) { if (pair.contains(relay)) { allPairs.add(pair); } } - } + }*/ //TODO ohhh boy return allPairs; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java index eafc74313..a55b37560 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; +import de.ellpeck.actuallyadditions.mod.items.DrillItem; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.item.Item; @@ -62,7 +62,7 @@ public class FilterSettings { if (StackUtil.isValid(slot)) { if (SlotFilter.isFilter(slot)) { ItemStackHandlerAA inv = new ItemStackHandlerAA(ContainerFilter.SLOT_AMOUNT); - ItemDrill.loadSlotsFromNBT(inv, slot); + DrillItem.loadSlotsFromNBT(inv, slot); for (int k = 0; k < inv.getSlots(); k++) { ItemStack filterSlot = inv.getStackInSlot(k); if (StackUtil.isValid(filterSlot) && areEqualEnough(filterSlot, stack, meta, nbt, mod, oredict)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemAdvanced.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemAdvanced.java index ec8622683..55a49975f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemAdvanced.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemAdvanced.java @@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; import de.ellpeck.actuallyadditions.mod.inventory.ContainerLaserRelayItemWhitelist; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; +import de.ellpeck.actuallyadditions.mod.items.DrillItem; import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; import de.ellpeck.actuallyadditions.mod.util.StackUtil; @@ -104,7 +104,7 @@ public class TileEntityLaserRelayItemAdvanced extends TileEntityLaserRelayItem i if (StackUtil.isValid(slot)) { if (SlotFilter.isFilter(slot)) { ItemStackHandlerAA inv = new ItemStackHandlerAA(ContainerFilter.SLOT_AMOUNT); - ItemDrill.loadSlotsFromNBT(inv, slot); + DrillItem.loadSlotsFromNBT(inv, slot); boolean did = false; for (int j = 0; j < inv.getSlots(); j++) { @@ -116,7 +116,7 @@ public class TileEntityLaserRelayItemAdvanced extends TileEntityLaserRelayItem i } if (did) { - ItemDrill.writeSlotsToNBT(inv, slot); + DrillItem.writeSlotsToNBT(inv, slot); break; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityVerticalDigger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityVerticalDigger.java index bb9e066d3..ed83a9dbf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityVerticalDigger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityVerticalDigger.java @@ -13,7 +13,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; +import de.ellpeck.actuallyadditions.mod.items.DrillItem; import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; @@ -138,7 +138,7 @@ public class TileEntityVerticalDigger extends TileEntityInventoryBase implements Block block = state.getBlock(); ItemStack stack = block.getPickBlock(state, new BlockRayTraceResult(new Vector3d(0, 0, 0), Direction.DOWN, pos, false), this.level, pos, FakePlayerFactory.getMinecraft((ServerWorld) this.level)); if (!block.isAir(this.level.getBlockState(pos), this.level, pos)) { - if (block.getHarvestLevel(this.level.getBlockState(pos)) <= ItemDrill.HARVEST_LEVEL && state.getDestroySpeed(this.level, pos) >= 0F && !(block instanceof IFluidBlock) && this.isMinable(block, stack)) { + if (block.getHarvestLevel(this.level.getBlockState(pos)) <= DrillItem.HARVEST_LEVEL && state.getDestroySpeed(this.level, pos) >= 0F && !(block instanceof IFluidBlock) && this.isMinable(block, stack)) { List drops = Block.getDrops(state, (ServerWorld) this.level, pos, this.level.getBlockEntity(pos)); float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, drops, this.level, pos); diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia.json deleted file mode 100644 index bfd273fcd..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia.json +++ /dev/null @@ -1,728 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "particle": "actuallyadditions:block/crystal_cluster_restonia_block", - "cluster": "actuallyadditions:block/crystal_cluster_restonia_block" - }, - "elements": [ - { - "from": [5, 4, 5], - "to": [10, 19, 10], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 10.5, 7]}, - "faces": { - "north": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 4, 4], "texture": "#cluster", "cullface": "up", "tintindex": 0}, - "down": {"uv": [0, 0, 4, 4], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [3, 4, 7.5], - "to": [5, 16, 9.5], - "rotation": {"angle": -45, "axis": "z", "origin": [3, 4, 7.5]}, - "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [8.94975, 1.53553, 4.5], - "to": [11.94975, 9.53553, 7.5], - "rotation": {"angle": -22.5, "axis": "z", "origin": [9.94975, 7.53553, 6.5]}, - "faces": { - "north": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [5.25, 1, 7], - "to": [7.75, 13, 10], - "rotation": {"angle": 45, "axis": "x", "origin": [6, 6, 8]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 12], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 3, 12], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2.5, 12], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 3, 12], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2.5, 3], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2.5, 3], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [8.25, 1, 8], - "to": [9.75, 13, 10], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 6, 9]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 12], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1.5, 12], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [1, 2.46612, 4.68402], - "to": [4, 12.46612, 7.68402], - "rotation": {"angle": 22.5, "axis": "z", "origin": [2.5, 13.96612, 6.18402]}, - "faces": { - "north": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [4.44938, 3.15224, 8.68402], - "to": [6.44938, 13.15224, 10.68402], - "rotation": {"angle": 45, "axis": "z", "origin": [5.44938, 8.15224, 9.68402]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [6, 1, 5], - "to": [9, 14, 8], - "rotation": {"angle": -22.5, "axis": "x", "origin": [7.5, 5, 6.5]}, - "faces": { - "north": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [4, 0, 4], - "to": [11, 5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 18]}, - "faces": { - "north": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 7, 7], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 7, 7], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [4.5, -1, 3], - "to": [6, 6, 5], - "rotation": {"angle": -45, "axis": "x", "origin": [5, 5, 4]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 7], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1.5, 7], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [7.5, 0.29289, 10.08979], - "to": [10, 7.29289, 12.08979], - "rotation": {"angle": 45, "axis": "x", "origin": [10.25, 4.83095, 10.89845]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 7], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2.5, 7], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2.5, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2.5, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [8.5, 1, 3], - "to": [10, 9, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9, 5, 4]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 8], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 8], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1.5, 8], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 8], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [4.5, 3.21364, 3.32233], - "to": [6, 5.21364, 15.32233], - "rotation": {"angle": -22.5, "axis": "x", "origin": [3.25, 3.83095, 10.89845]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 2], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 12], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 12], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1.5, 12], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1.5, 12], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [3, 1, 5], - "to": [5, 7, 7], - "rotation": {"angle": 22.5, "axis": "z", "origin": [4, 4, 6]}, - "faces": { - "north": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [0, 3, 8], - "to": [7, 5, 10], - "rotation": {"angle": -45, "axis": "z", "origin": [4, 4, 9]}, - "faces": { - "north": {"uv": [0, 0, 2, 7], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [11, 0, 8], - "to": [13, 7, 10], - "rotation": {"angle": -45, "axis": "z", "origin": [12, 4, 9]}, - "faces": { - "north": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [8, 3, 5], - "to": [14, 5, 7], - "rotation": {"angle": 22.5, "axis": "z", "origin": [12, 4, 6]}, - "faces": { - "north": {"uv": [0, 0, 2, 6], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 6], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 6], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 6], "rotation": 90, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [3, 0, 3], - "to": [5, 4, 5], - "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [3.5, 3.5, 1.5], - "to": [4.5, 4.5, 5.5], - "rotation": {"angle": 22.5, "axis": "x", "origin": [3.5, 2, 3.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [1.5, 2.5, 4], - "to": [5.5, 3.5, 5], - "rotation": {"angle": -45, "axis": "z", "origin": [3.5, 3, 4.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [10, 0, 3], - "to": [12, 2, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [12, 0, 4], - "to": [13, 1, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [11, 0, 5], - "to": [12, 1, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [10, 0, 10], - "to": [12, 3, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [10, 1, 9], - "to": [13, 2, 10], - "rotation": {"angle": 22.5, "axis": "z", "origin": [11.5, 1.5, 9.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [10, 1, 6], - "to": [14, 2, 7], - "rotation": {"angle": 22.5, "axis": "z", "origin": [11.5, 1.5, 6.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [3, 0, 10], - "to": [5, 1, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [6, 0, 4], - "to": [7, 5, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [6.5, 3.5, 4.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [8, 3, 1], - "to": [9, 4, 6], - "rotation": {"angle": 45, "axis": "x", "origin": [8.5, 3.5, 2.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 5], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 5], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 5], "rotation": 180, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [10, 3, 3], - "to": [11, 4, 6], - "rotation": {"angle": 45, "axis": "x", "origin": [10.5, 3.5, 2.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 3], "rotation": 180, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [12, 0, 4], - "to": [13, 3, 6], - "rotation": {"angle": -45, "axis": "z", "origin": [12.5, 3.5, 4.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [9, 0, 3], - "to": [10, 3, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 10, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [8, 0, 2], - "to": [11, 1, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 10, 10]}, - "faces": { - "north": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 3, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 3, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [4, 0, 2], - "to": [5, 2, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [5, 0, 3], - "to": [7, 1, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 11]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [7, 1, 2], - "to": [8, 2, 5], - "rotation": {"angle": 45, "axis": "x", "origin": [7.5, 1.5, 3.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 3], "rotation": 180, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [7, 4, 3], - "to": [8, 5, 6], - "rotation": {"angle": 45, "axis": "x", "origin": [7.5, 4.5, 4.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 3], "rotation": 180, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [2, 0, 4], - "to": [4, 1, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 13]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [3, 0, 6], - "to": [4, 4, 8], - "rotation": {"angle": 45, "axis": "z", "origin": [3.5, 2, 7.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [3, 0, 5], - "to": [4, 3, 6.5], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 14]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1.5, 3], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1.5, 3], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1.5], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1.5], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [2.5, 0.5, 10], - "to": [4.5, 1.5, 11], - "rotation": {"angle": -22.5, "axis": "z", "origin": [3.5, 1, 10.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [4, 0, 11], - "to": [5, 4, 12], - "rotation": {"angle": 22.5, "axis": "x", "origin": [4.5, 2.5, 11.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [6, 0, 11], - "to": [7, 3, 12], - "rotation": {"angle": 45, "axis": "x", "origin": [6.5, 2.5, 11.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [9, 2, 7], - "to": [10, 3, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 2.5, 11.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 7], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 7], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 7], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [3, 1, 10], - "to": [4, 5, 11], - "rotation": {"angle": 22.5, "axis": "z", "origin": [3.5, 3, 10.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [3, 0, 9], - "to": [4, 2, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 17]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [2, 0, 8], - "to": [4, 1, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [5, 0, 11], - "to": [7, 2, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 19]}, - "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [7, 0, 11], - "to": [11, 1, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 19]}, - "faces": { - "north": {"uv": [0, 0, 4, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 4, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 4, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 4, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [10, 0, 9], - "to": [13, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 17]}, - "faces": { - "north": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 3, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 3, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [11, 0, 7], - "to": [12, 3, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} - } - }, - { - "from": [8, 1, 11], - "to": [9, 3, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 19]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} - } - }, - { - "from": [7, 1.5, 10.5], - "to": [8, 2.5, 14.5], - "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 2, 11.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, - "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, - "west": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, - "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#cluster", "tintindex": 0}, - "down": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine.json b/src/main/resources/assets/actuallyadditions/models/block/diamatine_crystal_cluster.json similarity index 99% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine.json rename to src/main/resources/assets/actuallyadditions/models/block/diamatine_crystal_cluster.json index f0e5fb3a1..8300084fe 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine.json +++ b/src/main/resources/assets/actuallyadditions/models/block/diamatine_crystal_cluster.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "particle": "actuallyadditions:block/crystal_cluster_diamatine_block", - "cluster": "actuallyadditions:block/crystal_cluster_diamatine_block" + "particle": "actuallyadditions:block/crystal_cluster_diamatine", + "cluster": "actuallyadditions:block/crystal_cluster_diamatine" }, "elements": [ { diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void.json b/src/main/resources/assets/actuallyadditions/models/block/emeradic_crystal_cluster.json similarity index 99% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void.json rename to src/main/resources/assets/actuallyadditions/models/block/emeradic_crystal_cluster.json index 208160c0e..11d0ca011 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void.json +++ b/src/main/resources/assets/actuallyadditions/models/block/emeradic_crystal_cluster.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "particle": "actuallyadditions:block/crystal_cluster_void_block", - "cluster": "actuallyadditions:block/crystal_cluster_void_block" + "particle": "actuallyadditions:block/crystal_cluster_emeradic", + "cluster": "actuallyadditions:block/crystal_cluster_emeradic" }, "elements": [ { diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis.json b/src/main/resources/assets/actuallyadditions/models/block/enori_crystal_cluster.json similarity index 99% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis.json rename to src/main/resources/assets/actuallyadditions/models/block/enori_crystal_cluster.json index 506f8f5d5..4330e8385 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis.json +++ b/src/main/resources/assets/actuallyadditions/models/block/enori_crystal_cluster.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "particle": "actuallyadditions:block/crystal_cluster_palis_block", - "cluster": "actuallyadditions:block/crystal_cluster_palis_block" + "particle": "actuallyadditions:block/crystal_cluster_enori", + "cluster": "actuallyadditions:block/crystal_cluster_enori" }, "elements": [ { diff --git a/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay.json rename to src/main/resources/assets/actuallyadditions/models/block/laser_relay.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced.json rename to src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme.json rename to src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay.json rename to src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/item_laser_relay.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/item_laser_relay.json rename to src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay.json rename to src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/lava_factory_case.json b/src/main/resources/assets/actuallyadditions/models/block/lava_factory_casing.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/lava_factory_case.json rename to src/main/resources/assets/actuallyadditions/models/block/lava_factory_casing.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/directional_breaker.json b/src/main/resources/assets/actuallyadditions/models/block/long_range_breaker.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/directional_breaker.json rename to src/main/resources/assets/actuallyadditions/models/block/long_range_breaker.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori.json b/src/main/resources/assets/actuallyadditions/models/block/palis_crystal_cluster.json similarity index 99% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori.json rename to src/main/resources/assets/actuallyadditions/models/block/palis_crystal_cluster.json index 9184a16ee..6a014debc 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori.json +++ b/src/main/resources/assets/actuallyadditions/models/block/palis_crystal_cluster.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "particle": "actuallyadditions:block/crystal_cluster_enori_block", - "cluster": "actuallyadditions:block/crystal_cluster_enori_block" + "particle": "actuallyadditions:block/crystal_cluster_palis", + "cluster": "actuallyadditions:block/crystal_cluster_palis" }, "elements": [ { diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic.json b/src/main/resources/assets/actuallyadditions/models/block/restonia_crystal_cluster.json similarity index 99% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic.json rename to src/main/resources/assets/actuallyadditions/models/block/restonia_crystal_cluster.json index 774b404b3..7c8ad24fc 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic.json +++ b/src/main/resources/assets/actuallyadditions/models/block/restonia_crystal_cluster.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "particle": "actuallyadditions:block/crystal_cluster_emeradic_block", - "cluster": "actuallyadditions:block/crystal_cluster_emeradic_block" + "particle": "actuallyadditions:block/crystal_cluster_restonia", + "cluster": "actuallyadditions:block/crystal_cluster_restonia" }, "elements": [ { diff --git a/src/main/resources/assets/actuallyadditions/models/block/miner.json b/src/main/resources/assets/actuallyadditions/models/block/vertical_digger.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/miner.json rename to src/main/resources/assets/actuallyadditions/models/block/vertical_digger.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/void_crystal_cluster.json b/src/main/resources/assets/actuallyadditions/models/block/void_crystal_cluster.json new file mode 100644 index 000000000..714d62f01 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/void_crystal_cluster.json @@ -0,0 +1,728 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/crystal_cluster_void", + "cluster": "actuallyadditions:block/crystal_cluster_void" + }, + "elements": [ + { + "from": [5, 4, 5], + "to": [10, 19, 10], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 10.5, 7]}, + "faces": { + "north": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 16], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 4, 4], "texture": "#cluster", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 4, 4], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [3, 4, 7.5], + "to": [5, 16, 9.5], + "rotation": {"angle": -45, "axis": "z", "origin": [3, 4, 7.5]}, + "faces": { + "north": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [8.94975, 1.53553, 4.5], + "to": [11.94975, 9.53553, 7.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [9.94975, 7.53553, 6.5]}, + "faces": { + "north": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 8], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [5.25, 1, 7], + "to": [7.75, 13, 10], + "rotation": {"angle": 45, "axis": "x", "origin": [6, 6, 8]}, + "faces": { + "north": {"uv": [0, 0, 2.5, 12], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 12], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2.5, 12], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 12], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2.5, 3], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2.5, 3], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [8.25, 1, 8], + "to": [9.75, 13, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 6, 9]}, + "faces": { + "north": {"uv": [0, 0, 1.5, 12], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1.5, 12], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [1, 2.46612, 4.68402], + "to": [4, 12.46612, 7.68402], + "rotation": {"angle": 22.5, "axis": "z", "origin": [2.5, 13.96612, 6.18402]}, + "faces": { + "north": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 10], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [4.44938, 3.15224, 8.68402], + "to": [6.44938, 13.15224, 10.68402], + "rotation": {"angle": 45, "axis": "z", "origin": [5.44938, 8.15224, 9.68402]}, + "faces": { + "north": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [6, 1, 5], + "to": [9, 14, 8], + "rotation": {"angle": -22.5, "axis": "x", "origin": [7.5, 5, 6.5]}, + "faces": { + "north": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 13], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [4, 0, 4], + "to": [11, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 18]}, + "faces": { + "north": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 7, 5], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 7, 7], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 7, 7], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [4.5, -1, 3], + "to": [6, 6, 5], + "rotation": {"angle": -45, "axis": "x", "origin": [5, 5, 4]}, + "faces": { + "north": {"uv": [0, 0, 1.5, 7], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1.5, 7], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [7.5, 0.29289, 10.08979], + "to": [10, 7.29289, 12.08979], + "rotation": {"angle": 45, "axis": "x", "origin": [10.25, 4.83095, 10.89845]}, + "faces": { + "north": {"uv": [0, 0, 2.5, 7], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2.5, 7], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2.5, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2.5, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [8.5, 1, 3], + "to": [10, 9, 5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9, 5, 4]}, + "faces": { + "north": {"uv": [0, 0, 1.5, 8], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1.5, 8], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [4.5, 3.21364, 3.32233], + "to": [6, 5.21364, 15.32233], + "rotation": {"angle": -22.5, "axis": "x", "origin": [3.25, 3.83095, 10.89845]}, + "faces": { + "north": {"uv": [0, 0, 1.5, 2], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1.5, 2], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1.5, 12], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1.5, 12], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [3, 1, 5], + "to": [5, 7, 7], + "rotation": {"angle": 22.5, "axis": "z", "origin": [4, 4, 6]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 6], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [0, 3, 8], + "to": [7, 5, 10], + "rotation": {"angle": -45, "axis": "z", "origin": [4, 4, 9]}, + "faces": { + "north": {"uv": [0, 0, 2, 7], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [11, 0, 8], + "to": [13, 7, 10], + "rotation": {"angle": -45, "axis": "z", "origin": [12, 4, 9]}, + "faces": { + "north": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 7], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [8, 3, 5], + "to": [14, 5, 7], + "rotation": {"angle": 22.5, "axis": "z", "origin": [12, 4, 6]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 6], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 6], "rotation": 90, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [3, 0, 3], + "to": [5, 4, 5], + "faces": { + "north": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [3.5, 3.5, 1.5], + "to": [4.5, 4.5, 5.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3.5, 2, 3.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [1.5, 2.5, 4], + "to": [5.5, 3.5, 5], + "rotation": {"angle": -45, "axis": "z", "origin": [3.5, 3, 4.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [10, 0, 3], + "to": [12, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [12, 0, 4], + "to": [13, 1, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [11, 0, 5], + "to": [12, 1, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [10, 0, 10], + "to": [12, 3, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, + "faces": { + "north": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [10, 1, 9], + "to": [13, 2, 10], + "rotation": {"angle": 22.5, "axis": "z", "origin": [11.5, 1.5, 9.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [10, 1, 6], + "to": [14, 2, 7], + "rotation": {"angle": 22.5, "axis": "z", "origin": [11.5, 1.5, 6.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [3, 0, 10], + "to": [5, 1, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [6, 0, 4], + "to": [7, 5, 5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [6.5, 3.5, 4.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [8, 3, 1], + "to": [9, 4, 6], + "rotation": {"angle": 45, "axis": "x", "origin": [8.5, 3.5, 2.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 5], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 5], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 5], "rotation": 180, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [10, 3, 3], + "to": [11, 4, 6], + "rotation": {"angle": 45, "axis": "x", "origin": [10.5, 3.5, 2.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 3], "rotation": 180, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [12, 0, 4], + "to": [13, 3, 6], + "rotation": {"angle": -45, "axis": "z", "origin": [12.5, 3.5, 4.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [9, 0, 3], + "to": [10, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 10, 11]}, + "faces": { + "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [8, 0, 2], + "to": [11, 1, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 10, 10]}, + "faces": { + "north": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [4, 0, 2], + "to": [5, 2, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 10]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [5, 0, 3], + "to": [7, 1, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 11]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [7, 1, 2], + "to": [8, 2, 5], + "rotation": {"angle": 45, "axis": "x", "origin": [7.5, 1.5, 3.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 3], "rotation": 180, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [7, 4, 3], + "to": [8, 5, 6], + "rotation": {"angle": 45, "axis": "x", "origin": [7.5, 4.5, 4.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 3], "rotation": 180, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [2, 0, 4], + "to": [4, 1, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [3, 0, 6], + "to": [4, 4, 8], + "rotation": {"angle": 45, "axis": "z", "origin": [3.5, 2, 7.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 4], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [3, 0, 5], + "to": [4, 3, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 14]}, + "faces": { + "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1.5, 3], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1.5, 3], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1.5], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1.5], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [2.5, 0.5, 10], + "to": [4.5, 1.5, 11], + "rotation": {"angle": -22.5, "axis": "z", "origin": [3.5, 1, 10.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [4, 0, 11], + "to": [5, 4, 12], + "rotation": {"angle": 22.5, "axis": "x", "origin": [4.5, 2.5, 11.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [6, 0, 11], + "to": [7, 3, 12], + "rotation": {"angle": 45, "axis": "x", "origin": [6.5, 2.5, 11.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [9, 2, 7], + "to": [10, 3, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 2.5, 11.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 7], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 7], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 7], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 7], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [3, 1, 10], + "to": [4, 5, 11], + "rotation": {"angle": 22.5, "axis": "z", "origin": [3.5, 3, 10.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [3, 0, 9], + "to": [4, 2, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 17]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [2, 0, 8], + "to": [4, 1, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [5, 0, 11], + "to": [7, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 19]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [7, 0, 11], + "to": [11, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 19]}, + "faces": { + "north": {"uv": [0, 0, 4, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 4, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 4, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 4, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [10, 0, 9], + "to": [13, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 17]}, + "faces": { + "north": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [11, 0, 7], + "to": [12, 3, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 16]}, + "faces": { + "north": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 2], "texture": "#cluster", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [8, 1, 11], + "to": [9, 3, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 19]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 2], "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0} + } + }, + { + "from": [7, 1.5, 10.5], + "to": [8, 2.5, 14.5], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 2, 11.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#cluster", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#cluster", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 4], "texture": "#cluster", "tintindex": 0} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth.png b/src/main/resources/assets/actuallyadditions/textures/block/smooth_black_quartz.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth.png rename to src/main/resources/assets/actuallyadditions/textures/block/smooth_black_quartz.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_block_placing_augment.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_block_placing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_block_placing_augment.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_block_placing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_ii.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_five_by_five.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_ii.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_five_by_five.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_i.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_fortune.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_i.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_fortune.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_ii.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_fortune_ii.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_ii.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_fortune_ii.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_silk_touch_augment.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_silk_touch.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_silk_touch_augment.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_silk_touch.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_i.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_speed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_i.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_speed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_ii.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_speed_ii.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_ii.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_speed_ii.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_iii.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_speed_iii.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_iii.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_speed_iii.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_i.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_three_by_three.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_i.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_upgrade_three_by_three.png