From dd2d462ad31ab121ae935ddf88c7117ef948cafd Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Mon, 7 Dec 2020 15:06:54 +0000 Subject: [PATCH] Should have merged all the new blocks properly --- .../common/ActuallyAdditions.java | 10 +- .../common/blocks/ActuallyBlocks.java | 30 +- .../blocks/HorizontallyDirectionalBlock.java | 32 + .../blocks/building/CrystalClusterBlock.java | 30 + .../functional/AtomicReconstructorBlock.java | 126 +++ .../blocks/functional/BatteryBoxBlock.java | 30 + .../blocks/functional/BioReactorBlock.java | 141 +++- .../blocks/functional/BreakerBlock.java | 110 ++- .../blocks/functional/CanolaPressBlock.java | 30 + .../blocks/functional/CoalGeneratorBlock.java | 117 ++- .../blocks/functional/CoffeeMachineBlock.java | 121 ++- .../functional/DirectionalBreakerBlock.java | 117 ++- .../blocks/functional/DisplayStandBlock.java | 26 + .../blocks/functional/DropperBlock.java | 116 +++ .../blocks/functional/EmpowererBlock.java | 28 + .../blocks/functional/EnergizerBlock.java | 34 + .../common/blocks/functional/FarmerBlock.java | 121 ++- .../common/blocks/functional/FeederBlock.java | 32 + .../functional/FermentingBarrelBlock.java | 35 + .../blocks/functional/FireworkBoxBlock.java | 34 + .../functional/FluidCollectorBlock.java | 117 ++- .../blocks/functional/FurnaceDoubleBlock.java | 97 ++- .../blocks/functional/FurnaceSingleBlock.java | 101 +++ .../functional/GreenhouseGlassBlock.java | 28 +- .../blocks/functional/GrinderBlock.java | 133 +++- .../blocks/functional/HeatCollectorBlock.java | 40 + .../blocks/functional/ItemViewerBlock.java | 26 + .../functional/ItemViewerHoppingBlock.java | 26 + .../blocks/functional/LampPowererBlock.java | 87 ++- .../blocks/functional/LaserRelayBlock.java | 34 + .../LavaFactoryControllerBlock.java | 105 ++- .../blocks/functional/LeafGeneratorBlock.java | 137 +++- .../common/blocks/functional/MinerBlock.java | 117 ++- .../blocks/functional/OilGeneratorBlock.java | 150 +++- .../blocks/functional/PhantomBlock.java | 12 +- .../functional/PhantomBoosterBlock.java | 40 + .../functional/PlayerInterfaceBlock.java | 26 + .../functional/RangedCollectorBlock.java | 36 + .../functional/ShockSuppressorBlock.java | 31 + .../blocks/functional/XPSolidifierBlock.java | 26 + .../common/items/ActuallyItems.java | 1 + .../data/GeneratorBlockStates.java | 228 +++--- .../data/GeneratorBlockTags.java | 4 +- .../data/GeneratorLanguage.java | 20 +- .../actuallyadditions/data/GeneratorLoot.java | 14 +- .../advanced_item_laser_relay_block.json | 502 ++++++++++++ .../block/atomic_reconstructor_block.json | 359 +++++++++ .../models/block/battery_box_block.json | 336 ++++++++ .../models/block/bio_reactor_block.json | 670 ++++++++++++++++ .../models/block/black_quartz_block.json | 7 + .../block/black_quartz_chiseled_block.json | 7 + .../block/black_quartz_pillar_block.json | 7 + .../block/black_quartz_smooth_block.json | 6 + .../models/block/breaker_block.json | 265 +++++++ .../models/block/canola_press_block.json | 339 ++++++++ .../models/block/charcoal_block.json | 6 + .../models/block/coal_generator_block.json | 444 +++++++++++ .../models/block/coffee_machine_block.json | 482 ++++++++++++ .../models/block/crusher_block.json | 605 +++++++++++++++ .../models/block/crusher_double_block.json | 616 +++++++++++++++ .../crystal_cluster_diamatine_block.json | 676 ++++++++++++++++ .../block/crystal_cluster_emeradic_block.json | 728 ++++++++++++++++++ .../block/crystal_cluster_enori_block.json | 728 ++++++++++++++++++ .../block/crystal_cluster_palis_block.json | 728 ++++++++++++++++++ .../block/crystal_cluster_restonia_block.json | 728 ++++++++++++++++++ .../block/crystal_cluster_void_block.json | 728 ++++++++++++++++++ .../models/block/crystal_diamatine_block.json | 6 + .../crystal_diamatine_empowered_block.json | 6 + .../models/block/crystal_emeradic_block.json | 6 + .../crystal_emeradic_empowered_block.json | 6 + .../models/block/crystal_enori_block.json | 6 + .../block/crystal_enori_empowered_block.json | 6 + .../models/block/crystal_palis_block.json | 6 + .../block/crystal_palis_empowered_block.json | 6 + .../models/block/crystal_restonia_block.json | 6 + .../crystal_restonia_empowered_block.json | 6 + .../models/block/crystal_void_block.json | 6 + .../block/crystal_void_empowered_block.json | 6 + .../block/directional_breaker_block.json | 289 +++++++ .../models/block/display_stand_block.json | 286 +++++++ .../block/double_powered_furnace_block.json | 368 +++++++++ .../models/block/dropper_block.json | 265 +++++++ .../models/block/empowerer_block.json | 347 +++++++++ .../models/block/ender_casing_block.json | 6 + .../models/block/enderpearl_block.json | 6 + .../models/block/energizer_block.json | 432 +++++++++++ .../energy_laser_relay_advanced_block.json | 502 ++++++++++++ .../block/energy_laser_relay_block.json | 502 ++++++++++++ .../energy_laser_relay_extreme_block.json | 502 ++++++++++++ .../models/block/enervator_block.json | 432 +++++++++++ .../models/block/farmer_block.json | 539 +++++++++++++ .../models/block/feeder_block.json | 386 ++++++++++ .../models/block/fermenting_barrel_block.json | 463 +++++++++++ .../models/block/firework_box_block.json | 433 +++++++++++ .../models/block/fluid_collector_block.json | 289 +++++++ .../models/block/fluid_placer_block.json | 289 +++++++ .../block/fluids_laser_relay_block.json | 502 ++++++++++++ .../models/block/green_block.json | 6 + .../models/block/greenhouse_glass_block.json | 207 +++++ .../models/block/heat_collector_block.json | 589 ++++++++++++++ .../block/hopping_item_interface_block.json | 221 ++++++ .../models/block/iron_casing_block.json | 6 + .../models/block/item_interface_block.json | 278 +++++++ .../models/block/item_laser_relay_block.json | 502 ++++++++++++ .../models/block/lamp_black_block.json | 6 + .../models/block/lamp_blue_block.json | 6 + .../models/block/lamp_brown_block.json | 6 + .../models/block/lamp_controller_block.json | 317 ++++++++ .../models/block/lamp_cyan_block.json | 6 + .../models/block/lamp_gray_block.json | 6 + .../models/block/lamp_green_block.json | 6 + .../models/block/lamp_light_blue_block.json | 6 + .../models/block/lamp_light_gray_block.json | 6 + .../models/block/lamp_lime_block.json | 6 + .../models/block/lamp_magenta_block.json | 6 + .../models/block/lamp_orange_block.json | 6 + .../models/block/lamp_pink_block.json | 6 + .../models/block/lamp_purple_block.json | 6 + .../models/block/lamp_red_block.json | 6 + .../models/block/lamp_white_block.json | 6 + .../models/block/lamp_yellow_block.json | 6 + .../models/block/lava_factory_case_block.json | 277 +++++++ .../block/lava_factory_controller_block.json | 436 +++++++++++ .../models/block/leaf_generator_block.json | 601 +++++++++++++++ .../models/block/miner_block.json | 513 ++++++++++++ .../models/block/oil_generator_block.json | 626 +++++++++++++++ .../models/block/ore_black_quartz_block.json | 6 + .../models/block/phantom_booster_block.json | 595 ++++++++++++++ .../models/block/phantom_breaker_block.json | 648 ++++++++++++++++ .../block/phantom_energyface_block.json | 352 +++++++++ .../models/block/phantom_liquiface_block.json | 352 +++++++++ .../models/block/phantom_placer_block.json | 648 ++++++++++++++++ .../block/phantom_redstoneface_block.json | 352 +++++++++ .../models/block/phantomface_block.json | 352 +++++++++ .../models/block/placer_block.json | 265 +++++++ .../models/block/player_interface_block.json | 278 +++++++ .../models/block/powered_furnace_block.json | 356 +++++++++ .../block/quartz_pillar_horizontal.json | 7 + .../models/block/ranged_collector_block.json | 486 ++++++++++++ .../models/block/shock_suppressor_block.json | 381 +++++++++ .../models/block/white_block.json | 6 + .../models/block/wood_casing_block.json | 6 + .../models/block/xp_solidifier_block.json | 278 +++++++ .../textures/block/advanced_esd_side.png | Bin 0 -> 3555 bytes .../textures/block/advanced_esd_top.png | Bin 0 -> 3511 bytes .../block/animal_feeder_side_chicken.png | Bin 0 -> 3553 bytes .../textures/block/animal_feeder_side_cow.png | Bin 0 -> 3590 bytes .../textures/block/animal_feeder_side_pig.png | Bin 0 -> 3571 bytes .../block/animal_feeder_side_sheep.png | Bin 0 -> 3601 bytes .../block/atomic_reconstructor_front.png | Bin 0 -> 2194 bytes .../block/atomic_reconstructor_side.png | Bin 0 -> 2199 bytes .../textures/block/base_texture.png | Bin 0 -> 3316 bytes .../textures/block/base_texture_arrow.png | Bin 0 -> 3433 bytes .../textures/block/base_texture_back.png | Bin 0 -> 3463 bytes .../textures/block/base_texture_side.png | Bin 0 -> 3432 bytes .../textures/block/battery_box_side.png | Bin 0 -> 3569 bytes .../textures/block/battery_box_top.png | Bin 0 -> 3663 bytes .../textures/block/bioreactor_front.png | Bin 0 -> 3512 bytes .../block/bioreactor_glow_animated.png | Bin 0 -> 2065 bytes .../block/bioreactor_glow_animated.png.mcmeta | 7 + .../textures/block/bioreactor_side.png | Bin 0 -> 3609 bytes .../textures/block/bioreactor_side_glass.png | Bin 0 -> 3308 bytes .../textures/block/black_quartz_block.png | Bin 431 -> 3289 bytes .../textures/block/black_quartz_block_top.png | Bin 0 -> 3289 bytes .../block/black_quartz_brick_block.png | Bin 0 -> 3305 bytes .../block/black_quartz_chiseled_block.png | Bin 432 -> 3331 bytes .../block/black_quartz_chiseled_block_top.png | Bin 0 -> 3352 bytes .../block/black_quartz_pillar_block.png | Bin 424 -> 3297 bytes .../block/black_quartz_pillar_block_top.png | Bin 0 -> 3355 bytes .../block/black_quartz_smooth_block.png | Bin 0 -> 3265 bytes .../textures/block/block_black_lotus.png | Bin 0 -> 3478 bytes .../textures/block/block_breaker_front.png | Bin 0 -> 3582 bytes .../textures/block/block_breaker_side.png | Bin 0 -> 3530 bytes .../block/block_breaker_side_extended.png | Bin 0 -> 3589 bytes .../textures/block/block_canola_stage_1.png | Bin 0 -> 3257 bytes .../textures/block/block_canola_stage_2.png | Bin 0 -> 3368 bytes .../textures/block/block_canola_stage_3.png | Bin 0 -> 3502 bytes .../textures/block/block_canola_stage_4.png | Bin 0 -> 3587 bytes .../textures/block/block_coffee_stage_1.png | Bin 0 -> 3227 bytes .../textures/block/block_coffee_stage_2.png | Bin 0 -> 3366 bytes .../textures/block/block_coffee_stage_3.png | Bin 0 -> 3463 bytes .../textures/block/block_coffee_stage_4.png | Bin 0 -> 3592 bytes .../textures/block/block_coffee_stage_5.png | Bin 0 -> 3759 bytes .../textures/block/block_coffee_stage_6.png | Bin 0 -> 3788 bytes .../textures/block/block_dropper_front.png | Bin 0 -> 3579 bytes .../textures/block/block_dropper_side.png | Bin 0 -> 3530 bytes .../textures/block/block_flax_stage_1.png | Bin 0 -> 3246 bytes .../textures/block/block_flax_stage_2.png | Bin 0 -> 3261 bytes .../textures/block/block_flax_stage_3.png | Bin 0 -> 3390 bytes .../textures/block/block_flax_stage_4.png | Bin 0 -> 3487 bytes .../textures/block/block_flax_stage_5.png | Bin 0 -> 3615 bytes .../textures/block/block_flax_stage_6.png | Bin 0 -> 3673 bytes .../textures/block/block_greenhouse_glass.png | Bin 0 -> 3365 bytes .../textures/block/block_placer_front.png | Bin 0 -> 3574 bytes .../textures/block/block_placer_side.png | Bin 0 -> 3527 bytes .../textures/block/block_rice_stage_1.png | Bin 0 -> 3250 bytes .../textures/block/block_rice_stage_2.png | Bin 0 -> 3366 bytes .../textures/block/block_rice_stage_3.png | Bin 0 -> 3391 bytes .../textures/block/block_rice_stage_4.png | Bin 0 -> 3462 bytes .../textures/block/block_rice_stage_5.png | Bin 0 -> 3557 bytes .../textures/block/block_rice_stage_6.png | Bin 0 -> 3602 bytes .../textures/block/canola_press.png | Bin 0 -> 3700 bytes .../textures/block/canola_top.png | Bin 0 -> 3696 bytes .../textures/block/charcoal_block.png | Bin 484 -> 3529 bytes .../block/coal_generator_fire_animated.png | Bin 0 -> 2414 bytes .../coal_generator_fire_animated.png.mcmeta | 11 + .../textures/block/coal_generator_front.png | Bin 0 -> 2206 bytes .../textures/block/crate_base.png | Bin 0 -> 3565 bytes .../textures/block/crusher_front.png | Bin 0 -> 3621 bytes .../textures/block/crusher_front_double.png | Bin 0 -> 3612 bytes .../textures/block/crusher_side.png | Bin 0 -> 3479 bytes .../block/crystal_cluster_diamatine_block.png | Bin 3071 -> 18977 bytes ...crystal_cluster_diamatine_block.png.mcmeta | 6 + .../block/crystal_cluster_emeradic_block.png | Bin 3071 -> 19992 bytes .../crystal_cluster_emeradic_block.png.mcmeta | 6 + .../block/crystal_cluster_enori_block.png | Bin 3071 -> 13101 bytes .../crystal_cluster_enori_block.png.mcmeta | 6 + .../block/crystal_cluster_palis_block.png | Bin 3071 -> 19374 bytes .../crystal_cluster_palis_block.png.mcmeta | 6 + .../block/crystal_cluster_restonia_block.png | Bin 3071 -> 17053 bytes .../crystal_cluster_restonia_block.png.mcmeta | 6 + .../block/crystal_cluster_void_block.png | Bin 3071 -> 13138 bytes .../crystal_cluster_void_block.png.mcmeta | 6 + .../block/crystal_diamatine_block.png | Bin 809 -> 3725 bytes .../crystal_diamatine_empowered_block.png | Bin 1108 -> 3329 bytes ...ystal_diamatine_empowered_block.png.mcmeta | 2 +- .../textures/block/crystal_emeradic_block.png | Bin 864 -> 3753 bytes .../crystal_emeradic_empowered_block.png | Bin 1218 -> 3289 bytes ...rystal_emeradic_empowered_block.png.mcmeta | 2 +- .../textures/block/crystal_enori_block.png | Bin 384 -> 3660 bytes .../block/crystal_enori_empowered_block.png | Bin 470 -> 3386 bytes .../crystal_enori_empowered_block.png.mcmeta | 2 +- .../textures/block/crystal_palis_block.png | Bin 781 -> 3702 bytes .../block/crystal_palis_empowered_block.png | Bin 1102 -> 3700 bytes .../crystal_palis_empowered_block.png.mcmeta | 2 +- .../textures/block/crystal_restonia_block.png | Bin 777 -> 3617 bytes .../crystal_restonia_empowered_block.png | Bin 1119 -> 3372 bytes ...rystal_restonia_empowered_block.png.mcmeta | 2 +- .../textures/block/crystal_void_block.png | Bin 251 -> 3556 bytes .../block/crystal_void_empowered_block.png | Bin 268 -> 3374 bytes .../crystal_void_empowered_block.png.mcmeta | 2 +- .../textures/block/display_stand_side.png | Bin 0 -> 2114 bytes .../textures/block/display_stand_top.png | Bin 0 -> 2262 bytes .../double_crusher_rotation_animation.png | Bin 0 -> 2447 bytes ...uble_crusher_rotation_animation.png.mcmeta | 18 + .../textures/block/double_furnace_front.png | Bin 0 -> 3510 bytes .../textures/block/empowerer_side.png | Bin 0 -> 2119 bytes .../textures/block/empowerer_top.png | Bin 0 -> 2235 bytes .../textures/block/ender_casing_block.png | Bin 749 -> 3714 bytes .../textures/block/enderpearl_block.png | Bin 830 -> 3744 bytes .../textures/block/energizer_side.png | Bin 0 -> 3625 bytes .../textures/block/energizer_top.png | Bin 0 -> 3559 bytes .../textures/block/enervator_side.png | Bin 0 -> 3626 bytes .../textures/block/enervator_top.png | Bin 0 -> 3565 bytes .../textures/block/esd_side.png | Bin 0 -> 3582 bytes .../textures/block/esd_top.png | Bin 0 -> 3546 bytes .../textures/block/exp_solidifier_side.png | Bin 0 -> 3709 bytes .../textures/block/exp_solidifier_top.png | Bin 0 -> 3616 bytes .../textures/block/farmer_front.png | Bin 0 -> 4100 bytes .../textures/block/farmer_front.png.mcmeta | 11 + .../textures/block/farmer_glow_animated.png | Bin 0 -> 2532 bytes .../block/farmer_glow_animated.png.mcmeta | 11 + .../textures/block/farmer_side.png | Bin 0 -> 3518 bytes .../textures/block/firework_box_side.png | Bin 0 -> 3647 bytes .../textures/block/firework_box_top.png | Bin 0 -> 3679 bytes .../textures/block/fishing_net.png | Bin 0 -> 3440 bytes .../textures/block/fluid_collector_front.png | Bin 0 -> 3589 bytes .../textures/block/fluid_collector_side.png | Bin 0 -> 3517 bytes .../textures/block/fluid_placer_front.png | Bin 0 -> 3582 bytes .../textures/block/fluid_placer_side.png | Bin 0 -> 3515 bytes .../textures/block/generator_internal_off.png | Bin 0 -> 3216 bytes .../textures/block/generator_side.png | Bin 0 -> 2111 bytes .../textures/block/generator_top.png | Bin 0 -> 2159 bytes .../textures/block/green_block.png | Bin 593 -> 3302 bytes .../block/heat_collector_glow_animated.png | Bin 0 -> 2249 bytes .../heat_collector_glow_animated.png.mcmeta | 7 + .../textures/block/heat_collector_side.png | Bin 0 -> 3630 bytes .../textures/block/heat_collector_top.png | Bin 0 -> 3571 bytes .../textures/block/iron_casing_block.png | Bin 239 -> 3579 bytes .../block/item_interface_hopper_side.png | Bin 0 -> 3510 bytes .../block/item_interface_hopper_top.png | Bin 0 -> 3554 bytes .../textures/block/item_interface_side.png | Bin 0 -> 3596 bytes .../textures/block/item_interface_top.png | Bin 0 -> 3577 bytes .../textures/block/item_repairer_side_a.png | Bin 0 -> 3565 bytes .../textures/block/item_repairer_side_b.png | Bin 0 -> 3548 bytes .../textures/block/item_repairer_top.png | Bin 0 -> 3678 bytes .../textures/block/lamp_black_block.png | Bin 306 -> 3375 bytes .../textures/block/lamp_black_on_block.png | Bin 361 -> 3419 bytes .../textures/block/lamp_blue_block.png | Bin 533 -> 3396 bytes .../textures/block/lamp_blue_on_block.png | Bin 623 -> 3449 bytes .../textures/block/lamp_brown_block.png | Bin 445 -> 3396 bytes .../textures/block/lamp_brown_on_block.png | Bin 481 -> 3479 bytes .../textures/block/lamp_controller_front.png | Bin 0 -> 3634 bytes .../textures/block/lamp_controller_side.png | Bin 0 -> 3585 bytes .../textures/block/lamp_cyan_block.png | Bin 378 -> 3417 bytes .../textures/block/lamp_cyan_on_block.png | Bin 493 -> 3460 bytes .../textures/block/lamp_gray_block.png | Bin 372 -> 3393 bytes .../textures/block/lamp_gray_on_block.png | Bin 459 -> 3476 bytes .../textures/block/lamp_green_block.png | Bin 422 -> 3383 bytes .../textures/block/lamp_green_on_block.png | Bin 464 -> 3487 bytes .../textures/block/lamp_light_blue_block.png | Bin 436 -> 3406 bytes .../block/lamp_light_blue_on_block.png | Bin 492 -> 3428 bytes .../textures/block/lamp_light_gray_block.png | Bin 404 -> 3369 bytes .../block/lamp_light_gray_on_block.png | Bin 507 -> 3414 bytes .../textures/block/lamp_lime_block.png | Bin 558 -> 3416 bytes .../textures/block/lamp_lime_on_block.png | Bin 635 -> 3428 bytes .../textures/block/lamp_magenta_block.png | Bin 518 -> 3404 bytes .../textures/block/lamp_magenta_on_block.png | Bin 606 -> 3413 bytes .../textures/block/lamp_orange_block.png | Bin 470 -> 3403 bytes .../textures/block/lamp_orange_on_block.png | Bin 514 -> 3408 bytes .../textures/block/lamp_pink_block.png | Bin 471 -> 3401 bytes .../textures/block/lamp_pink_on_block.png | Bin 521 -> 3391 bytes .../textures/block/lamp_purple_block.png | Bin 489 -> 3415 bytes .../textures/block/lamp_purple_on_block.png | Bin 600 -> 3427 bytes .../textures/block/lamp_red_block.png | Bin 380 -> 3377 bytes .../textures/block/lamp_red_on_block.png | Bin 453 -> 3385 bytes .../textures/block/lamp_white_block.png | Bin 439 -> 3339 bytes .../textures/block/lamp_white_on_block.png | Bin 569 -> 3349 bytes .../textures/block/lamp_yellow_block.png | Bin 527 -> 3390 bytes .../textures/block/lamp_yellow_on_block.png | Bin 595 -> 3399 bytes .../textures/block/leaf_gen_animated.png | Bin 0 -> 3280 bytes .../block/leaf_gen_animated.png.mcmeta | 7 + .../textures/block/misc_barrel_side.png | Bin 0 -> 3520 bytes .../textures/block/misc_barrel_top.png | Bin 0 -> 3690 bytes .../textures/block/misc_wood.png | Bin 0 -> 3516 bytes .../textures/block/models/coffee_machine.png | Bin 0 -> 3063 bytes .../textures/block/models/laser_relay.png | Bin 0 -> 2381 bytes .../textures/block/models/model_compost.png | Bin 0 -> 6388 bytes .../block/models/model_phantom_booster.png | Bin 0 -> 3662 bytes .../textures/block/oil_generator_front.png | Bin 0 -> 3631 bytes .../block/oil_generator_oil_animated.png | Bin 0 -> 3599 bytes .../oil_generator_oil_animated.png.mcmeta | 11 + .../textures/block/ore_black_quartz_block.png | Bin 591 -> 3662 bytes .../textures/block/phantomface_breaker.png | Bin 0 -> 3760 bytes .../textures/block/phantomface_energy.png | Bin 0 -> 3735 bytes .../textures/block/phantomface_liquid.png | Bin 0 -> 3738 bytes .../textures/block/phantomface_placer.png | Bin 0 -> 3753 bytes .../textures/block/phantomface_redstone.png | Bin 0 -> 3714 bytes .../textures/block/phantomface_standard.png | Bin 0 -> 3753 bytes .../textures/block/player_interface_side.png | Bin 0 -> 3626 bytes .../textures/block/player_interface_top.png | Bin 0 -> 3608 bytes .../textures/block/ranged_collector_glow.png | Bin 0 -> 3871 bytes .../block/ranged_collector_glow.png.mcmeta | 7 + .../textures/block/shock_absorber_springs.png | Bin 0 -> 3499 bytes .../single_crusher_rotation_animation.png | Bin 0 -> 2306 bytes ...ngle_crusher_rotation_animation.png.mcmeta | 18 + .../textures/block/single_furnace_front.png | Bin 0 -> 3493 bytes .../textures/block/solar_panel_side.png | Bin 0 -> 2235 bytes .../textures/block/solar_panel_top.png | Bin 0 -> 2243 bytes .../textures/block/treasure_chest_side.png | Bin 0 -> 3737 bytes .../textures/block/treasure_chest_top.png | Bin 0 -> 3705 bytes .../vertical_digger_rotation_animation.png | Bin 0 -> 2242 bytes ...tical_digger_rotation_animation.png.mcmeta | 7 + .../textures/block/vertical_digger_side_a.png | Bin 0 -> 3577 bytes .../textures/block/vertical_digger_side_b.png | Bin 0 -> 3670 bytes .../textures/block/white_block.png | Bin 409 -> 3276 bytes .../textures/block/wood_casing_block.png | Bin 716 -> 3590 bytes .../item/advanced_ring_of_fire_resistance.png | Bin 3784 -> 3989 bytes .../textures/item/advanced_ring_of_haste.png | Bin 3784 -> 3970 bytes .../item/advanced_ring_of_invisibility.png | Bin 3784 -> 3992 bytes .../item/advanced_ring_of_jump_boost.png | Bin 3784 -> 4018 bytes .../item/advanced_ring_of_night_vision.png | Bin 3784 -> 4008 bytes .../item/advanced_ring_of_regeneration.png | Bin 3784 -> 4007 bytes .../item/advanced_ring_of_resistance.png | Bin 3784 -> 3965 bytes .../textures/item/advanced_ring_of_speed.png | Bin 3833 -> 4007 bytes .../item/advanced_ring_of_strength.png | Bin 3784 -> 4007 bytes .../item/advanced_ring_of_water_breathing.png | Bin 3784 -> 3987 bytes .../textures/item/black_crystal_shard.png | Bin 311 -> 3735 bytes .../textures/item/blue_crystal_shard.png | Bin 311 -> 3791 bytes .../textures/item/canola_seeds.png | Bin 3968 -> 4003 bytes .../textures/item/crushed_black_quartz.png | Bin 3504 -> 3600 bytes .../textures/item/crushed_coal.png | Bin 3504 -> 3703 bytes .../textures/item/crushed_diamond.png | Bin 3504 -> 3756 bytes .../textures/item/crushed_emerald.png | Bin 3504 -> 3743 bytes .../textures/item/crushed_gold.png | Bin 3504 -> 3713 bytes .../textures/item/crushed_iron.png | Bin 3504 -> 3638 bytes .../textures/item/crushed_lapis.png | Bin 3504 -> 3736 bytes .../textures/item/crushed_quartz.png | Bin 3504 -> 3716 bytes .../item/crystallized_canola_seed.png | Bin 4005 -> 4005 bytes .../item/diamatine_crystal.png.mcmeta | 7 + .../textures/item/diamatine_paxel.png | Bin 0 -> 4003 bytes .../textures/item/diamond_paxel.png | Bin 0 -> 3898 bytes .../textures/item/emeradic_crystal.png.mcmeta | 7 + .../textures/item/emeradic_paxel.png | Bin 0 -> 3963 bytes .../textures/item/empowered_canola_seed.png | Bin 4014 -> 4014 bytes .../textures/item/enori_crystal.png.mcmeta | 7 + .../textures/item/enori_paxel.png | Bin 0 -> 3969 bytes .../textures/item/flax_seeds.png | Bin 3323 -> 3867 bytes .../textures/item/food_bacon.png | Bin 3963 -> 3963 bytes .../textures/item/food_big_cookie.png | Bin 3630 -> 4067 bytes .../textures/item/food_cheese.png | Bin 3468 -> 3970 bytes .../textures/item/food_fish_n_chips.png | Bin 3710 -> 4032 bytes .../textures/item/food_french_fries.png | Bin 3732 -> 3991 bytes .../textures/item/food_french_fry.png | Bin 3381 -> 4207 bytes .../textures/item/food_noodle.png | Bin 3758 -> 3941 bytes .../textures/item/food_pizza.png | Bin 3775 -> 4212 bytes .../textures/item/food_spaghetti.png | Bin 3473 -> 3997 bytes .../textures/item/gold_paxel.png | Bin 0 -> 3873 bytes .../textures/item/green_crystal_shard.png | Bin 311 -> 3742 bytes .../textures/item/iron_paxel.png | Bin 0 -> 3868 bytes .../textures/item/jam_ch_ap_ci.png | Bin 2645 -> 4025 bytes .../textures/item/jam_cu_ba_ra.png | Bin 2645 -> 4075 bytes .../textures/item/jam_gra_ki_ba.png | Bin 2645 -> 4034 bytes .../textures/item/jam_ho_me_co.png | Bin 2645 -> 4039 bytes .../textures/item/jam_ho_me_ki.png | Bin 2645 -> 4015 bytes .../textures/item/jam_pi_co.png | Bin 2645 -> 4054 bytes .../textures/item/jam_pl_ap_le.png | Bin 2645 -> 4100 bytes .../textures/item/laser_wrench.png | Bin 2989 -> 3836 bytes .../textures/item/lens_of_conversion.png | Bin 0 -> 4005 bytes .../item/light_blue_crystal_shard.png | Bin 311 -> 3788 bytes .../textures/item/netherite_paxel.png | Bin 0 -> 3895 bytes .../textures/item/palis_crystal.png.mcmeta | 7 + .../textures/item/palis_paxel.png | Bin 0 -> 4015 bytes .../textures/item/paper_cone.png | Bin 3477 -> 3914 bytes .../textures/item/quartz_paxel.png | Bin 0 -> 3942 bytes .../textures/item/red_crystal_shard.png | Bin 311 -> 3723 bytes .../textures/item/restonia_crystal.png.mcmeta | 7 + .../textures/item/restonia_paxel.png | Bin 0 -> 3943 bytes .../actuallyadditions/textures/item/ring.png | Bin 3802 -> 3934 bytes .../textures/item/ring_of_fire_resistance.png | Bin 3784 -> 4061 bytes .../textures/item/ring_of_haste.png | Bin 3784 -> 4061 bytes .../textures/item/ring_of_invisibility.png | Bin 3784 -> 4046 bytes .../textures/item/ring_of_jump_boost.png | Bin 3784 -> 4055 bytes .../textures/item/ring_of_night_vision.png | Bin 3784 -> 4043 bytes .../textures/item/ring_of_regeneration.png | Bin 3784 -> 4039 bytes .../textures/item/ring_of_resistance.png | Bin 3784 -> 4015 bytes .../textures/item/ring_of_speed.png | Bin 3784 -> 4050 bytes .../textures/item/ring_of_strength.png | Bin 3784 -> 4058 bytes .../textures/item/ring_of_water_breathing.png | Bin 3784 -> 4051 bytes .../textures/item/stone_paxel.png | Bin 0 -> 3869 bytes .../textures/item/void_crystal.png.mcmeta | 7 + .../textures/item/void_paxel.png | Bin 0 -> 3936 bytes .../textures/item/white_crystal_shard.png | Bin 311 -> 3740 bytes .../textures/item/wooden_paxel.png | Bin 0 -> 3878 bytes 434 files changed, 28946 insertions(+), 135 deletions(-) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/HorizontallyDirectionalBlock.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DropperBlock.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSingleBlock.java create mode 100644 src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/battery_box_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/bio_reactor_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/black_quartz_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/black_quartz_smooth_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/breaker_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/canola_press_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/charcoal_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/coal_generator_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/coffee_machine_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crusher_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crusher_double_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_enori_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_palis_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_void_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/directional_breaker_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/display_stand_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/double_powered_furnace_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/dropper_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/empowerer_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/ender_casing_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/enderpearl_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/energizer_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/enervator_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/farmer_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/feeder_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/firework_box_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/fluid_collector_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/fluid_placer_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/green_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/heat_collector_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/iron_casing_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/item_interface_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_black_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_blue_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_brown_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_controller_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_gray_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_green_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_lime_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_orange_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_pink_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_purple_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_red_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_white_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/leaf_generator_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/miner_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/oil_generator_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/phantom_booster_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/phantom_placer_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/phantomface_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/placer_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/player_interface_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/powered_furnace_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/quartz_pillar_horizontal.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/ranged_collector_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/white_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/wood_casing_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/advanced_esd_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/advanced_esd_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/animal_feeder_side_chicken.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/animal_feeder_side_cow.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/animal_feeder_side_pig.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/animal_feeder_side_sheep.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/base_texture.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/base_texture_arrow.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/base_texture_back.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/base_texture_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/battery_box_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/battery_box_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/bioreactor_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/bioreactor_glow_animated.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/bioreactor_glow_animated.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/bioreactor_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/bioreactor_side_glass.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick_block.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth_block.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_black_lotus.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_breaker_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_breaker_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_breaker_side_extended.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_1.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_2.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_3.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_4.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_1.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_2.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_3.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_4.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_5.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_6.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_dropper_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_dropper_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_1.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_2.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_3.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_4.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_5.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_6.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_greenhouse_glass.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_placer_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_placer_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_1.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_2.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_3.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_4.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_5.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_6.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/canola_press.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/canola_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/coal_generator_fire_animated.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/coal_generator_fire_animated.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/coal_generator_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crate_base.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crusher_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crusher_front_double.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crusher_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/display_stand_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/display_stand_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/double_crusher_rotation_animation.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/double_crusher_rotation_animation.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/double_furnace_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/empowerer_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/empowerer_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/energizer_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/energizer_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/enervator_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/enervator_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/esd_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/esd_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/exp_solidifier_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/exp_solidifier_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/farmer_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/farmer_front.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/farmer_glow_animated.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/farmer_glow_animated.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/firework_box_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/firework_box_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/fishing_net.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/fluid_placer_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/generator_internal_off.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/generator_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/generator_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/heat_collector_glow_animated.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/heat_collector_glow_animated.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/heat_collector_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/heat_collector_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/item_interface_hopper_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/item_interface_hopper_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/item_interface_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/item_interface_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/item_repairer_side_a.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/item_repairer_side_b.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/item_repairer_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/leaf_gen_animated.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/leaf_gen_animated.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/misc_barrel_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/misc_barrel_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/misc_wood.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/models/coffee_machine.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/models/laser_relay.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/models/model_compost.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/models/model_phantom_booster.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/oil_generator_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/oil_generator_oil_animated.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/oil_generator_oil_animated.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/phantomface_energy.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/phantomface_liquid.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/phantomface_redstone.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/phantomface_standard.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/player_interface_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/player_interface_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_glow.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_glow.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/shock_absorber_springs.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/single_crusher_rotation_animation.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/single_crusher_rotation_animation.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/single_furnace_front.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/solar_panel_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/solar_panel_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_side.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_top.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_rotation_animation.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_rotation_animation.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_side_a.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_side_b.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/diamond_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/enori_crystal.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/gold_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/lens_of_conversion.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/netherite_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/palis_crystal.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/quartz_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/void_crystal.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/void_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/wooden_paxel.png diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java index 0870c3ced..75e94561a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java @@ -5,6 +5,8 @@ import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.common.config.Config; import de.ellpeck.actuallyadditions.common.container.ActuallyContainers; import de.ellpeck.actuallyadditions.common.items.ActuallyItems; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -52,6 +54,12 @@ public class ActuallyAdditions { } private void clientSetup(FMLClientSetupEvent event) { - ClientSetup.setup(); + RenderTypeLookup.setRenderLayer(ActuallyBlocks.CRYSTAL_CLUSTER_VOID.get(), RenderType.getTranslucent()); + RenderTypeLookup.setRenderLayer(ActuallyBlocks.CRYSTAL_CLUSTER_ENORI.get(), RenderType.getTranslucent()); + RenderTypeLookup.setRenderLayer(ActuallyBlocks.CRYSTAL_CLUSTER_RESTONIA.get(), RenderType.getTranslucent()); + RenderTypeLookup.setRenderLayer(ActuallyBlocks.CRYSTAL_CLUSTER_PALIS.get(), RenderType.getTranslucent()); + RenderTypeLookup.setRenderLayer(ActuallyBlocks.CRYSTAL_CLUSTER_DIAMATINE.get(), RenderType.getTranslucent()); + RenderTypeLookup.setRenderLayer(ActuallyBlocks.CRYSTAL_CLUSTER_EMERADIC.get(), RenderType.getTranslucent()); + RenderTypeLookup.setRenderLayer(ActuallyBlocks.GREENHOUSE_GLASS.get(), RenderType.getCutout()); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java index d2c22074f..cf8f093a8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -5,6 +5,7 @@ import de.ellpeck.actuallyadditions.common.blocks.building.CrystalBlock; import de.ellpeck.actuallyadditions.common.blocks.building.CrystalClusterBlock; import de.ellpeck.actuallyadditions.common.blocks.building.WallBlock; import de.ellpeck.actuallyadditions.common.blocks.functional.*; +import de.ellpeck.actuallyadditions.common.blocks.functional.DropperBlock; import de.ellpeck.actuallyadditions.common.blocks.misc.TinyTorchBlock; import de.ellpeck.actuallyadditions.common.blocks.plant.PlantBlock; import de.ellpeck.actuallyadditions.common.blocks.types.Crystals; @@ -63,14 +64,13 @@ public class ActuallyBlocks { public static final RegistryObject FEEDER = BLOCKS.register("feeder_block", FeederBlock::new); public static final RegistryObject CRUSHER = BLOCKS.register("crusher_block", () -> new GrinderBlock(false)); public static final RegistryObject CRUSHER_DOUBLE = BLOCKS.register("crusher_double_block", () -> new GrinderBlock(true)); - public static final RegistryObject POWERED_FURNACE = BLOCKS.register("powered_furnace_block", FurnaceDoubleBlock::new); - public static final RegistryObject ESD = BLOCKS.register("esd_block", () -> new InputterBlock(false)); - public static final RegistryObject ESD_ADVANCED = BLOCKS.register("esd_advanced_block", () -> new InputterBlock(true)); + public static final RegistryObject POWERED_FURNACE = BLOCKS.register("powered_furnace_block", FurnaceSingleBlock::new); + public static final RegistryObject DOUBLE_POWERED_FURNACE = BLOCKS.register("double_powered_furnace_block", FurnaceDoubleBlock::new); public static final RegistryObject HEAT_COLLECTOR = BLOCKS.register("heat_collector_block", HeatCollectorBlock::new); public static final RegistryObject GREENHOUSE_GLASS = BLOCKS.register("greenhouse_glass_block", GreenhouseGlassBlock::new); public static final RegistryObject BREAKER = BLOCKS.register("breaker_block", () -> new BreakerBlock(false)); public static final RegistryObject PLACER = BLOCKS.register("placer_block", () -> new BreakerBlock(true)); - public static final RegistryObject DROPPER = BLOCKS.register("dropper_block", () -> new DropperBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject DROPPER = BLOCKS.register("dropper_block", DropperBlock::new); public static final RegistryObject FLUID_PLACER = BLOCKS.register("fluid_placer_block", () -> new FluidCollectorBlock(true)); public static final RegistryObject FLUID_COLLECTOR = BLOCKS.register("fluid_collector_block", () -> new FluidCollectorBlock(false)); public static final RegistryObject COFFEE_MACHINE = BLOCKS.register("coffee_machine_block", CoffeeMachineBlock::new); @@ -113,26 +113,39 @@ public class ActuallyBlocks { // BUILDING BLOCKS public static final RegistryObject GREEN_BLOCK = BLOCKS.register("green_block", GenericBlock::new); public static final RegistryObject WHITE_BLOCK = BLOCKS.register("white_block", GenericBlock::new); + public static final RegistryObject GREEN_STAIRS = BLOCKS.register("green_stairs_block", () -> new ActuallyBlock.Stairs(() -> GREEN_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK))); public static final RegistryObject WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new ActuallyBlock.Stairs(() -> WHITE_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject GREEN_SLAB = BLOCKS.register("green_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK))); public static final RegistryObject WHITE_SLAB = BLOCKS.register("white_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK))); + public static final RegistryObject GREEN_WALL = BLOCKS.register("green_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject WHITE_WALL = BLOCKS.register("white_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ = BLOCKS.register("black_quartz_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_QUARTZ_SMOOTH = BLOCKS.register("black_quartz_smooth_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ_CHISELED = BLOCKS.register("black_quartz_chiseled_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ_PILLAR = BLOCKS.register("black_quartz_pillar_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_QUARTZ_BRICK = BLOCKS.register("black_quartz_brick_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get()))); + public static final RegistryObject BLACK_SMOOTH_QUARTZ_WALL = BLOCKS.register("black_quartz_smooth_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_SMOOTH.get()))); public static final RegistryObject BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_quartz_chiseled_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get()))); public static final RegistryObject BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_quartz_pillar_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get()))); + public static final RegistryObject BLACK_BRICK_QUARTZ_WALL = BLOCKS.register("black_quartz_brick_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_BRICK.get()))); + public static final RegistryObject BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - public static final RegistryObject BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - public static final RegistryObject BLACK_PILLAR_QUARTZ_STAIR = BLOCKS.register("black_pillar_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_SMOOTH_QUARTZ_STAIR = BLOCKS.register("black_smooth_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ_SMOOTH.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ_CHISELED.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_PILLAR_QUARTZ_STAIR = BLOCKS.register("black_pillar_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ_PILLAR.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_BRICK_QUARTZ_STAIR = BLOCKS.register("black_brick_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ_PILLAR.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_QUARTZ_SLAB = BLOCKS.register("black_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_SMOOTH_QUARTZ_SLAB = BLOCKS.register("black_smooth_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_CHISELED_QUARTZ_SLAB = BLOCKS.register("black_chiseled_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_PILLAR_QUARTZ_SLAB = BLOCKS.register("black_pillar_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_BRICK_QUARTZ_SLAB = BLOCKS.register("black_brick_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK))); // LAMPS! SO MANY LAMPS public static final RegistryObject LAMP_WHITE = BLOCKS.register("lamp_white_block", LampBlock::new); @@ -163,6 +176,11 @@ public class ActuallyBlocks { public static final RegistryObject LAVA_FACTORY_CASE = BLOCKS.register("lava_factory_case_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject WOOD_CASING = BLOCKS.register("wood_casing_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); + //public static final RegistryObject ESD = BLOCKS.register("esd_block", () -> new InputterBlock(false)); + //public static final RegistryObject ESD_ADVANCED = BLOCKS.register("esd_advanced_block", () -> new InputterBlock(true)); + //public static final RegistryObject IRON_CASING_SNOW = BLOCKS.register("iron_casing_snow_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); + + // I don't know what this is :cry: // public static final RegistryObject WildPlant // = BLOCKS.register("wild_block", WildPlantBlock::new); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HorizontallyDirectionalBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HorizontallyDirectionalBlock.java new file mode 100644 index 000000000..87891ded7 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HorizontallyDirectionalBlock.java @@ -0,0 +1,32 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Direction; + +public class HorizontallyDirectionalBlock extends ActuallyBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; + + public HorizontallyDirectionalBlock(Properties properties) { + super(properties); + + this.setDefaultState(this.stateContainer.getBaseState().with(FACING, Direction.NORTH)); + } + + public BlockState getBaseConstructorState() { + return this.stateContainer.getBaseState().with(FACING, Direction.NORTH); + } + + public BlockState getStateForPlacement(BlockItemUseContext context) { + return this.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite()); + } + + protected void fillStateContainer(StateContainer.Builder builder) { + builder.add(FACING); + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java index d76b8c193..321bbbf2f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java @@ -2,16 +2,41 @@ package de.ellpeck.actuallyadditions.common.blocks.building; import de.ellpeck.actuallyadditions.common.blocks.FullyDirectionalBlock; import de.ellpeck.actuallyadditions.common.blocks.types.Crystals; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.state.DirectionProperty; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +import java.util.stream.Stream; public class CrystalClusterBlock extends FullyDirectionalBlock { public static final DirectionProperty FACING = BlockStateProperties.FACING; + public static final VoxelShape CRYSTAL_SHAPE = Stream.of( + Block.makeCuboidShape(5, 4, 5, 10, 19, 10), Block.makeCuboidShape(4, 0, 4, 11, 5, 11), + Block.makeCuboidShape(3, 0, 3, 5, 4, 5), Block.makeCuboidShape(10, 0, 3, 12, 2, 5), + Block.makeCuboidShape(12, 0, 4, 13, 1, 5), Block.makeCuboidShape(11, 0, 5, 12, 1, 6), + Block.makeCuboidShape(10, 0, 10, 12, 3, 12), Block.makeCuboidShape(3, 0, 10, 5, 1, 12), + Block.makeCuboidShape(9, 0, 3, 10, 3, 4), Block.makeCuboidShape(8, 0, 2, 11, 1, 4), + Block.makeCuboidShape(4, 0, 2, 5, 2, 3), Block.makeCuboidShape(5, 0, 3, 7, 1, 4), + Block.makeCuboidShape(2, 0, 4, 4, 1, 6), Block.makeCuboidShape(3, 0, 5, 4, 3, 6.5), + Block.makeCuboidShape(3, 0, 9, 4, 2, 10), Block.makeCuboidShape(2, 0, 8, 4, 1, 10), + Block.makeCuboidShape(5, 0, 11, 7, 2, 13), Block.makeCuboidShape(7, 0, 11, 11, 1, 13), + Block.makeCuboidShape(10, 0, 9, 13, 1, 11), Block.makeCuboidShape(11, 0, 7, 12, 3, 9) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + public CrystalClusterBlock(Crystals crystal) { super(Properties.create(Material.GLASS) .setLightLevel((e) -> 7) @@ -28,4 +53,9 @@ public class CrystalClusterBlock extends FullyDirectionalBlock { public boolean isTransparent(BlockState state) { return true; } + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return CRYSTAL_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java index 6faa953ec..2c0361050 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java @@ -1,12 +1,22 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.FullyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.state.DirectionProperty; import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; import net.minecraftforge.common.ToolType; +import java.util.stream.Stream; + public class AtomicReconstructorBlock extends FullyDirectionalBlock { public static final DirectionProperty FACING = BlockStateProperties.FACING; @@ -17,4 +27,120 @@ public class AtomicReconstructorBlock extends FullyDirectionalBlock { .hardnessAndResistance(10f, 80f) .sound(SoundType.STONE)); } + + private static final VoxelShape SHAPE_U = Stream.of( + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 0, 15, 1, 16, 16), + Block.makeCuboidShape(15, 0, 15, 16, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(15, 0, 0, 16, 16, 1), + Block.makeCuboidShape(0, 0, 0, 1, 16, 1), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(1, 1, 14, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 15, 2), + Block.makeCuboidShape(10, 14, 10, 11, 15, 11), Block.makeCuboidShape(10, 14, 5, 11, 15, 6), + Block.makeCuboidShape(5, 14, 10, 6, 15, 11), Block.makeCuboidShape(5, 14, 5, 6, 15, 6), + Block.makeCuboidShape(5, 14, 11, 11, 15, 14), Block.makeCuboidShape(5, 14, 2, 11, 15, 5), + Block.makeCuboidShape(2, 14, 2, 5, 15, 14), Block.makeCuboidShape(11, 14, 2, 14, 15, 14), + Block.makeCuboidShape(14, 1, 2, 15, 15, 14), Block.makeCuboidShape(1, 1, 2, 2, 15, 14), + Block.makeCuboidShape(2, 1, 2, 14, 2, 14), Block.makeCuboidShape(2, 13, 2, 14, 14, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_D = Stream.of( + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 0, 1, 16, 1), + Block.makeCuboidShape(15, 0, 0, 16, 16, 1), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 0, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 15, 1, 16, 16), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(1, 1, 1, 15, 15, 2), Block.makeCuboidShape(1, 1, 14, 15, 15, 15), + Block.makeCuboidShape(10, 1, 5, 11, 2, 6), Block.makeCuboidShape(10, 1, 10, 11, 2, 11), + Block.makeCuboidShape(5, 1, 5, 6, 2, 6), Block.makeCuboidShape(5, 1, 10, 6, 2, 11), + Block.makeCuboidShape(5, 1, 2, 11, 2, 5), Block.makeCuboidShape(5, 1, 11, 11, 2, 14), + Block.makeCuboidShape(2, 1, 2, 5, 2, 14), Block.makeCuboidShape(11, 1, 2, 14, 2, 14), + Block.makeCuboidShape(14, 1, 2, 15, 15, 14), Block.makeCuboidShape(1, 1, 2, 2, 15, 14), + Block.makeCuboidShape(2, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 2, 2, 14, 3, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(1, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(10, 10, 1, 11, 11, 2), Block.makeCuboidShape(10, 5, 1, 11, 6, 2), + Block.makeCuboidShape(5, 10, 1, 6, 11, 2), Block.makeCuboidShape(5, 5, 1, 6, 6, 2), + Block.makeCuboidShape(5, 11, 1, 11, 14, 2), Block.makeCuboidShape(5, 2, 1, 11, 5, 2), + Block.makeCuboidShape(2, 2, 1, 5, 14, 2), Block.makeCuboidShape(11, 2, 1, 14, 14, 2), + Block.makeCuboidShape(14, 2, 1, 15, 14, 15), Block.makeCuboidShape(1, 2, 1, 2, 14, 15), + Block.makeCuboidShape(2, 2, 14, 14, 14, 15), Block.makeCuboidShape(2, 2, 2, 14, 14, 3) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(1, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(14, 10, 10, 15, 11, 11), Block.makeCuboidShape(14, 5, 10, 15, 6, 11), + Block.makeCuboidShape(14, 10, 5, 15, 11, 6), Block.makeCuboidShape(14, 5, 5, 15, 6, 6), + Block.makeCuboidShape(14, 11, 5, 15, 14, 11), Block.makeCuboidShape(14, 2, 5, 15, 5, 11), + Block.makeCuboidShape(14, 2, 2, 15, 14, 5), Block.makeCuboidShape(14, 2, 11, 15, 14, 14), + Block.makeCuboidShape(1, 2, 14, 15, 14, 15), Block.makeCuboidShape(1, 2, 1, 15, 14, 2), + Block.makeCuboidShape(1, 2, 2, 2, 14, 14), Block.makeCuboidShape(13, 2, 2, 14, 14, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(1, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(5, 10, 14, 6, 11, 15), Block.makeCuboidShape(5, 5, 14, 6, 6, 15), + Block.makeCuboidShape(10, 10, 14, 11, 11, 15), Block.makeCuboidShape(10, 5, 14, 11, 6, 15), + Block.makeCuboidShape(5, 11, 14, 11, 14, 15), Block.makeCuboidShape(5, 2, 14, 11, 5, 15), + Block.makeCuboidShape(11, 2, 14, 14, 14, 15), Block.makeCuboidShape(2, 2, 14, 5, 14, 15), + Block.makeCuboidShape(1, 2, 1, 2, 14, 15), Block.makeCuboidShape(14, 2, 1, 15, 14, 15), + Block.makeCuboidShape(2, 2, 1, 14, 14, 2), Block.makeCuboidShape(2, 2, 13, 14, 14, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(1, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(1, 10, 5, 2, 11, 6), Block.makeCuboidShape(1, 5, 5, 2, 6, 6), + Block.makeCuboidShape(1, 10, 10, 2, 11, 11), Block.makeCuboidShape(1, 5, 10, 2, 6, 11), + Block.makeCuboidShape(1, 11, 5, 2, 14, 11), Block.makeCuboidShape(1, 2, 5, 2, 5, 11), + Block.makeCuboidShape(1, 2, 11, 2, 14, 14), Block.makeCuboidShape(1, 2, 2, 2, 14, 5), + Block.makeCuboidShape(1, 2, 1, 15, 14, 2), Block.makeCuboidShape(1, 2, 14, 15, 14, 15), + Block.makeCuboidShape(14, 2, 2, 15, 14, 14), Block.makeCuboidShape(2, 2, 2, 3, 14, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case UP: + return SHAPE_U; + case DOWN: + return SHAPE_D; + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java index 472d9d1bc..26f8be2e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java @@ -1,10 +1,40 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class BatteryBoxBlock extends ActuallyBlock { public BatteryBoxBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape BATTERYBOX_SHAPE = Stream.of( + Block.makeCuboidShape(2, 1, 1, 14, 2, 2), Block.makeCuboidShape(0, 0, 0, 16, 1, 16), + Block.makeCuboidShape(2, 2, 2, 14, 5, 14), Block.makeCuboidShape(5, 5, 5, 6, 7, 6), + Block.makeCuboidShape(10, 5, 10, 11, 7, 11), Block.makeCuboidShape(5, 5, 10, 6, 7, 11), + Block.makeCuboidShape(1, 1, 14, 2, 6, 15), Block.makeCuboidShape(14, 1, 14, 15, 6, 15), + Block.makeCuboidShape(1, 1, 1, 2, 6, 2), Block.makeCuboidShape(14, 1, 1, 15, 6, 2), + Block.makeCuboidShape(1, 5, 2, 2, 6, 14), Block.makeCuboidShape(14, 1, 2, 15, 2, 14), + Block.makeCuboidShape(14, 5, 2, 15, 6, 14), Block.makeCuboidShape(1, 1, 2, 2, 2, 14), + Block.makeCuboidShape(2, 5, 14, 14, 6, 15), Block.makeCuboidShape(2, 5, 1, 14, 6, 2), + Block.makeCuboidShape(2, 1, 14, 14, 2, 15), Block.makeCuboidShape(10, 5, 5, 11, 7, 6), + Block.makeCuboidShape(5.5, 6, 6, 6, 7, 10), Block.makeCuboidShape(10, 6, 6, 10.5, 7, 10), + Block.makeCuboidShape(6, 6, 5.5, 10, 7, 6), Block.makeCuboidShape(6, 6, 10, 10, 7, 10.5), + Block.makeCuboidShape(6, 5, 6, 10, 7, 10) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return BATTERYBOX_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java index 9b7c3c40d..62b12bc6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java @@ -1,10 +1,149 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class BioReactorBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class BioReactorBlock extends ActuallyBlock { public BioReactorBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(15, 11, 5, 16, 12, 11), Block.makeCuboidShape(0, 11, 5, 1, 12, 11), + Block.makeCuboidShape(15, 4, 5, 16, 5, 11), Block.makeCuboidShape(0, 4, 5, 1, 5, 11), + Block.makeCuboidShape(15, 4, 11, 16, 12, 12), Block.makeCuboidShape(0, 4, 11, 1, 12, 12), + Block.makeCuboidShape(15, 4, 4, 16, 12, 5), Block.makeCuboidShape(0, 4, 4, 1, 12, 5), + Block.makeCuboidShape(15, 12, 4, 16, 13, 12), Block.makeCuboidShape(0, 12, 4, 1, 13, 12), + Block.makeCuboidShape(15, 3, 4, 16, 4, 12), Block.makeCuboidShape(0, 3, 4, 1, 4, 12), + Block.makeCuboidShape(15, 3, 12, 16, 13, 13), Block.makeCuboidShape(0, 3, 12, 1, 13, 13), + Block.makeCuboidShape(15, 3, 3, 16, 13, 4), Block.makeCuboidShape(0, 3, 3, 1, 13, 4), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(4, 14, 2, 12, 15, 4), Block.makeCuboidShape(4, 14, 12, 12, 15, 14), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 14), Block.makeCuboidShape(14, 0, 2, 15, 15, 14), + Block.makeCuboidShape(1, 0, 14, 15, 15, 15), Block.makeCuboidShape(1, 0, 1, 15, 15, 2), + Block.makeCuboidShape(0, 8, 6, 1, 9, 7), Block.makeCuboidShape(15, 8, 6, 16, 9, 7), + Block.makeCuboidShape(0, 9, 7, 1, 10, 8), Block.makeCuboidShape(15, 9, 7, 16, 10, 8), + Block.makeCuboidShape(0, 6, 9, 1, 7, 10), Block.makeCuboidShape(15, 6, 9, 16, 7, 10) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(5, 11, 15, 11, 12, 16), Block.makeCuboidShape(5, 11, 0, 11, 12, 1), + Block.makeCuboidShape(5, 4, 15, 11, 5, 16), Block.makeCuboidShape(5, 4, 0, 11, 5, 1), + Block.makeCuboidShape(4, 4, 15, 5, 12, 16), Block.makeCuboidShape(4, 4, 0, 5, 12, 1), + Block.makeCuboidShape(11, 4, 15, 12, 12, 16), Block.makeCuboidShape(11, 4, 0, 12, 12, 1), + Block.makeCuboidShape(4, 12, 15, 12, 13, 16), Block.makeCuboidShape(4, 12, 0, 12, 13, 1), + Block.makeCuboidShape(4, 3, 15, 12, 4, 16), Block.makeCuboidShape(4, 3, 0, 12, 4, 1), + Block.makeCuboidShape(3, 3, 15, 4, 13, 16), Block.makeCuboidShape(3, 3, 0, 4, 13, 1), + Block.makeCuboidShape(12, 3, 15, 13, 13, 16), Block.makeCuboidShape(12, 3, 0, 13, 13, 1), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(2, 14, 2, 14, 15, 4), + Block.makeCuboidShape(12, 14, 4, 14, 15, 12), Block.makeCuboidShape(2, 14, 4, 4, 15, 12), + Block.makeCuboidShape(2, 14, 12, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(2, 0, 1, 14, 15, 2), Block.makeCuboidShape(2, 0, 14, 14, 15, 15), + Block.makeCuboidShape(1, 0, 1, 2, 15, 15), Block.makeCuboidShape(14, 0, 1, 15, 15, 15), + Block.makeCuboidShape(9, 8, 0, 10, 9, 1), Block.makeCuboidShape(9, 8, 15, 10, 9, 16), + Block.makeCuboidShape(8, 9, 0, 9, 10, 1), Block.makeCuboidShape(8, 9, 15, 9, 10, 16), + Block.makeCuboidShape(6, 6, 0, 7, 7, 1), Block.makeCuboidShape(6, 6, 15, 7, 7, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(0, 11, 5, 1, 12, 11), Block.makeCuboidShape(15, 11, 5, 16, 12, 11), + Block.makeCuboidShape(0, 4, 5, 1, 5, 11), Block.makeCuboidShape(15, 4, 5, 16, 5, 11), + Block.makeCuboidShape(0, 4, 4, 1, 12, 5), Block.makeCuboidShape(15, 4, 4, 16, 12, 5), + Block.makeCuboidShape(0, 4, 11, 1, 12, 12), Block.makeCuboidShape(15, 4, 11, 16, 12, 12), + Block.makeCuboidShape(0, 12, 4, 1, 13, 12), Block.makeCuboidShape(15, 12, 4, 16, 13, 12), + Block.makeCuboidShape(0, 3, 4, 1, 4, 12), Block.makeCuboidShape(15, 3, 4, 16, 4, 12), + Block.makeCuboidShape(0, 3, 3, 1, 13, 4), Block.makeCuboidShape(15, 3, 3, 16, 13, 4), + Block.makeCuboidShape(0, 3, 12, 1, 13, 13), Block.makeCuboidShape(15, 3, 12, 16, 13, 13), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(12, 14, 2, 14, 15, 14), + Block.makeCuboidShape(4, 14, 12, 12, 15, 14), Block.makeCuboidShape(4, 14, 2, 12, 15, 4), + Block.makeCuboidShape(2, 14, 2, 4, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(14, 0, 2, 15, 15, 14), Block.makeCuboidShape(1, 0, 2, 2, 15, 14), + Block.makeCuboidShape(1, 0, 1, 15, 15, 2), Block.makeCuboidShape(1, 0, 14, 15, 15, 15), + Block.makeCuboidShape(15, 8, 9, 16, 9, 10), Block.makeCuboidShape(0, 8, 9, 1, 9, 10), + Block.makeCuboidShape(15, 9, 8, 16, 10, 9), Block.makeCuboidShape(0, 9, 8, 1, 10, 9), + Block.makeCuboidShape(15, 6, 6, 16, 7, 7), Block.makeCuboidShape(0, 6, 6, 1, 7, 7) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(5, 11, 0, 11, 12, 1), Block.makeCuboidShape(5, 11, 15, 11, 12, 16), + Block.makeCuboidShape(5, 4, 0, 11, 5, 1), Block.makeCuboidShape(5, 4, 15, 11, 5, 16), + Block.makeCuboidShape(11, 4, 0, 12, 12, 1), Block.makeCuboidShape(11, 4, 15, 12, 12, 16), + Block.makeCuboidShape(4, 4, 0, 5, 12, 1), Block.makeCuboidShape(4, 4, 15, 5, 12, 16), + Block.makeCuboidShape(4, 12, 0, 12, 13, 1), Block.makeCuboidShape(4, 12, 15, 12, 13, 16), + Block.makeCuboidShape(4, 3, 0, 12, 4, 1), Block.makeCuboidShape(4, 3, 15, 12, 4, 16), + Block.makeCuboidShape(12, 3, 0, 13, 13, 1), Block.makeCuboidShape(12, 3, 15, 13, 13, 16), + Block.makeCuboidShape(3, 3, 0, 4, 13, 1), Block.makeCuboidShape(3, 3, 15, 4, 13, 16), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(2, 14, 12, 14, 15, 14), + Block.makeCuboidShape(2, 14, 4, 4, 15, 12), Block.makeCuboidShape(12, 14, 4, 14, 15, 12), + Block.makeCuboidShape(2, 14, 2, 14, 15, 4), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(2, 0, 14, 14, 15, 15), Block.makeCuboidShape(2, 0, 1, 14, 15, 2), + Block.makeCuboidShape(14, 0, 1, 15, 15, 15), Block.makeCuboidShape(1, 0, 1, 2, 15, 15), + Block.makeCuboidShape(6, 8, 15, 7, 9, 16), Block.makeCuboidShape(6, 8, 0, 7, 9, 1), + Block.makeCuboidShape(7, 9, 15, 8, 10, 16), Block.makeCuboidShape(7, 9, 0, 8, 10, 1), + Block.makeCuboidShape(9, 6, 15, 10, 7, 16), Block.makeCuboidShape(9, 6, 0, 10, 7, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java index e4ef46f76..b52206048 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java @@ -1,10 +1,118 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.FullyDirectionalBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class BreakerBlock extends FullyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.FACING; -public class BreakerBlock extends ActuallyBlock { public BreakerBlock(boolean isPlacer) { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_U = Stream.of( + Block.makeCuboidShape(11, 15, 6, 13, 16, 10), Block.makeCuboidShape(3, 15, 6, 5, 16, 10), + Block.makeCuboidShape(5, 15, 5, 11, 16, 11), Block.makeCuboidShape(0, 3, 6, 1, 13, 10), + Block.makeCuboidShape(15, 3, 6, 16, 13, 10), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(1, 1, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_D = Stream.of( + Block.makeCuboidShape(11, 0, 6, 13, 1, 10), Block.makeCuboidShape(3, 0, 6, 5, 1, 10), + Block.makeCuboidShape(5, 0, 5, 11, 1, 11), Block.makeCuboidShape(0, 3, 6, 1, 13, 10), + Block.makeCuboidShape(15, 3, 6, 16, 13, 10), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(1, 1, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(11, 6, 0, 13, 10, 1), Block.makeCuboidShape(3, 6, 0, 5, 10, 1), + Block.makeCuboidShape(5, 5, 0, 11, 11, 1), Block.makeCuboidShape(0, 6, 3, 1, 10, 13), + Block.makeCuboidShape(15, 6, 3, 16, 10, 13), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(1, 1, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(3, 6, 15, 13, 10, 16), + Block.makeCuboidShape(3, 6, 0, 13, 10, 1), Block.makeCuboidShape(15, 5, 5, 16, 11, 11), + Block.makeCuboidShape(15, 6, 3, 16, 10, 5), Block.makeCuboidShape(15, 6, 11, 16, 10, 13) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 6, 3, 1, 10, 13), + Block.makeCuboidShape(15, 6, 3, 16, 10, 13), Block.makeCuboidShape(5, 5, 15, 11, 11, 16), + Block.makeCuboidShape(11, 6, 15, 13, 10, 16), Block.makeCuboidShape(3, 6, 15, 5, 10, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(3, 6, 0, 13, 10, 1), + Block.makeCuboidShape(3, 6, 15, 13, 10, 16), Block.makeCuboidShape(0, 5, 5, 1, 11, 11), + Block.makeCuboidShape(0, 6, 11, 1, 10, 13), Block.makeCuboidShape(0, 6, 3, 1, 10, 5) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case UP: + return SHAPE_U; + case DOWN: + return SHAPE_D; + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java index 00ea63d34..e206ee658 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java @@ -1,10 +1,40 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class CanolaPressBlock extends ActuallyBlock { public CanolaPressBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape PRESS_SHAPE = Stream.of( + Block.makeCuboidShape(13, 0, 1, 15, 15.5, 3), Block.makeCuboidShape(2, 0, 2, 14, 6, 14), + Block.makeCuboidShape(2, 10, 2, 14, 15, 14), Block.makeCuboidShape(3, 6, 3, 13, 10, 13), + Block.makeCuboidShape(1, 0, 1, 3, 15.5, 3), Block.makeCuboidShape(1, 0, 13, 3, 15.5, 15), + Block.makeCuboidShape(13, 0, 13, 15, 15.5, 15), Block.makeCuboidShape(0.9, 0, 0.9, 3.1, 0.5, 3.1), + Block.makeCuboidShape(0.9, 0, 12.9, 3.1, 0.5, 15.1), Block.makeCuboidShape(0.9, 5, 12.9, 3.1, 6.5, 15.1), + Block.makeCuboidShape(0.9, 5, 0.9, 3.1, 6.5, 3.1), Block.makeCuboidShape(12.9, 5, 12.9, 15.1, 6.5, 15.1), + Block.makeCuboidShape(12.9, 5, 0.9, 15.1, 6.5, 3.1), Block.makeCuboidShape(0.9, 9.5, 12.9, 3.1, 11, 15.1), + Block.makeCuboidShape(0.9, 9.5, 0.9, 3.1, 11, 3.1), Block.makeCuboidShape(12.9, 9.5, 12.9, 15.1, 11, 15.1), + Block.makeCuboidShape(12.9, 9.5, 0.9, 15.1, 11, 3.1), Block.makeCuboidShape(12.9, 0, 0.9, 15.1, 0.5, 3.1), + Block.makeCuboidShape(12.9, 0, 12.9, 15.1, 0.5, 15.1), Block.makeCuboidShape(12.9, 15.5, 0.9, 15.1, 16, 3.1), + Block.makeCuboidShape(12.9, 15.5, 12.9, 15.1, 16, 15.1), Block.makeCuboidShape(0.9, 15.5, 0.9, 3.1, 16, 3.1), + Block.makeCuboidShape(0.9, 15.5, 12.9, 3.1, 16, 15.1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return PRESS_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java index e92fe4f1a..8b066977e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java @@ -1,10 +1,123 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; +import net.minecraftforge.common.ToolType; + +import java.util.stream.Stream; + +public class CoalGeneratorBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class CoalGeneratorBlock extends ActuallyBlock { public CoalGeneratorBlock() { - super(Properties.create(Material.ROCK)); + super(Properties.create(Material.ROCK) + .harvestTool(ToolType.PICKAXE) + .harvestLevel(0) + .hardnessAndResistance(10f, 80f) + .sound(SoundType.STONE)); + } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(5, 14, 6, 11, 15, 7), + Block.makeCuboidShape(5, 14, 8, 11, 15, 9), Block.makeCuboidShape(5, 14, 10, 11, 15, 14), + Block.makeCuboidShape(5, 14, 2, 11, 15, 5), Block.makeCuboidShape(11, 14, 2, 14, 15, 14), + Block.makeCuboidShape(2, 14, 2, 5, 15, 14), Block.makeCuboidShape(1, 0, 2, 2, 15, 14), + Block.makeCuboidShape(14, 0, 2, 15, 15, 14), Block.makeCuboidShape(1, 0, 14, 15, 15, 15), + Block.makeCuboidShape(3, 11, 0, 13, 12, 1), Block.makeCuboidShape(5, 3, 1, 6, 8, 2), + Block.makeCuboidShape(10, 3, 1, 11, 8, 2), Block.makeCuboidShape(3, 8, 1, 13, 15, 2), + Block.makeCuboidShape(3, 0, 1, 13, 3, 2), Block.makeCuboidShape(1, 0, 1, 3, 15, 2), + Block.makeCuboidShape(13, 0, 1, 15, 15, 2), Block.makeCuboidShape(5, 13, 5, 11, 14, 10), + Block.makeCuboidShape(2, 3, 2, 14, 8, 3), Block.makeCuboidShape(0, 0, 15, 1, 1, 16), + Block.makeCuboidShape(15, 0, 15, 16, 1, 16), Block.makeCuboidShape(15, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 0, 1, 1, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(9, 14, 5, 10, 15, 11), + Block.makeCuboidShape(7, 14, 5, 8, 15, 11), Block.makeCuboidShape(2, 14, 5, 6, 15, 11), + Block.makeCuboidShape(11, 14, 5, 14, 15, 11), Block.makeCuboidShape(2, 14, 11, 14, 15, 14), + Block.makeCuboidShape(2, 14, 2, 14, 15, 5), Block.makeCuboidShape(2, 0, 1, 14, 15, 2), + Block.makeCuboidShape(2, 0, 14, 14, 15, 15), Block.makeCuboidShape(1, 0, 1, 2, 15, 15), + Block.makeCuboidShape(15, 11, 3, 16, 12, 13), Block.makeCuboidShape(14, 3, 5, 15, 8, 6), + Block.makeCuboidShape(14, 3, 10, 15, 8, 11), Block.makeCuboidShape(14, 8, 3, 15, 15, 13), + Block.makeCuboidShape(14, 0, 3, 15, 3, 13), Block.makeCuboidShape(14, 0, 1, 15, 15, 3), + Block.makeCuboidShape(14, 0, 13, 15, 15, 15), Block.makeCuboidShape(6, 13, 5, 11, 14, 11), + Block.makeCuboidShape(13, 3, 2, 14, 8, 14), Block.makeCuboidShape(0, 0, 0, 1, 1, 1), + Block.makeCuboidShape(0, 0, 15, 1, 1, 16), Block.makeCuboidShape(15, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(5, 14, 9, 11, 15, 10), + Block.makeCuboidShape(5, 14, 7, 11, 15, 8), Block.makeCuboidShape(5, 14, 2, 11, 15, 6), + Block.makeCuboidShape(5, 14, 11, 11, 15, 14), Block.makeCuboidShape(2, 14, 2, 5, 15, 14), + Block.makeCuboidShape(11, 14, 2, 14, 15, 14), Block.makeCuboidShape(14, 0, 2, 15, 15, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 14), Block.makeCuboidShape(1, 0, 1, 15, 15, 2), + Block.makeCuboidShape(3, 11, 15, 13, 12, 16), Block.makeCuboidShape(10, 3, 14, 11, 8, 15), + Block.makeCuboidShape(5, 3, 14, 6, 8, 15), Block.makeCuboidShape(3, 8, 14, 13, 15, 15), + Block.makeCuboidShape(3, 0, 14, 13, 3, 15), Block.makeCuboidShape(13, 0, 14, 15, 15, 15), + Block.makeCuboidShape(1, 0, 14, 3, 15, 15), Block.makeCuboidShape(5, 13, 6, 11, 14, 11), + Block.makeCuboidShape(2, 3, 13, 14, 8, 14), Block.makeCuboidShape(15, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 0, 1, 1, 1), Block.makeCuboidShape(0, 0, 15, 1, 1, 16), + Block.makeCuboidShape(15, 0, 15, 16, 1, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(6, 14, 5, 7, 15, 11), + Block.makeCuboidShape(8, 14, 5, 9, 15, 11), Block.makeCuboidShape(10, 14, 5, 14, 15, 11), + Block.makeCuboidShape(2, 14, 5, 5, 15, 11), Block.makeCuboidShape(2, 14, 2, 14, 15, 5), + Block.makeCuboidShape(2, 14, 11, 14, 15, 14), Block.makeCuboidShape(2, 0, 14, 14, 15, 15), + Block.makeCuboidShape(2, 0, 1, 14, 15, 2), Block.makeCuboidShape(14, 0, 1, 15, 15, 15), + Block.makeCuboidShape(0, 11, 3, 1, 12, 13), Block.makeCuboidShape(1, 3, 10, 2, 8, 11), + Block.makeCuboidShape(1, 3, 5, 2, 8, 6), Block.makeCuboidShape(1, 8, 3, 2, 15, 13), + Block.makeCuboidShape(1, 0, 3, 2, 3, 13), Block.makeCuboidShape(1, 0, 13, 2, 15, 15), + Block.makeCuboidShape(1, 0, 1, 2, 15, 3), Block.makeCuboidShape(5, 13, 5, 10, 14, 11), + Block.makeCuboidShape(2, 3, 2, 3, 8, 14), Block.makeCuboidShape(15, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 0, 0, 1, 1, 1), + Block.makeCuboidShape(0, 0, 15, 1, 1, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java index a56a5223c..56b55b319 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java @@ -1,10 +1,127 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; +import net.minecraftforge.common.ToolType; + +import java.util.stream.Stream; + +public class CoffeeMachineBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class CoffeeMachineBlock extends ActuallyBlock { public CoffeeMachineBlock() { - super(Properties.create(Material.ROCK)); + super(Properties.create(Material.ROCK) + .harvestTool(ToolType.PICKAXE) + .harvestLevel(0) + .hardnessAndResistance(10f, 80f) + .sound(SoundType.STONE)); + } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(8, 11, 7, 13, 14, 8), Block.makeCuboidShape(1, 0, 1, 15, 1, 15), + Block.makeCuboidShape(7, 1, 8, 14, 9, 14), Block.makeCuboidShape(6, 9, 3, 15, 11, 15), + Block.makeCuboidShape(8, 11, 8, 13, 13, 13), Block.makeCuboidShape(10, 8, 3.5, 11, 9, 4.5), + Block.makeCuboidShape(9, 1, 2, 12, 2, 5), Block.makeCuboidShape(9, 2, 5, 12, 7, 6), + Block.makeCuboidShape(9, 2, 1, 12, 7, 2), Block.makeCuboidShape(12, 2, 2, 13, 7, 5), + Block.makeCuboidShape(8, 2, 2, 9, 7, 5), Block.makeCuboidShape(13, 2, 3, 14, 3, 4), + Block.makeCuboidShape(13, 5, 3, 14, 6, 4), Block.makeCuboidShape(14, 3, 3, 15, 5, 4), + Block.makeCuboidShape(13, 10.2, 4.2, 14, 11.2, 5.2), Block.makeCuboidShape(11, 10.2, 4.2, 12, 11.2, 5.2), + Block.makeCuboidShape(13, 11, 7, 14, 14, 14), Block.makeCuboidShape(7, 11, 7, 8, 14, 14), + Block.makeCuboidShape(8, 11, 13, 13, 14, 14), Block.makeCuboidShape(14, 1, 14, 15, 9, 15), + Block.makeCuboidShape(6, 1, 14, 7, 9, 15), Block.makeCuboidShape(14, 1, 7, 15, 9, 8), + Block.makeCuboidShape(6, 1, 7, 7, 9, 8), Block.makeCuboidShape(6.8, 1.9, 11.9, 7, 3.1, 13.1), + Block.makeCuboidShape(6.8, 1.9, 9.9, 7, 3.1, 11.1), Block.makeCuboidShape(3, 3, 10, 4, 5, 11), + Block.makeCuboidShape(2.9, 4.8, 9.9, 4.1, 5, 11.1), Block.makeCuboidShape(2.9, 4.8, 11.9, 4.1, 5, 13.1), + Block.makeCuboidShape(3, 2, 12, 7, 3, 13), Block.makeCuboidShape(3, 2, 10, 7, 3, 11), + Block.makeCuboidShape(3, 3, 12, 4, 5, 13), Block.makeCuboidShape(2, 5, 9, 5, 11, 14), + Block.makeCuboidShape(2, 11, 11, 4, 12, 13), Block.makeCuboidShape(1, 1, 11, 2, 12, 13) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(8, 11, 8, 9, 14, 13), Block.makeCuboidShape(1, 0, 1, 15, 1, 15), + Block.makeCuboidShape(2, 1, 7, 8, 9, 14), Block.makeCuboidShape(1, 9, 6, 13, 11, 15), + Block.makeCuboidShape(3, 11, 8, 8, 13, 13), Block.makeCuboidShape(11.5, 8, 10, 12.5, 9, 11), + Block.makeCuboidShape(11, 1, 9, 14, 2, 12), Block.makeCuboidShape(10, 2, 9, 11, 7, 12), + Block.makeCuboidShape(14, 2, 9, 15, 7, 12), Block.makeCuboidShape(11, 2, 12, 14, 7, 13), + Block.makeCuboidShape(11, 2, 8, 14, 7, 9), Block.makeCuboidShape(12, 2, 13, 13, 3, 14), + Block.makeCuboidShape(12, 5, 13, 13, 6, 14), Block.makeCuboidShape(12, 3, 14, 13, 5, 15), + Block.makeCuboidShape(10.8, 10.2, 13, 11.8, 11.2, 14), Block.makeCuboidShape(10.8, 10.2, 11, 11.8, 11.2, 12), + Block.makeCuboidShape(2, 11, 13, 9, 14, 14), Block.makeCuboidShape(2, 11, 7, 9, 14, 8), + Block.makeCuboidShape(2, 11, 8, 3, 14, 13), Block.makeCuboidShape(1, 1, 14, 2, 9, 15), + Block.makeCuboidShape(1, 1, 6, 2, 9, 7), Block.makeCuboidShape(8, 1, 14, 9, 9, 15), + Block.makeCuboidShape(8, 1, 6, 9, 9, 7), Block.makeCuboidShape(2.9000000000000004, 1.9, 6.8, 4.1, 3.1, 7), + Block.makeCuboidShape(4.9, 1.9, 6.8, 6.1, 3.1, 7), Block.makeCuboidShape(5, 3, 3, 6, 5, 4), + Block.makeCuboidShape(4.9, 4.8, 2.9000000000000004, 6.1, 5, 4.1), Block.makeCuboidShape(2.9000000000000004, 4.8, 2.9000000000000004, 4.1, 5, 4.1), + Block.makeCuboidShape(3, 2, 3, 4, 3, 7), Block.makeCuboidShape(5, 2, 3, 6, 3, 7), + Block.makeCuboidShape(3, 3, 3, 4, 5, 4), Block.makeCuboidShape(2, 5, 2, 7, 11, 5), + Block.makeCuboidShape(3, 11, 2, 5, 12, 4), Block.makeCuboidShape(3, 1, 1, 5, 12, 2) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(3, 11, 8, 8, 14, 9), Block.makeCuboidShape(1, 0, 1, 15, 1, 15), + Block.makeCuboidShape(2, 1, 2, 9, 9, 8), Block.makeCuboidShape(1, 9, 1, 10, 11, 13), + Block.makeCuboidShape(3, 11, 3, 8, 13, 8), Block.makeCuboidShape(5, 8, 11.5, 6, 9, 12.5), + Block.makeCuboidShape(4, 1, 11, 7, 2, 14), Block.makeCuboidShape(4, 2, 10, 7, 7, 11), + Block.makeCuboidShape(4, 2, 14, 7, 7, 15), Block.makeCuboidShape(3, 2, 11, 4, 7, 14), + Block.makeCuboidShape(7, 2, 11, 8, 7, 14), Block.makeCuboidShape(2, 2, 12, 3, 3, 13), + Block.makeCuboidShape(2, 5, 12, 3, 6, 13), Block.makeCuboidShape(1, 3, 12, 2, 5, 13), + Block.makeCuboidShape(2, 10.2, 10.8, 3, 11.2, 11.8), Block.makeCuboidShape(4, 10.2, 10.8, 5, 11.2, 11.8), + Block.makeCuboidShape(2, 11, 2, 3, 14, 9), Block.makeCuboidShape(8, 11, 2, 9, 14, 9), + Block.makeCuboidShape(3, 11, 2, 8, 14, 3), Block.makeCuboidShape(1, 1, 1, 2, 9, 2), + Block.makeCuboidShape(9, 1, 1, 10, 9, 2), Block.makeCuboidShape(1, 1, 8, 2, 9, 9), + Block.makeCuboidShape(9, 1, 8, 10, 9, 9), Block.makeCuboidShape(9, 1.9, 2.9000000000000004, 9.2, 3.1, 4.1), + Block.makeCuboidShape(9, 1.9, 4.9, 9.2, 3.1, 6.1), Block.makeCuboidShape(12, 3, 5, 13, 5, 6), + Block.makeCuboidShape(11.9, 4.8, 4.9, 13.1, 5, 6.1), Block.makeCuboidShape(11.9, 4.8, 2.9000000000000004, 13.1, 5, 4.1), + Block.makeCuboidShape(9, 2, 3, 13, 3, 4), Block.makeCuboidShape(9, 2, 5, 13, 3, 6), + Block.makeCuboidShape(12, 3, 3, 13, 5, 4), Block.makeCuboidShape(11, 5, 2, 14, 11, 7), + Block.makeCuboidShape(12, 11, 3, 14, 12, 5), Block.makeCuboidShape(14, 1, 3, 15, 12, 5) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(7, 11, 3, 8, 14, 8), Block.makeCuboidShape(1, 0, 1, 15, 1, 15), + Block.makeCuboidShape(8, 1, 2, 14, 9, 9), Block.makeCuboidShape(3, 9, 1, 15, 11, 10), + Block.makeCuboidShape(8, 11, 3, 13, 13, 8), Block.makeCuboidShape(3.5, 8, 5, 4.5, 9, 6), + Block.makeCuboidShape(2, 1, 4, 5, 2, 7), Block.makeCuboidShape(5, 2, 4, 6, 7, 7), + Block.makeCuboidShape(1, 2, 4, 2, 7, 7), Block.makeCuboidShape(2, 2, 3, 5, 7, 4), + Block.makeCuboidShape(2, 2, 7, 5, 7, 8), Block.makeCuboidShape(3, 2, 2, 4, 3, 3), + Block.makeCuboidShape(3, 5, 2, 4, 6, 3), Block.makeCuboidShape(3, 3, 1, 4, 5, 2), + Block.makeCuboidShape(4.199999999999999, 10.2, 2, 5.199999999999999, 11.2, 3), Block.makeCuboidShape(4.199999999999999, 10.2, 4, 5.199999999999999, 11.2, 5), + Block.makeCuboidShape(7, 11, 2, 14, 14, 3), Block.makeCuboidShape(7, 11, 8, 14, 14, 9), + Block.makeCuboidShape(13, 11, 3, 14, 14, 8), Block.makeCuboidShape(14, 1, 1, 15, 9, 2), + Block.makeCuboidShape(14, 1, 9, 15, 9, 10), Block.makeCuboidShape(7, 1, 1, 8, 9, 2), + Block.makeCuboidShape(7, 1, 9, 8, 9, 10), Block.makeCuboidShape(11.9, 1.9, 9, 13.1, 3.1, 9.2), + Block.makeCuboidShape(9.9, 1.9, 9, 11.1, 3.1, 9.2), Block.makeCuboidShape(10, 3, 12, 11, 5, 13), + Block.makeCuboidShape(9.9, 4.8, 11.9, 11.1, 5, 13.1), Block.makeCuboidShape(11.9, 4.8, 11.9, 13.1, 5, 13.1), + Block.makeCuboidShape(12, 2, 9, 13, 3, 13), Block.makeCuboidShape(10, 2, 9, 11, 3, 13), + Block.makeCuboidShape(12, 3, 12, 13, 5, 13), Block.makeCuboidShape(9, 5, 11, 14, 11, 14), + Block.makeCuboidShape(11, 11, 12, 13, 12, 14), Block.makeCuboidShape(11, 1, 14, 13, 12, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java index 36ebcdc1d..da23e4245 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java @@ -1,10 +1,125 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.FullyDirectionalBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class DirectionalBreakerBlock extends FullyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.FACING; -public class DirectionalBreakerBlock extends ActuallyBlock { public DirectionalBreakerBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_U = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 3, 9, 16, 13, 13), + Block.makeCuboidShape(15, 3, 3, 16, 13, 7), Block.makeCuboidShape(0, 3, 9, 1, 13, 13), + Block.makeCuboidShape(0, 3, 3, 1, 13, 7), Block.makeCuboidShape(5, 15, 5, 11, 16, 11), + Block.makeCuboidShape(3, 15, 6, 5, 16, 10), Block.makeCuboidShape(11, 15, 6, 13, 16, 10) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_D = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(15, 3, 3, 16, 13, 7), + Block.makeCuboidShape(15, 3, 9, 16, 13, 13), Block.makeCuboidShape(0, 3, 3, 1, 13, 7), + Block.makeCuboidShape(0, 3, 9, 1, 13, 13), Block.makeCuboidShape(5, 0, 5, 11, 1, 11), + Block.makeCuboidShape(3, 0, 6, 5, 1, 10), Block.makeCuboidShape(11, 0, 6, 13, 1, 10) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(15, 9, 3, 16, 13, 13), + Block.makeCuboidShape(15, 3, 3, 16, 7, 13), Block.makeCuboidShape(0, 9, 3, 1, 13, 13), + Block.makeCuboidShape(0, 3, 3, 1, 7, 13), Block.makeCuboidShape(5, 5, 0, 11, 11, 1), + Block.makeCuboidShape(3, 6, 0, 5, 10, 1), Block.makeCuboidShape(11, 6, 0, 13, 10, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(3, 9, 15, 13, 13, 16), + Block.makeCuboidShape(3, 3, 15, 13, 7, 16), Block.makeCuboidShape(3, 9, 0, 13, 13, 1), + Block.makeCuboidShape(3, 3, 0, 13, 7, 1), Block.makeCuboidShape(15, 5, 5, 16, 11, 11), + Block.makeCuboidShape(15, 6, 3, 16, 10, 5), Block.makeCuboidShape(15, 6, 11, 16, 10, 13) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 9, 3, 1, 13, 13), + Block.makeCuboidShape(0, 3, 3, 1, 7, 13), Block.makeCuboidShape(15, 9, 3, 16, 13, 13), + Block.makeCuboidShape(15, 3, 3, 16, 7, 13), Block.makeCuboidShape(5, 5, 15, 11, 11, 16), + Block.makeCuboidShape(11, 6, 15, 13, 10, 16), Block.makeCuboidShape(3, 6, 15, 5, 10, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(3, 9, 0, 13, 13, 1), + Block.makeCuboidShape(3, 3, 0, 13, 7, 1), Block.makeCuboidShape(3, 9, 15, 13, 13, 16), + Block.makeCuboidShape(3, 3, 15, 13, 7, 16), Block.makeCuboidShape(0, 5, 5, 1, 11, 11), + Block.makeCuboidShape(0, 6, 11, 1, 10, 13), Block.makeCuboidShape(0, 6, 3, 1, 10, 5) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case UP: + return SHAPE_U; + case DOWN: + return SHAPE_D; + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java index 969b8000e..47e7ef5c2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java @@ -1,10 +1,36 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class DisplayStandBlock extends ActuallyBlock { public DisplayStandBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape STAND_SHAPE = Stream.of( + Block.makeCuboidShape(1, 7, 0, 15, 8, 1), Block.makeCuboidShape(0, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 1, 1, 15, 7, 15), Block.makeCuboidShape(6, 7, 6, 10, 9, 10), + Block.makeCuboidShape(0, 1, 0, 1, 7, 1), Block.makeCuboidShape(15, 1, 0, 16, 7, 1), + Block.makeCuboidShape(15, 1, 15, 16, 7, 16), Block.makeCuboidShape(0, 1, 15, 1, 7, 16), + Block.makeCuboidShape(0, 7, 0, 1, 8, 16), Block.makeCuboidShape(15, 7, 0, 16, 8, 16), + Block.makeCuboidShape(1, 7, 15, 15, 8, 16), Block.makeCuboidShape(5, 7, 5, 6, 9, 6), + Block.makeCuboidShape(5, 7, 10, 6, 9, 11), Block.makeCuboidShape(10, 7, 10, 11, 9, 11), + Block.makeCuboidShape(10, 7, 5, 11, 9, 6) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return STAND_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DropperBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DropperBlock.java new file mode 100644 index 000000000..205b9d964 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DropperBlock.java @@ -0,0 +1,116 @@ +package de.ellpeck.actuallyadditions.common.blocks.functional; + +import de.ellpeck.actuallyadditions.common.blocks.FullyDirectionalBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class DropperBlock extends FullyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.FACING; + + public DropperBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_U = Stream.of( + Block.makeCuboidShape(11, 15, 6, 13, 16, 10), Block.makeCuboidShape(3, 15, 6, 5, 16, 10), + Block.makeCuboidShape(5, 15, 5, 11, 16, 11), Block.makeCuboidShape(0, 3, 6, 1, 13, 10), + Block.makeCuboidShape(15, 3, 6, 16, 13, 10), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(1, 1, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_D = Stream.of( + Block.makeCuboidShape(11, 0, 6, 13, 1, 10), Block.makeCuboidShape(3, 0, 6, 5, 1, 10), + Block.makeCuboidShape(5, 0, 5, 11, 1, 11), Block.makeCuboidShape(0, 3, 6, 1, 13, 10), + Block.makeCuboidShape(15, 3, 6, 16, 13, 10), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(1, 1, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(11, 6, 0, 13, 10, 1), Block.makeCuboidShape(3, 6, 0, 5, 10, 1), + Block.makeCuboidShape(5, 5, 0, 11, 11, 1), Block.makeCuboidShape(0, 6, 3, 1, 10, 13), + Block.makeCuboidShape(15, 6, 3, 16, 10, 13), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(1, 1, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(3, 6, 15, 13, 10, 16), + Block.makeCuboidShape(3, 6, 0, 13, 10, 1), Block.makeCuboidShape(15, 5, 5, 16, 11, 11), + Block.makeCuboidShape(15, 6, 3, 16, 10, 5), Block.makeCuboidShape(15, 6, 11, 16, 10, 13) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 6, 3, 1, 10, 13), + Block.makeCuboidShape(15, 6, 3, 16, 10, 13), Block.makeCuboidShape(5, 5, 15, 11, 11, 16), + Block.makeCuboidShape(11, 6, 15, 13, 10, 16), Block.makeCuboidShape(3, 6, 15, 5, 10, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(3, 6, 0, 13, 10, 1), + Block.makeCuboidShape(3, 6, 15, 13, 10, 16), Block.makeCuboidShape(0, 5, 5, 1, 11, 11), + Block.makeCuboidShape(0, 6, 11, 1, 10, 13), Block.makeCuboidShape(0, 6, 3, 1, 10, 5) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case UP: + return SHAPE_U; + case DOWN: + return SHAPE_D; + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java index 3d14cf84a..8a2b219a5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java @@ -1,10 +1,38 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class EmpowererBlock extends ActuallyBlock { public EmpowererBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape EMPOWERER_SHAPE = Stream.of( + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 1, 1, 15, 6, 15), + Block.makeCuboidShape(1, 6, 1, 15, 7, 15), Block.makeCuboidShape(0, 7, 0, 16, 8, 1), + Block.makeCuboidShape(0, 7, 15, 16, 8, 16), Block.makeCuboidShape(0, 7, 1, 1, 8, 15), + Block.makeCuboidShape(15, 7, 1, 16, 8, 15), Block.makeCuboidShape(4, 7, 4, 12, 9, 12), + Block.makeCuboidShape(0, 1, 0, 1, 7, 1), Block.makeCuboidShape(15, 1, 0, 16, 7, 1), + Block.makeCuboidShape(15, 1, 15, 16, 7, 16), Block.makeCuboidShape(0, 1, 15, 1, 7, 16), + Block.makeCuboidShape(3, 7, 4, 4, 8, 5), Block.makeCuboidShape(3, 7, 11, 4, 8, 12), + Block.makeCuboidShape(4, 7, 12, 5, 8, 13), Block.makeCuboidShape(11, 7, 12, 12, 8, 13), + Block.makeCuboidShape(12, 7, 11, 13, 8, 12), Block.makeCuboidShape(12, 7, 4, 13, 8, 5), + Block.makeCuboidShape(11, 7, 3, 12, 8, 4), Block.makeCuboidShape(4, 7, 3, 5, 8, 4) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return EMPOWERER_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java index d8309fb89..c0f323834 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java @@ -1,10 +1,44 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class EnergizerBlock extends ActuallyBlock { public EnergizerBlock(boolean isEnergizer) { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape ENERGIZER_SHAPE = Stream.of( + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(1, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(14, 2, 1, 15, 14, 15), Block.makeCuboidShape(1, 2, 1, 2, 14, 15), + Block.makeCuboidShape(2, 2, 14, 14, 14, 15), Block.makeCuboidShape(2, 2, 1, 14, 14, 2), + Block.makeCuboidShape(9, 3, 0, 13, 4, 1), Block.makeCuboidShape(3, 3, 15, 7, 4, 16), + Block.makeCuboidShape(9, 12, 0, 13, 13, 1), Block.makeCuboidShape(3, 12, 15, 7, 13, 16), + Block.makeCuboidShape(10, 4, 0, 12, 12, 1), Block.makeCuboidShape(4, 4, 15, 6, 12, 16), + Block.makeCuboidShape(0, 3, 3, 1, 4, 7), Block.makeCuboidShape(15, 3, 9, 16, 4, 13), + Block.makeCuboidShape(0, 12, 3, 1, 13, 7), Block.makeCuboidShape(15, 12, 9, 16, 13, 13), + Block.makeCuboidShape(0, 4, 4, 1, 12, 6), Block.makeCuboidShape(15, 4, 10, 16, 12, 12) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return ENERGIZER_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java index d7fae94c0..add5cfaa1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java @@ -1,10 +1,129 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class FarmerBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class FarmerBlock extends ActuallyBlock { public FarmerBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(4, 11, 4, 12, 12, 12), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(3, 12, 5, 4, 14, 11), + Block.makeCuboidShape(12, 12, 5, 13, 14, 11), Block.makeCuboidShape(5, 12, 3, 11, 14, 4), + Block.makeCuboidShape(5, 12, 12, 11, 14, 13), Block.makeCuboidShape(11, 12, 11, 12, 14, 12), + Block.makeCuboidShape(11, 12, 4, 12, 14, 5), Block.makeCuboidShape(4, 12, 4, 5, 14, 5), + Block.makeCuboidShape(4, 12, 11, 5, 14, 12), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(4, 14, 2, 12, 15, 4), Block.makeCuboidShape(4, 14, 12, 12, 15, 14), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 14), Block.makeCuboidShape(14, 0, 2, 15, 15, 14), + Block.makeCuboidShape(1, 0, 1, 5, 15, 2), Block.makeCuboidShape(5, 5, 2, 11, 11, 3), + Block.makeCuboidShape(5, 0, 1, 11, 5, 2), Block.makeCuboidShape(5, 11, 1, 11, 15, 2), + Block.makeCuboidShape(11, 0, 1, 15, 15, 2), Block.makeCuboidShape(1, 0, 14, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(4, 11, 4, 12, 12, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(5, 12, 3, 11, 14, 4), + Block.makeCuboidShape(5, 12, 12, 11, 14, 13), Block.makeCuboidShape(12, 12, 5, 13, 14, 11), + Block.makeCuboidShape(3, 12, 5, 4, 14, 11), Block.makeCuboidShape(4, 12, 11, 5, 14, 12), + Block.makeCuboidShape(11, 12, 11, 12, 14, 12), Block.makeCuboidShape(11, 12, 4, 12, 14, 5), + Block.makeCuboidShape(4, 12, 4, 5, 14, 5), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(2, 14, 2, 14, 15, 4), + Block.makeCuboidShape(12, 14, 4, 14, 15, 12), Block.makeCuboidShape(2, 14, 4, 4, 15, 12), + Block.makeCuboidShape(2, 14, 12, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(2, 0, 1, 14, 15, 2), Block.makeCuboidShape(2, 0, 14, 14, 15, 15), + Block.makeCuboidShape(14, 0, 1, 15, 15, 5), Block.makeCuboidShape(13, 5, 5, 14, 11, 11), + Block.makeCuboidShape(14, 0, 5, 15, 5, 11), Block.makeCuboidShape(14, 11, 5, 15, 15, 11), + Block.makeCuboidShape(14, 0, 11, 15, 15, 15), Block.makeCuboidShape(1, 0, 1, 2, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(4, 11, 4, 12, 12, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(12, 12, 5, 13, 14, 11), + Block.makeCuboidShape(3, 12, 5, 4, 14, 11), Block.makeCuboidShape(5, 12, 12, 11, 14, 13), + Block.makeCuboidShape(5, 12, 3, 11, 14, 4), Block.makeCuboidShape(4, 12, 4, 5, 14, 5), + Block.makeCuboidShape(4, 12, 11, 5, 14, 12), Block.makeCuboidShape(11, 12, 11, 12, 14, 12), + Block.makeCuboidShape(11, 12, 4, 12, 14, 5), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(12, 14, 2, 14, 15, 14), + Block.makeCuboidShape(4, 14, 12, 12, 15, 14), Block.makeCuboidShape(4, 14, 2, 12, 15, 4), + Block.makeCuboidShape(2, 14, 2, 4, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(14, 0, 2, 15, 15, 14), Block.makeCuboidShape(1, 0, 2, 2, 15, 14), + Block.makeCuboidShape(11, 0, 14, 15, 15, 15), Block.makeCuboidShape(5, 5, 13, 11, 11, 14), + Block.makeCuboidShape(5, 0, 14, 11, 5, 15), Block.makeCuboidShape(5, 11, 14, 11, 15, 15), + Block.makeCuboidShape(1, 0, 14, 5, 15, 15), Block.makeCuboidShape(1, 0, 1, 15, 15, 2) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(4, 11, 4, 12, 12, 12), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(5, 12, 12, 11, 14, 13), + Block.makeCuboidShape(5, 12, 3, 11, 14, 4), Block.makeCuboidShape(3, 12, 5, 4, 14, 11), + Block.makeCuboidShape(12, 12, 5, 13, 14, 11), Block.makeCuboidShape(11, 12, 4, 12, 14, 5), + Block.makeCuboidShape(4, 12, 4, 5, 14, 5), Block.makeCuboidShape(4, 12, 11, 5, 14, 12), + Block.makeCuboidShape(11, 12, 11, 12, 14, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(2, 14, 12, 14, 15, 14), + Block.makeCuboidShape(2, 14, 4, 4, 15, 12), Block.makeCuboidShape(12, 14, 4, 14, 15, 12), + Block.makeCuboidShape(2, 14, 2, 14, 15, 4), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(2, 0, 14, 14, 15, 15), Block.makeCuboidShape(2, 0, 1, 14, 15, 2), + Block.makeCuboidShape(1, 0, 11, 2, 15, 15), Block.makeCuboidShape(2, 5, 5, 3, 11, 11), + Block.makeCuboidShape(1, 0, 5, 2, 5, 11), Block.makeCuboidShape(1, 11, 5, 2, 15, 11), + Block.makeCuboidShape(1, 0, 1, 2, 15, 5), Block.makeCuboidShape(14, 0, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java index 01ad0dd16..7a856c7f2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java @@ -1,11 +1,43 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class FeederBlock extends ActuallyBlock { public FeederBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape FEEDER_SHAPE = Stream.of( + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(4, 14, 12, 12, 15, 15), + Block.makeCuboidShape(4, 14, 1, 12, 15, 4), Block.makeCuboidShape(1, 14, 1, 4, 15, 15), + Block.makeCuboidShape(12, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(14, 2, 1, 15, 14, 15), Block.makeCuboidShape(1, 2, 1, 2, 14, 15), + Block.makeCuboidShape(2, 2, 14, 14, 14, 15), Block.makeCuboidShape(2, 2, 1, 14, 14, 2) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return FEEDER_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java index e3edff34c..20b3374ae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java @@ -1,10 +1,45 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class FermentingBarrelBlock extends ActuallyBlock { public FermentingBarrelBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape BARREL_SHAPE = Stream.of( + Block.makeCuboidShape(0, 12, 0, 16, 14, 1), Block.makeCuboidShape(1, 0.5, 1, 15, 15, 15), + Block.makeCuboidShape(0, 2, 15, 16, 4, 16), Block.makeCuboidShape(0, 7, 15, 16, 9, 16), + Block.makeCuboidShape(0, 12, 15, 16, 14, 16), Block.makeCuboidShape(0, 2, 0, 16, 4, 1), + Block.makeCuboidShape(0, 7, 0, 16, 9, 1), Block.makeCuboidShape(0, 2, 1, 1, 4, 15), + Block.makeCuboidShape(0, 7, 1, 1, 9, 15), Block.makeCuboidShape(0, 12, 1, 1, 14, 15), + Block.makeCuboidShape(15, 12, 1, 16, 14, 15), Block.makeCuboidShape(15, 7, 1, 16, 9, 15), + Block.makeCuboidShape(15, 2, 1, 16, 4, 15), Block.makeCuboidShape(7, 0, 0.5, 9, 16, 1.5), + Block.makeCuboidShape(0.5, 0, 7, 1.5, 16, 9), Block.makeCuboidShape(7, 0, 14.5, 9, 16, 15.5), + Block.makeCuboidShape(14.5, 0, 7, 15.5, 16, 9), Block.makeCuboidShape(2, 0, 0.5, 5, 16, 1.5), + Block.makeCuboidShape(0.5, 0, 11, 1.5, 16, 14), Block.makeCuboidShape(2, 0, 14.5, 5, 16, 15.5), + Block.makeCuboidShape(14.5, 0, 11, 15.5, 16, 14), Block.makeCuboidShape(11, 0, 0.5, 14, 16, 1.5), + Block.makeCuboidShape(0.5, 0, 2, 1.5, 16, 5), Block.makeCuboidShape(11, 0, 14.5, 14, 16, 15.5), + Block.makeCuboidShape(14.5, 0, 2, 15.5, 16, 5), Block.makeCuboidShape(4, 15, 7, 6, 15.3, 9), + Block.makeCuboidShape(2, 15, 4, 3, 15.3, 12), Block.makeCuboidShape(4, 15, 13, 12, 15.3, 14), + Block.makeCuboidShape(4, 15, 2, 12, 15.3, 3), Block.makeCuboidShape(13, 15, 4, 14, 15.3, 12), + Block.makeCuboidShape(3, 15, 3, 4, 15.3, 4), Block.makeCuboidShape(3, 15, 12, 4, 15.3, 13), + Block.makeCuboidShape(12, 15, 3, 13, 15.3, 4), Block.makeCuboidShape(12, 15, 12, 13, 15.3, 13) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return BARREL_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java index 4005b6940..6fecc1aac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java @@ -1,10 +1,44 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class FireworkBoxBlock extends ActuallyBlock { public FireworkBoxBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape FIREWORKS_BOX_SHAPE = Stream.of( + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(10, 14, 9, 12, 15, 10), Block.makeCuboidShape(7, 14, 9, 9, 15, 10), + Block.makeCuboidShape(4, 14, 9, 6, 15, 10), Block.makeCuboidShape(10, 14, 6, 12, 15, 7), + Block.makeCuboidShape(7, 14, 6, 9, 15, 7), Block.makeCuboidShape(4, 14, 6, 6, 15, 7), + Block.makeCuboidShape(6, 14, 4, 7, 15, 12), Block.makeCuboidShape(9, 14, 4, 10, 15, 12), + Block.makeCuboidShape(4, 14, 12, 12, 15, 14), Block.makeCuboidShape(4, 14, 2, 12, 15, 4), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(2, 13, 2, 14, 14, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 14), Block.makeCuboidShape(14, 0, 2, 15, 15, 14), + Block.makeCuboidShape(1, 0, 1, 15, 15, 2), Block.makeCuboidShape(1, 0, 14, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return FIREWORKS_BOX_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java index 75935abfd..3d8ca397e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java @@ -1,10 +1,125 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.FullyDirectionalBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class FluidCollectorBlock extends FullyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.FACING; -public class FluidCollectorBlock extends ActuallyBlock { public FluidCollectorBlock(boolean isPlacer) { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_U = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 3, 6, 16, 13, 10), + Block.makeCuboidShape(0, 3, 6, 1, 13, 10), Block.makeCuboidShape(5, 15, 5, 11, 16, 11), + Block.makeCuboidShape(3, 15, 6, 5, 16, 10), Block.makeCuboidShape(11, 15, 6, 13, 16, 10), + Block.makeCuboidShape(6, 15, 11, 10, 16, 13), Block.makeCuboidShape(6, 15, 3, 10, 16, 5) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_D = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(15, 3, 6, 16, 13, 10), + Block.makeCuboidShape(0, 3, 6, 1, 13, 10), Block.makeCuboidShape(5, 0, 5, 11, 1, 11), + Block.makeCuboidShape(3, 0, 6, 5, 1, 10), Block.makeCuboidShape(11, 0, 6, 13, 1, 10), + Block.makeCuboidShape(6, 0, 3, 10, 1, 5), Block.makeCuboidShape(6, 0, 11, 10, 1, 13) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(15, 6, 3, 16, 10, 13), + Block.makeCuboidShape(0, 6, 3, 1, 10, 13), Block.makeCuboidShape(5, 5, 0, 11, 11, 1), + Block.makeCuboidShape(3, 6, 0, 5, 10, 1), Block.makeCuboidShape(11, 6, 0, 13, 10, 1), + Block.makeCuboidShape(6, 11, 0, 10, 13, 1), Block.makeCuboidShape(6, 3, 0, 10, 5, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(3, 6, 15, 13, 10, 16), + Block.makeCuboidShape(3, 6, 0, 13, 10, 1), Block.makeCuboidShape(15, 5, 5, 16, 11, 11), + Block.makeCuboidShape(15, 6, 3, 16, 10, 5), Block.makeCuboidShape(15, 6, 11, 16, 10, 13), + Block.makeCuboidShape(15, 11, 6, 16, 13, 10), Block.makeCuboidShape(15, 3, 6, 16, 5, 10) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 6, 3, 1, 10, 13), + Block.makeCuboidShape(15, 6, 3, 16, 10, 13), Block.makeCuboidShape(5, 5, 15, 11, 11, 16), + Block.makeCuboidShape(11, 6, 15, 13, 10, 16), Block.makeCuboidShape(3, 6, 15, 5, 10, 16), + Block.makeCuboidShape(6, 11, 15, 10, 13, 16), Block.makeCuboidShape(6, 3, 15, 10, 5, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(1, 1, 1, 15, 15, 15), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(3, 6, 0, 13, 10, 1), + Block.makeCuboidShape(3, 6, 15, 13, 10, 16), Block.makeCuboidShape(0, 5, 5, 1, 11, 11), + Block.makeCuboidShape(0, 6, 11, 1, 10, 13), Block.makeCuboidShape(0, 6, 3, 1, 10, 5), + Block.makeCuboidShape(0, 11, 6, 1, 13, 10), Block.makeCuboidShape(0, 3, 6, 1, 5, 10) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case UP: + return SHAPE_U; + case DOWN: + return SHAPE_D; + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java index 582b13262..0d33d7604 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java @@ -1,10 +1,105 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class FurnaceDoubleBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class FurnaceDoubleBlock extends ActuallyBlock { public FurnaceDoubleBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(5, 14, 6, 11, 15, 7), + Block.makeCuboidShape(5, 14, 8, 11, 15, 9), Block.makeCuboidShape(5, 14, 10, 11, 15, 14), + Block.makeCuboidShape(5, 14, 2, 11, 15, 5), Block.makeCuboidShape(11, 14, 2, 14, 15, 14), + Block.makeCuboidShape(2, 14, 2, 5, 15, 14), Block.makeCuboidShape(1, 1, 2, 2, 15, 14), + Block.makeCuboidShape(14, 1, 2, 15, 15, 14), Block.makeCuboidShape(1, 1, 14, 15, 15, 15), + Block.makeCuboidShape(7, 3, 1, 9, 7, 2), Block.makeCuboidShape(3, 7, 1, 13, 15, 2), + Block.makeCuboidShape(3, 1, 1, 13, 3, 2), Block.makeCuboidShape(1, 1, 1, 3, 15, 2), + Block.makeCuboidShape(13, 1, 1, 15, 15, 2), Block.makeCuboidShape(5, 13, 5, 11, 14, 10), + Block.makeCuboidShape(2, 3, 2, 14, 8, 3) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(9, 14, 5, 10, 15, 11), + Block.makeCuboidShape(7, 14, 5, 8, 15, 11), Block.makeCuboidShape(2, 14, 5, 6, 15, 11), + Block.makeCuboidShape(11, 14, 5, 14, 15, 11), Block.makeCuboidShape(2, 14, 11, 14, 15, 14), + Block.makeCuboidShape(2, 14, 2, 14, 15, 5), Block.makeCuboidShape(2, 1, 1, 14, 15, 2), + Block.makeCuboidShape(2, 1, 14, 14, 15, 15), Block.makeCuboidShape(1, 1, 1, 2, 15, 15), + Block.makeCuboidShape(14, 3, 7, 15, 7, 9), Block.makeCuboidShape(14, 7, 3, 15, 15, 13), + Block.makeCuboidShape(14, 1, 3, 15, 3, 13), Block.makeCuboidShape(14, 1, 1, 15, 15, 3), + Block.makeCuboidShape(14, 1, 13, 15, 15, 15), Block.makeCuboidShape(6, 13, 5, 11, 14, 11), + Block.makeCuboidShape(13, 3, 2, 14, 8, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(5, 14, 9, 11, 15, 10), + Block.makeCuboidShape(5, 14, 7, 11, 15, 8), Block.makeCuboidShape(5, 14, 2, 11, 15, 6), + Block.makeCuboidShape(5, 14, 11, 11, 15, 14), Block.makeCuboidShape(2, 14, 2, 5, 15, 14), + Block.makeCuboidShape(11, 14, 2, 14, 15, 14), Block.makeCuboidShape(14, 1, 2, 15, 15, 14), + Block.makeCuboidShape(1, 1, 2, 2, 15, 14), Block.makeCuboidShape(1, 1, 1, 15, 15, 2), + Block.makeCuboidShape(7, 3, 14, 9, 7, 15), Block.makeCuboidShape(3, 7, 14, 13, 15, 15), + Block.makeCuboidShape(3, 1, 14, 13, 3, 15), Block.makeCuboidShape(13, 1, 14, 15, 15, 15), + Block.makeCuboidShape(1, 1, 14, 3, 15, 15), Block.makeCuboidShape(5, 13, 6, 11, 14, 11), + Block.makeCuboidShape(2, 3, 13, 14, 8, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(6, 14, 5, 7, 15, 11), + Block.makeCuboidShape(8, 14, 5, 9, 15, 11), Block.makeCuboidShape(10, 14, 5, 14, 15, 11), + Block.makeCuboidShape(2, 14, 5, 5, 15, 11), Block.makeCuboidShape(2, 14, 2, 14, 15, 5), + Block.makeCuboidShape(2, 14, 11, 14, 15, 14), Block.makeCuboidShape(2, 1, 14, 14, 15, 15), + Block.makeCuboidShape(2, 1, 1, 14, 15, 2), Block.makeCuboidShape(14, 1, 1, 15, 15, 15), + Block.makeCuboidShape(1, 3, 7, 2, 7, 9), Block.makeCuboidShape(1, 7, 3, 2, 15, 13), + Block.makeCuboidShape(1, 1, 3, 2, 3, 13), Block.makeCuboidShape(1, 1, 13, 2, 15, 15), + Block.makeCuboidShape(1, 1, 1, 2, 15, 3), Block.makeCuboidShape(5, 13, 5, 10, 14, 11), + Block.makeCuboidShape(2, 3, 2, 3, 8, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSingleBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSingleBlock.java new file mode 100644 index 000000000..86210f589 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSingleBlock.java @@ -0,0 +1,101 @@ +package de.ellpeck.actuallyadditions.common.blocks.functional; + +import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class FurnaceSingleBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; + + public FurnaceSingleBlock() { + super(Properties.create(Material.ROCK)); + } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(5, 14, 6, 11, 15, 7), + Block.makeCuboidShape(5, 14, 8, 11, 15, 9), Block.makeCuboidShape(5, 14, 10, 11, 15, 14), + Block.makeCuboidShape(5, 14, 2, 11, 15, 5), Block.makeCuboidShape(11, 14, 2, 14, 15, 14), + Block.makeCuboidShape(2, 14, 2, 5, 15, 14), Block.makeCuboidShape(1, 1, 2, 2, 15, 14), + Block.makeCuboidShape(14, 1, 2, 15, 15, 14), Block.makeCuboidShape(1, 1, 14, 15, 15, 15), + Block.makeCuboidShape(3, 7, 1, 13, 15, 2), Block.makeCuboidShape(3, 1, 1, 13, 3, 2), + Block.makeCuboidShape(1, 1, 1, 3, 15, 2), Block.makeCuboidShape(13, 1, 1, 15, 15, 2), + Block.makeCuboidShape(5, 13, 5, 11, 14, 10), Block.makeCuboidShape(2, 3, 2, 14, 8, 3) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(9, 14, 5, 10, 15, 11), + Block.makeCuboidShape(7, 14, 5, 8, 15, 11), Block.makeCuboidShape(2, 14, 5, 6, 15, 11), + Block.makeCuboidShape(11, 14, 5, 14, 15, 11), Block.makeCuboidShape(2, 14, 11, 14, 15, 14), + Block.makeCuboidShape(2, 14, 2, 14, 15, 5), Block.makeCuboidShape(2, 1, 1, 14, 15, 2), + Block.makeCuboidShape(2, 1, 14, 14, 15, 15), Block.makeCuboidShape(1, 1, 1, 2, 15, 15), + Block.makeCuboidShape(14, 7, 3, 15, 15, 13), Block.makeCuboidShape(14, 1, 3, 15, 3, 13), + Block.makeCuboidShape(14, 1, 1, 15, 15, 3), Block.makeCuboidShape(14, 1, 13, 15, 15, 15), + Block.makeCuboidShape(6, 13, 5, 11, 14, 11), Block.makeCuboidShape(13, 3, 2, 14, 8, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(5, 14, 9, 11, 15, 10), + Block.makeCuboidShape(5, 14, 7, 11, 15, 8), Block.makeCuboidShape(5, 14, 2, 11, 15, 6), + Block.makeCuboidShape(5, 14, 11, 11, 15, 14), Block.makeCuboidShape(2, 14, 2, 5, 15, 14), + Block.makeCuboidShape(11, 14, 2, 14, 15, 14), Block.makeCuboidShape(14, 1, 2, 15, 15, 14), + Block.makeCuboidShape(1, 1, 2, 2, 15, 14), Block.makeCuboidShape(1, 1, 1, 15, 15, 2), + Block.makeCuboidShape(3, 7, 14, 13, 15, 15), Block.makeCuboidShape(3, 1, 14, 13, 3, 15), + Block.makeCuboidShape(13, 1, 14, 15, 15, 15), Block.makeCuboidShape(1, 1, 14, 3, 15, 15), + Block.makeCuboidShape(5, 13, 6, 11, 14, 11), Block.makeCuboidShape(2, 3, 13, 14, 8, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(0, 0, 0, 16, 1, 16), Block.makeCuboidShape(6, 14, 5, 7, 15, 11), + Block.makeCuboidShape(8, 14, 5, 9, 15, 11), Block.makeCuboidShape(10, 14, 5, 14, 15, 11), + Block.makeCuboidShape(2, 14, 5, 5, 15, 11), Block.makeCuboidShape(2, 14, 2, 14, 15, 5), + Block.makeCuboidShape(2, 14, 11, 14, 15, 14), Block.makeCuboidShape(2, 1, 14, 14, 15, 15), + Block.makeCuboidShape(2, 1, 1, 14, 15, 2), Block.makeCuboidShape(14, 1, 1, 15, 15, 15), + Block.makeCuboidShape(1, 7, 3, 2, 15, 13), Block.makeCuboidShape(1, 1, 3, 2, 3, 13), + Block.makeCuboidShape(1, 1, 13, 2, 15, 15), Block.makeCuboidShape(1, 1, 1, 2, 15, 3), + Block.makeCuboidShape(5, 13, 5, 10, 14, 11), Block.makeCuboidShape(2, 3, 2, 3, 8, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java index d1dd1db8b..7f062a5dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java @@ -1,10 +1,36 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class GreenhouseGlassBlock extends ActuallyBlock { public GreenhouseGlassBlock() { - super(Properties.create(Material.ROCK)); + super(Properties.create(Material.GLASS)); + } + + private static final VoxelShape GLASS_SHAPE = Stream.of( + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(1, 1, 1, 15, 15, 15), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return GLASS_SHAPE; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java index 40b0aa2af..0d850a455 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java @@ -1,10 +1,141 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class GrinderBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class GrinderBlock extends ActuallyBlock { public GrinderBlock(boolean isDouble) { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(14, 12, 4, 15, 15, 12), + Block.makeCuboidShape(1, 0, 4, 2, 4, 12), Block.makeCuboidShape(14, 0, 4, 15, 4, 12), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(3, 12, 5, 4, 14, 11), + Block.makeCuboidShape(12, 12, 5, 13, 14, 11), Block.makeCuboidShape(5, 12, 3, 11, 14, 4), + Block.makeCuboidShape(5, 12, 12, 11, 14, 13), Block.makeCuboidShape(11, 12, 11, 12, 14, 12), + Block.makeCuboidShape(11, 12, 4, 12, 14, 5), Block.makeCuboidShape(4, 12, 4, 5, 14, 5), + Block.makeCuboidShape(4, 12, 11, 5, 14, 12), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(4, 14, 2, 12, 15, 4), Block.makeCuboidShape(4, 14, 12, 12, 15, 14), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 4), Block.makeCuboidShape(14, 0, 2, 15, 15, 4), + Block.makeCuboidShape(1, 0, 12, 2, 15, 14), Block.makeCuboidShape(14, 0, 12, 15, 15, 14), + Block.makeCuboidShape(1, 0, 1, 15, 15, 2), Block.makeCuboidShape(1, 0, 14, 15, 15, 15), + Block.makeCuboidShape(13, 4, 4, 14, 12, 12), Block.makeCuboidShape(2, 4, 4, 3, 12, 12), + Block.makeCuboidShape(3, 8, 0, 6, 10, 1), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(1, 12, 4, 2, 15, 12), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(4, 12, 14, 12, 15, 15), + Block.makeCuboidShape(4, 0, 1, 12, 4, 2), Block.makeCuboidShape(4, 0, 14, 12, 4, 15), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(5, 12, 3, 11, 14, 4), + Block.makeCuboidShape(5, 12, 12, 11, 14, 13), Block.makeCuboidShape(12, 12, 5, 13, 14, 11), + Block.makeCuboidShape(3, 12, 5, 4, 14, 11), Block.makeCuboidShape(4, 12, 11, 5, 14, 12), + Block.makeCuboidShape(11, 12, 11, 12, 14, 12), Block.makeCuboidShape(11, 12, 4, 12, 14, 5), + Block.makeCuboidShape(4, 12, 4, 5, 14, 5), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(2, 14, 2, 14, 15, 4), + Block.makeCuboidShape(12, 14, 4, 14, 15, 12), Block.makeCuboidShape(2, 14, 4, 4, 15, 12), + Block.makeCuboidShape(2, 14, 12, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(12, 0, 1, 14, 15, 2), Block.makeCuboidShape(12, 0, 14, 14, 15, 15), + Block.makeCuboidShape(2, 0, 1, 4, 15, 2), Block.makeCuboidShape(2, 0, 14, 4, 15, 15), + Block.makeCuboidShape(14, 0, 1, 15, 15, 15), Block.makeCuboidShape(1, 0, 1, 2, 15, 15), + Block.makeCuboidShape(4, 4, 13, 12, 12, 14), Block.makeCuboidShape(4, 4, 2, 12, 12, 3), + Block.makeCuboidShape(15, 8, 3, 16, 10, 6), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(4, 12, 1, 12, 15, 2), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 12, 4, 2, 15, 12), + Block.makeCuboidShape(14, 0, 4, 15, 4, 12), Block.makeCuboidShape(1, 0, 4, 2, 4, 12), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(12, 12, 5, 13, 14, 11), + Block.makeCuboidShape(3, 12, 5, 4, 14, 11), Block.makeCuboidShape(5, 12, 12, 11, 14, 13), + Block.makeCuboidShape(5, 12, 3, 11, 14, 4), Block.makeCuboidShape(4, 12, 4, 5, 14, 5), + Block.makeCuboidShape(4, 12, 11, 5, 14, 12), Block.makeCuboidShape(11, 12, 11, 12, 14, 12), + Block.makeCuboidShape(11, 12, 4, 12, 14, 5), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(12, 14, 2, 14, 15, 14), + Block.makeCuboidShape(4, 14, 12, 12, 15, 14), Block.makeCuboidShape(4, 14, 2, 12, 15, 4), + Block.makeCuboidShape(2, 14, 2, 4, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(14, 0, 12, 15, 15, 14), Block.makeCuboidShape(1, 0, 12, 2, 15, 14), + Block.makeCuboidShape(14, 0, 2, 15, 15, 4), Block.makeCuboidShape(1, 0, 2, 2, 15, 4), + Block.makeCuboidShape(1, 0, 14, 15, 15, 15), Block.makeCuboidShape(1, 0, 1, 15, 15, 2), + Block.makeCuboidShape(2, 4, 4, 3, 12, 12), Block.makeCuboidShape(13, 4, 4, 14, 12, 12), + Block.makeCuboidShape(10, 8, 15, 13, 10, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(14, 12, 4, 15, 15, 12), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(4, 12, 1, 12, 15, 2), + Block.makeCuboidShape(4, 0, 14, 12, 4, 15), Block.makeCuboidShape(4, 0, 1, 12, 4, 2), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(5, 12, 12, 11, 14, 13), + Block.makeCuboidShape(5, 12, 3, 11, 14, 4), Block.makeCuboidShape(3, 12, 5, 4, 14, 11), + Block.makeCuboidShape(12, 12, 5, 13, 14, 11), Block.makeCuboidShape(11, 12, 4, 12, 14, 5), + Block.makeCuboidShape(4, 12, 4, 5, 14, 5), Block.makeCuboidShape(4, 12, 11, 5, 14, 12), + Block.makeCuboidShape(11, 12, 11, 12, 14, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(2, 14, 12, 14, 15, 14), + Block.makeCuboidShape(2, 14, 4, 4, 15, 12), Block.makeCuboidShape(12, 14, 4, 14, 15, 12), + Block.makeCuboidShape(2, 14, 2, 14, 15, 4), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(2, 0, 14, 4, 15, 15), Block.makeCuboidShape(2, 0, 1, 4, 15, 2), + Block.makeCuboidShape(12, 0, 14, 14, 15, 15), Block.makeCuboidShape(12, 0, 1, 14, 15, 2), + Block.makeCuboidShape(1, 0, 1, 2, 15, 15), Block.makeCuboidShape(14, 0, 1, 15, 15, 15), + Block.makeCuboidShape(4, 4, 2, 12, 12, 3), Block.makeCuboidShape(4, 4, 13, 12, 12, 14), + Block.makeCuboidShape(0, 8, 10, 1, 10, 13), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(4, 12, 14, 12, 15, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java index 392c6ea60..4d40e16a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java @@ -1,10 +1,50 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class HeatCollectorBlock extends ActuallyBlock { public HeatCollectorBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape HEAT_COLLECTOR_SHAPE = Stream.of( + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(15, 11, 4, 16, 12, 12), + Block.makeCuboidShape(15, 5, 4, 16, 6, 12), Block.makeCuboidShape(15, 7, 4, 16, 8, 12), + Block.makeCuboidShape(15, 9, 4, 16, 10, 12), Block.makeCuboidShape(4, 11, 15, 12, 12, 16), + Block.makeCuboidShape(4, 9, 15, 12, 10, 16), Block.makeCuboidShape(4, 7, 15, 12, 8, 16), + Block.makeCuboidShape(4, 5, 15, 12, 6, 16), Block.makeCuboidShape(0, 11, 4, 1, 12, 12), + Block.makeCuboidShape(0, 5, 4, 1, 6, 12), Block.makeCuboidShape(0, 7, 4, 1, 8, 12), + Block.makeCuboidShape(0, 9, 4, 1, 10, 12), Block.makeCuboidShape(4, 11, 0, 12, 12, 1), + Block.makeCuboidShape(4, 9, 0, 12, 10, 1), Block.makeCuboidShape(4, 7, 0, 12, 8, 1), + Block.makeCuboidShape(4, 5, 0, 12, 6, 1), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(4, 14, 2, 12, 15, 4), Block.makeCuboidShape(4, 14, 12, 12, 15, 14), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 14), Block.makeCuboidShape(14, 0, 2, 15, 15, 14), + Block.makeCuboidShape(1, 0, 1, 15, 15, 2), Block.makeCuboidShape(1, 0, 14, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return HEAT_COLLECTOR_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java index 1aeab0376..2af7e05ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java @@ -1,10 +1,36 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class ItemViewerBlock extends ActuallyBlock { public ItemViewerBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape ITEM_VIEWER_SHAPE = Stream.of( + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(1, 1, 1, 15, 15, 15), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return ITEM_VIEWER_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java index 2ea65fc51..00ca7900d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java @@ -1,10 +1,36 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class ItemViewerHoppingBlock extends ActuallyBlock { public ItemViewerHoppingBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape HOPPING_ITEM_VIEWER_SHAPE = Stream.of( + Block.makeCuboidShape(0, 10, 0, 16, 11, 16), Block.makeCuboidShape(1, 11, 1, 2, 15, 15), + Block.makeCuboidShape(14, 11, 1, 15, 15, 15), Block.makeCuboidShape(2, 11, 1, 14, 15, 2), + Block.makeCuboidShape(2, 11, 14, 14, 15, 15), Block.makeCuboidShape(4, 4, 4, 12, 10, 12), + Block.makeCuboidShape(6, 0, 6, 10, 4, 10), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 11, 0, 1, 15, 1), + Block.makeCuboidShape(0, 11, 15, 1, 15, 16), Block.makeCuboidShape(15, 11, 15, 16, 15, 16), + Block.makeCuboidShape(15, 11, 0, 16, 15, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return HOPPING_ITEM_VIEWER_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java index 959424efb..9be2799f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java @@ -1,12 +1,97 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class LampPowererBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class LampPowererBlock extends ActuallyBlock { public LampPowererBlock() { super(Properties.create(Material.ROCK)); } + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(3, 3, 15, 13, 13, 16), Block.makeCuboidShape(1, 14, 1, 15, 15, 15), + Block.makeCuboidShape(1, 1, 1, 15, 2, 15), Block.makeCuboidShape(14, 2, 1, 15, 14, 15), + Block.makeCuboidShape(1, 2, 1, 2, 14, 15), Block.makeCuboidShape(2, 2, 14, 14, 14, 15), + Block.makeCuboidShape(2, 2, 1, 14, 14, 2), Block.makeCuboidShape(0, 7, 7, 1, 9, 10), + Block.makeCuboidShape(15, 7, 6, 16, 9, 9) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 3, 3, 1, 13, 13), Block.makeCuboidShape(1, 14, 1, 15, 15, 15), + Block.makeCuboidShape(1, 1, 1, 15, 2, 15), Block.makeCuboidShape(1, 2, 14, 15, 14, 15), + Block.makeCuboidShape(1, 2, 1, 15, 14, 2), Block.makeCuboidShape(1, 2, 2, 2, 14, 14), + Block.makeCuboidShape(14, 2, 2, 15, 14, 14), Block.makeCuboidShape(6, 7, 0, 9, 9, 1), + Block.makeCuboidShape(7, 7, 15, 10, 9, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(3, 3, 0, 13, 13, 1), Block.makeCuboidShape(1, 14, 1, 15, 15, 15), + Block.makeCuboidShape(1, 1, 1, 15, 2, 15), Block.makeCuboidShape(1, 2, 1, 2, 14, 15), + Block.makeCuboidShape(14, 2, 1, 15, 14, 15), Block.makeCuboidShape(2, 2, 1, 14, 14, 2), + Block.makeCuboidShape(2, 2, 14, 14, 14, 15), Block.makeCuboidShape(15, 7, 6, 16, 9, 9), + Block.makeCuboidShape(0, 7, 7, 1, 9, 10) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 3, 3, 16, 13, 13), Block.makeCuboidShape(1, 14, 1, 15, 15, 15), + Block.makeCuboidShape(1, 1, 1, 15, 2, 15), Block.makeCuboidShape(1, 2, 1, 15, 14, 2), + Block.makeCuboidShape(1, 2, 14, 15, 14, 15), Block.makeCuboidShape(14, 2, 2, 15, 14, 14), + Block.makeCuboidShape(1, 2, 2, 2, 14, 14), Block.makeCuboidShape(7, 7, 15, 10, 9, 16), + Block.makeCuboidShape(6, 7, 0, 9, 9, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java index 9d8254ef1..f1c2f151d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java @@ -2,10 +2,44 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class LaserRelayBlock extends ActuallyBlock { public LaserRelayBlock(LaserRelays relayType) { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape RELAY_SHAPE = Stream.of( + Block.makeCuboidShape(6, 4, 6, 7, 6, 7), Block.makeCuboidShape(1, 0, 1, 15, 1, 15), + Block.makeCuboidShape(4, 2, 4, 12, 4, 12), Block.makeCuboidShape(9, 4, 9, 10, 6, 10), + Block.makeCuboidShape(6, 4, 9, 7, 6, 10), Block.makeCuboidShape(3, 1, 12, 4, 5, 13), + Block.makeCuboidShape(12, 1, 12, 13, 5, 13), Block.makeCuboidShape(3, 1, 3, 4, 5, 4), + Block.makeCuboidShape(12, 1, 3, 13, 5, 4), Block.makeCuboidShape(3, 4, 4, 4, 5, 12), + Block.makeCuboidShape(3, 1, 4, 4, 2, 12), Block.makeCuboidShape(12, 4, 4, 13, 5, 12), + Block.makeCuboidShape(12, 1, 4, 13, 2, 12), Block.makeCuboidShape(4, 4, 12, 12, 5, 13), + Block.makeCuboidShape(4, 4, 3, 12, 5, 4), Block.makeCuboidShape(4, 1, 12, 12, 2, 13), + Block.makeCuboidShape(4, 1, 3, 12, 2, 4), Block.makeCuboidShape(9, 4, 6, 10, 6, 7), + Block.makeCuboidShape(7, 4, 7, 9, 6, 9), Block.makeCuboidShape(7, 6, 7, 9, 10, 9), + Block.makeCuboidShape(6.5, 5, 7, 7, 6, 9), Block.makeCuboidShape(6.5, 7, 7, 7, 7.5, 9), + Block.makeCuboidShape(6.5, 9, 7, 7, 9.5, 9), Block.makeCuboidShape(9, 5, 7, 9.5, 6, 9), + Block.makeCuboidShape(9, 7, 7, 9.5, 7.5, 9), Block.makeCuboidShape(9, 9, 7, 9.5, 9.5, 9), + Block.makeCuboidShape(7, 5, 6.5, 9, 6, 7), Block.makeCuboidShape(7, 7, 6.5, 9, 7.5, 7), + Block.makeCuboidShape(7, 9, 6.5, 9, 9.5, 7), Block.makeCuboidShape(7, 5, 9, 9, 6, 9.5), + Block.makeCuboidShape(7, 7, 9, 9, 7.5, 9.5), Block.makeCuboidShape(7, 9, 9, 9, 9.5, 9.5) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return RELAY_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java index f9dc51aa9..de2e5092a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java @@ -1,10 +1,113 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class LavaFactoryControllerBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class LavaFactoryControllerBlock extends ActuallyBlock { public LavaFactoryControllerBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(12, 15, 5, 13, 16, 11), Block.makeCuboidShape(3, 15, 5, 4, 16, 11), + Block.makeCuboidShape(11, 14, 11, 12, 16, 12), Block.makeCuboidShape(11, 14, 4, 12, 16, 5), + Block.makeCuboidShape(4, 14, 11, 5, 16, 12), Block.makeCuboidShape(4, 14, 4, 5, 16, 5), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(4, 14, 12, 12, 15, 15), + Block.makeCuboidShape(4, 14, 1, 12, 15, 4), Block.makeCuboidShape(1, 14, 1, 4, 15, 15), + Block.makeCuboidShape(12, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(14, 2, 1, 15, 14, 15), Block.makeCuboidShape(1, 2, 1, 2, 14, 15), + Block.makeCuboidShape(2, 2, 14, 14, 14, 15), Block.makeCuboidShape(2, 2, 1, 14, 14, 2), + Block.makeCuboidShape(5, 15, 3, 11, 16, 4), Block.makeCuboidShape(5, 15, 12, 11, 16, 13) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 0, 1, 1, 1, 15), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(5, 15, 12, 11, 16, 13), Block.makeCuboidShape(5, 15, 3, 11, 16, 4), + Block.makeCuboidShape(4, 14, 11, 5, 16, 12), Block.makeCuboidShape(11, 14, 11, 12, 16, 12), + Block.makeCuboidShape(4, 14, 4, 5, 16, 5), Block.makeCuboidShape(11, 14, 4, 12, 16, 5), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(1, 14, 4, 4, 15, 12), + Block.makeCuboidShape(12, 14, 4, 15, 15, 12), Block.makeCuboidShape(1, 14, 1, 15, 15, 4), + Block.makeCuboidShape(1, 14, 12, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(1, 2, 14, 15, 14, 15), Block.makeCuboidShape(1, 2, 1, 15, 14, 2), + Block.makeCuboidShape(1, 2, 2, 2, 14, 14), Block.makeCuboidShape(14, 2, 2, 15, 14, 14), + Block.makeCuboidShape(12, 15, 5, 13, 16, 11), Block.makeCuboidShape(3, 15, 5, 4, 16, 11) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(3, 15, 5, 4, 16, 11), Block.makeCuboidShape(12, 15, 5, 13, 16, 11), + Block.makeCuboidShape(4, 14, 4, 5, 16, 5), Block.makeCuboidShape(4, 14, 11, 5, 16, 12), + Block.makeCuboidShape(11, 14, 4, 12, 16, 5), Block.makeCuboidShape(11, 14, 11, 12, 16, 12), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(4, 14, 1, 12, 15, 4), + Block.makeCuboidShape(4, 14, 12, 12, 15, 15), Block.makeCuboidShape(12, 14, 1, 15, 15, 15), + Block.makeCuboidShape(1, 14, 1, 4, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(1, 2, 1, 2, 14, 15), Block.makeCuboidShape(14, 2, 1, 15, 14, 15), + Block.makeCuboidShape(2, 2, 1, 14, 14, 2), Block.makeCuboidShape(2, 2, 14, 14, 14, 15), + Block.makeCuboidShape(5, 15, 12, 11, 16, 13), Block.makeCuboidShape(5, 15, 3, 11, 16, 4) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 0, 15, 16, 1, 16), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 0, 1, 16, 1, 15), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(5, 15, 3, 11, 16, 4), Block.makeCuboidShape(5, 15, 12, 11, 16, 13), + Block.makeCuboidShape(11, 14, 4, 12, 16, 5), Block.makeCuboidShape(4, 14, 4, 5, 16, 5), + Block.makeCuboidShape(11, 14, 11, 12, 16, 12), Block.makeCuboidShape(4, 14, 11, 5, 16, 12), + Block.makeCuboidShape(4, 13, 4, 12, 14, 12), Block.makeCuboidShape(12, 14, 4, 15, 15, 12), + Block.makeCuboidShape(1, 14, 4, 4, 15, 12), Block.makeCuboidShape(1, 14, 12, 15, 15, 15), + Block.makeCuboidShape(1, 14, 1, 15, 15, 4), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(1, 2, 1, 15, 14, 2), Block.makeCuboidShape(1, 2, 14, 15, 14, 15), + Block.makeCuboidShape(14, 2, 2, 15, 14, 14), Block.makeCuboidShape(1, 2, 2, 2, 14, 14), + Block.makeCuboidShape(3, 15, 5, 4, 16, 11), Block.makeCuboidShape(12, 15, 5, 13, 16, 11) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java index 345fff034..a81643f0a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java @@ -1,10 +1,145 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class LeafGeneratorBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class LeafGeneratorBlock extends ActuallyBlock { public LeafGeneratorBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(1, 0, 14, 15, 15, 15), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(5, 11, 0, 11, 12, 1), + Block.makeCuboidShape(0, 11, 5, 1, 12, 11), Block.makeCuboidShape(15, 11, 5, 16, 12, 11), + Block.makeCuboidShape(5, 4, 0, 11, 5, 1), Block.makeCuboidShape(0, 4, 5, 1, 5, 11), + Block.makeCuboidShape(15, 4, 5, 16, 5, 11), Block.makeCuboidShape(4, 4, 0, 5, 12, 1), + Block.makeCuboidShape(0, 4, 4, 1, 12, 5), Block.makeCuboidShape(15, 4, 4, 16, 12, 5), + Block.makeCuboidShape(11, 4, 0, 12, 12, 1), Block.makeCuboidShape(0, 4, 11, 1, 12, 12), + Block.makeCuboidShape(15, 4, 11, 16, 12, 12), Block.makeCuboidShape(4, 13, 4, 12, 14, 12), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(4, 14, 12, 12, 15, 14), + Block.makeCuboidShape(4, 14, 2, 12, 15, 4), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(1, 0, 1, 15, 15, 2), + Block.makeCuboidShape(1, 0, 2, 2, 5, 14), Block.makeCuboidShape(2, 1, 2, 3, 14, 14), + Block.makeCuboidShape(1, 11, 2, 2, 15, 14), Block.makeCuboidShape(1, 5, 2, 2, 11, 5), + Block.makeCuboidShape(1, 5, 11, 2, 11, 14), Block.makeCuboidShape(13, 1, 2, 14, 14, 14), + Block.makeCuboidShape(14, 11, 2, 15, 15, 14), Block.makeCuboidShape(14, 5, 11, 15, 11, 14), + Block.makeCuboidShape(14, 5, 2, 15, 11, 5), Block.makeCuboidShape(14, 0, 2, 15, 5, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(1, 0, 1, 2, 15, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 11, 5, 16, 12, 11), + Block.makeCuboidShape(5, 11, 0, 11, 12, 1), Block.makeCuboidShape(5, 11, 15, 11, 12, 16), + Block.makeCuboidShape(15, 4, 5, 16, 5, 11), Block.makeCuboidShape(5, 4, 0, 11, 5, 1), + Block.makeCuboidShape(5, 4, 15, 11, 5, 16), Block.makeCuboidShape(15, 4, 4, 16, 12, 5), + Block.makeCuboidShape(11, 4, 0, 12, 12, 1), Block.makeCuboidShape(11, 4, 15, 12, 12, 16), + Block.makeCuboidShape(15, 4, 11, 16, 12, 12), Block.makeCuboidShape(4, 4, 0, 5, 12, 1), + Block.makeCuboidShape(4, 4, 15, 5, 12, 16), Block.makeCuboidShape(4, 13, 4, 12, 14, 12), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(2, 14, 12, 14, 15, 14), Block.makeCuboidShape(2, 14, 4, 4, 15, 12), + Block.makeCuboidShape(12, 14, 4, 14, 15, 12), Block.makeCuboidShape(2, 14, 2, 14, 15, 4), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(14, 0, 1, 15, 15, 15), + Block.makeCuboidShape(2, 0, 1, 14, 5, 2), Block.makeCuboidShape(2, 1, 2, 14, 14, 3), + Block.makeCuboidShape(2, 11, 1, 14, 15, 2), Block.makeCuboidShape(11, 5, 1, 14, 11, 2), + Block.makeCuboidShape(2, 5, 1, 5, 11, 2), Block.makeCuboidShape(2, 1, 13, 14, 14, 14), + Block.makeCuboidShape(2, 11, 14, 14, 15, 15), Block.makeCuboidShape(2, 5, 14, 5, 11, 15), + Block.makeCuboidShape(11, 5, 14, 14, 11, 15), Block.makeCuboidShape(2, 0, 14, 14, 5, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(1, 0, 1, 15, 15, 2), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(5, 11, 15, 11, 12, 16), + Block.makeCuboidShape(15, 11, 5, 16, 12, 11), Block.makeCuboidShape(0, 11, 5, 1, 12, 11), + Block.makeCuboidShape(5, 4, 15, 11, 5, 16), Block.makeCuboidShape(15, 4, 5, 16, 5, 11), + Block.makeCuboidShape(0, 4, 5, 1, 5, 11), Block.makeCuboidShape(11, 4, 15, 12, 12, 16), + Block.makeCuboidShape(15, 4, 11, 16, 12, 12), Block.makeCuboidShape(0, 4, 11, 1, 12, 12), + Block.makeCuboidShape(4, 4, 15, 5, 12, 16), Block.makeCuboidShape(15, 4, 4, 16, 12, 5), + Block.makeCuboidShape(0, 4, 4, 1, 12, 5), Block.makeCuboidShape(4, 13, 4, 12, 14, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(2, 14, 2, 4, 15, 14), Block.makeCuboidShape(4, 14, 2, 12, 15, 4), + Block.makeCuboidShape(4, 14, 12, 12, 15, 14), Block.makeCuboidShape(12, 14, 2, 14, 15, 14), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(1, 0, 14, 15, 15, 15), + Block.makeCuboidShape(14, 0, 2, 15, 5, 14), Block.makeCuboidShape(13, 1, 2, 14, 14, 14), + Block.makeCuboidShape(14, 11, 2, 15, 15, 14), Block.makeCuboidShape(14, 5, 11, 15, 11, 14), + Block.makeCuboidShape(14, 5, 2, 15, 11, 5), Block.makeCuboidShape(2, 1, 2, 3, 14, 14), + Block.makeCuboidShape(1, 11, 2, 2, 15, 14), Block.makeCuboidShape(1, 5, 2, 2, 11, 5), + Block.makeCuboidShape(1, 5, 11, 2, 11, 14), Block.makeCuboidShape(1, 0, 2, 2, 5, 14) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(14, 0, 1, 15, 15, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 11, 5, 1, 12, 11), + Block.makeCuboidShape(5, 11, 15, 11, 12, 16), Block.makeCuboidShape(5, 11, 0, 11, 12, 1), + Block.makeCuboidShape(0, 4, 5, 1, 5, 11), Block.makeCuboidShape(5, 4, 15, 11, 5, 16), + Block.makeCuboidShape(5, 4, 0, 11, 5, 1), Block.makeCuboidShape(0, 4, 11, 1, 12, 12), + Block.makeCuboidShape(4, 4, 15, 5, 12, 16), Block.makeCuboidShape(4, 4, 0, 5, 12, 1), + Block.makeCuboidShape(0, 4, 4, 1, 12, 5), Block.makeCuboidShape(11, 4, 15, 12, 12, 16), + Block.makeCuboidShape(11, 4, 0, 12, 12, 1), Block.makeCuboidShape(4, 13, 4, 12, 14, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(2, 14, 2, 14, 15, 4), Block.makeCuboidShape(12, 14, 4, 14, 15, 12), + Block.makeCuboidShape(2, 14, 4, 4, 15, 12), Block.makeCuboidShape(2, 14, 12, 14, 15, 14), + Block.makeCuboidShape(2, 0, 2, 14, 1, 14), Block.makeCuboidShape(1, 0, 1, 2, 15, 15), + Block.makeCuboidShape(2, 0, 14, 14, 5, 15), Block.makeCuboidShape(2, 1, 13, 14, 14, 14), + Block.makeCuboidShape(2, 11, 14, 14, 15, 15), Block.makeCuboidShape(2, 5, 14, 5, 11, 15), + Block.makeCuboidShape(11, 5, 14, 14, 11, 15), Block.makeCuboidShape(2, 1, 2, 14, 14, 3), + Block.makeCuboidShape(2, 11, 1, 14, 15, 2), Block.makeCuboidShape(11, 5, 1, 14, 11, 2), + Block.makeCuboidShape(2, 5, 1, 5, 11, 2), Block.makeCuboidShape(2, 0, 1, 14, 5, 2) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java index 73ef75366..cf117ec68 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java @@ -1,10 +1,125 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; + +public class MinerBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class MinerBlock extends ActuallyBlock { public MinerBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(15, 3, 3, 16, 13, 13), Block.makeCuboidShape(0, 3, 3, 1, 13, 13), + Block.makeCuboidShape(4, 11, 4, 12, 12, 12), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(3, 12, 5, 4, 14, 11), + Block.makeCuboidShape(12, 12, 5, 13, 14, 11), Block.makeCuboidShape(5, 12, 3, 11, 14, 4), + Block.makeCuboidShape(5, 12, 12, 11, 14, 13), Block.makeCuboidShape(11, 12, 11, 12, 14, 12), + Block.makeCuboidShape(11, 12, 4, 12, 14, 5), Block.makeCuboidShape(4, 12, 4, 5, 14, 5), + Block.makeCuboidShape(4, 12, 11, 5, 14, 12), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(4, 14, 2, 12, 15, 4), Block.makeCuboidShape(4, 14, 12, 12, 15, 14), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 14), Block.makeCuboidShape(14, 0, 2, 15, 15, 14), + Block.makeCuboidShape(1, 0, 1, 15, 15, 2), Block.makeCuboidShape(1, 0, 14, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(3, 3, 15, 13, 13, 16), Block.makeCuboidShape(3, 3, 0, 13, 13, 1), + Block.makeCuboidShape(4, 11, 4, 12, 12, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(5, 12, 3, 11, 14, 4), + Block.makeCuboidShape(5, 12, 12, 11, 14, 13), Block.makeCuboidShape(12, 12, 5, 13, 14, 11), + Block.makeCuboidShape(3, 12, 5, 4, 14, 11), Block.makeCuboidShape(4, 12, 11, 5, 14, 12), + Block.makeCuboidShape(11, 12, 11, 12, 14, 12), Block.makeCuboidShape(11, 12, 4, 12, 14, 5), + Block.makeCuboidShape(4, 12, 4, 5, 14, 5), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(2, 14, 2, 14, 15, 4), + Block.makeCuboidShape(12, 14, 4, 14, 15, 12), Block.makeCuboidShape(2, 14, 4, 4, 15, 12), + Block.makeCuboidShape(2, 14, 12, 14, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(2, 0, 1, 14, 15, 2), Block.makeCuboidShape(2, 0, 14, 14, 15, 15), + Block.makeCuboidShape(14, 0, 1, 15, 15, 15), Block.makeCuboidShape(1, 0, 1, 2, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(0, 3, 3, 1, 13, 13), Block.makeCuboidShape(15, 3, 3, 16, 13, 13), + Block.makeCuboidShape(4, 11, 4, 12, 12, 12), Block.makeCuboidShape(4, 14, 11, 5, 15, 12), + Block.makeCuboidShape(11, 14, 11, 12, 15, 12), Block.makeCuboidShape(12, 12, 5, 13, 14, 11), + Block.makeCuboidShape(3, 12, 5, 4, 14, 11), Block.makeCuboidShape(5, 12, 12, 11, 14, 13), + Block.makeCuboidShape(5, 12, 3, 11, 14, 4), Block.makeCuboidShape(4, 12, 4, 5, 14, 5), + Block.makeCuboidShape(4, 12, 11, 5, 14, 12), Block.makeCuboidShape(11, 12, 11, 12, 14, 12), + Block.makeCuboidShape(11, 12, 4, 12, 14, 5), Block.makeCuboidShape(11, 14, 4, 12, 15, 5), + Block.makeCuboidShape(4, 14, 4, 5, 15, 5), Block.makeCuboidShape(12, 14, 2, 14, 15, 14), + Block.makeCuboidShape(4, 14, 12, 12, 15, 14), Block.makeCuboidShape(4, 14, 2, 12, 15, 4), + Block.makeCuboidShape(2, 14, 2, 4, 15, 14), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(14, 0, 2, 15, 15, 14), Block.makeCuboidShape(1, 0, 2, 2, 15, 14), + Block.makeCuboidShape(1, 0, 14, 15, 15, 15), Block.makeCuboidShape(1, 0, 1, 15, 15, 2) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(0, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(3, 3, 0, 13, 13, 1), Block.makeCuboidShape(3, 3, 15, 13, 13, 16), + Block.makeCuboidShape(4, 11, 4, 12, 12, 12), Block.makeCuboidShape(4, 14, 4, 5, 15, 5), + Block.makeCuboidShape(4, 14, 11, 5, 15, 12), Block.makeCuboidShape(5, 12, 12, 11, 14, 13), + Block.makeCuboidShape(5, 12, 3, 11, 14, 4), Block.makeCuboidShape(3, 12, 5, 4, 14, 11), + Block.makeCuboidShape(12, 12, 5, 13, 14, 11), Block.makeCuboidShape(11, 12, 4, 12, 14, 5), + Block.makeCuboidShape(4, 12, 4, 5, 14, 5), Block.makeCuboidShape(4, 12, 11, 5, 14, 12), + Block.makeCuboidShape(11, 12, 11, 12, 14, 12), Block.makeCuboidShape(11, 14, 11, 12, 15, 12), + Block.makeCuboidShape(11, 14, 4, 12, 15, 5), Block.makeCuboidShape(2, 14, 12, 14, 15, 14), + Block.makeCuboidShape(2, 14, 4, 4, 15, 12), Block.makeCuboidShape(12, 14, 4, 14, 15, 12), + Block.makeCuboidShape(2, 14, 2, 14, 15, 4), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(2, 0, 14, 14, 15, 15), Block.makeCuboidShape(2, 0, 1, 14, 15, 2), + Block.makeCuboidShape(1, 0, 1, 2, 15, 15), Block.makeCuboidShape(14, 0, 1, 15, 15, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java index 8199039db..e474e1f0f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java @@ -1,10 +1,156 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import de.ellpeck.actuallyadditions.common.blocks.HorizontallyDirectionalBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalBlock; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; +import net.minecraftforge.common.ToolType; + +import java.util.stream.Stream; + +public class OilGeneratorBlock extends HorizontallyDirectionalBlock { + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; -public class OilGeneratorBlock extends ActuallyBlock { public OilGeneratorBlock() { - super(Properties.create(Material.ROCK)); + super(Properties.create(Material.ROCK) + .harvestTool(ToolType.PICKAXE) + .harvestLevel(0) + .hardnessAndResistance(10f, 80f) + .sound(SoundType.STONE)); + } + + private static final VoxelShape SHAPE_N = Stream.of( + Block.makeCuboidShape(4, 3, 1.5, 12, 4, 2), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(12, 3, 1, 13, 4, 2), + Block.makeCuboidShape(3, 3, 1, 4, 4, 2), Block.makeCuboidShape(3, 7, 1, 4, 8, 2), + Block.makeCuboidShape(12, 7, 1, 13, 8, 2), Block.makeCuboidShape(4, 10, 0.5, 6, 11, 1), + Block.makeCuboidShape(4, 13, 0.5, 6, 14, 1), Block.makeCuboidShape(3, 11, 0.5, 4, 13, 1), + Block.makeCuboidShape(6, 11, 0.5, 7, 13, 1), Block.makeCuboidShape(4, 11, 0, 6, 13, 1), + Block.makeCuboidShape(5, 5, 1.5, 6, 6, 2), Block.makeCuboidShape(6, 4, 1.5, 7, 5, 2), + Block.makeCuboidShape(10, 5, 1.5, 11, 6, 2), Block.makeCuboidShape(9, 6, 1.5, 10, 7, 2), + Block.makeCuboidShape(4, 7, 1.5, 12, 8, 2), Block.makeCuboidShape(3, 4, 1.5, 4, 7, 2), + Block.makeCuboidShape(12, 4, 1.5, 13, 7, 2), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(5, 14, 6, 11, 15, 7), Block.makeCuboidShape(5, 14, 8, 11, 15, 9), + Block.makeCuboidShape(5, 14, 10, 11, 15, 14), Block.makeCuboidShape(5, 14, 2, 11, 15, 5), + Block.makeCuboidShape(11, 14, 2, 14, 15, 14), Block.makeCuboidShape(2, 14, 2, 5, 15, 14), + Block.makeCuboidShape(1, 0, 2, 2, 15, 14), Block.makeCuboidShape(14, 0, 2, 15, 15, 14), + Block.makeCuboidShape(1, 0, 14, 15, 15, 15), Block.makeCuboidShape(3, 8, 1, 13, 15, 2), + Block.makeCuboidShape(3, 0, 1, 13, 3, 2), Block.makeCuboidShape(1, 0, 1, 3, 15, 2), + Block.makeCuboidShape(13, 0, 1, 15, 15, 2), Block.makeCuboidShape(5, 13, 5, 11, 14, 10), + Block.makeCuboidShape(2, 3, 2, 14, 8, 3), Block.makeCuboidShape(0, 0, 15, 1, 1, 16), + Block.makeCuboidShape(15, 0, 15, 16, 1, 16), Block.makeCuboidShape(15, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 0, 1, 1, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_E = Stream.of( + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(14, 3, 12, 15, 4, 13), Block.makeCuboidShape(14, 3, 3, 15, 4, 4), + Block.makeCuboidShape(14, 7, 3, 15, 8, 4), Block.makeCuboidShape(14, 7, 12, 15, 8, 13), + Block.makeCuboidShape(15, 10, 4, 15.5, 11, 6), Block.makeCuboidShape(15, 13, 4, 15.5, 14, 6), + Block.makeCuboidShape(15, 11, 3, 15.5, 13, 4), Block.makeCuboidShape(15, 11, 6, 15.5, 13, 7), + Block.makeCuboidShape(15, 11, 4, 16, 13, 6), Block.makeCuboidShape(14, 5, 5, 14.5, 6, 6), + Block.makeCuboidShape(14, 4, 6, 14.5, 5, 7), Block.makeCuboidShape(14, 5, 10, 14.5, 6, 11), + Block.makeCuboidShape(14, 6, 9, 14.5, 7, 10), Block.makeCuboidShape(14, 3, 4, 14.5, 4, 12), + Block.makeCuboidShape(14, 7, 4, 14.5, 8, 12), Block.makeCuboidShape(14, 4, 3, 14.5, 7, 4), + Block.makeCuboidShape(14, 4, 12, 14.5, 7, 13), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(9, 14, 5, 10, 15, 11), Block.makeCuboidShape(7, 14, 5, 8, 15, 11), + Block.makeCuboidShape(2, 14, 5, 6, 15, 11), Block.makeCuboidShape(11, 14, 5, 14, 15, 11), + Block.makeCuboidShape(2, 14, 11, 14, 15, 14), Block.makeCuboidShape(2, 14, 2, 14, 15, 5), + Block.makeCuboidShape(2, 0, 1, 14, 15, 2), Block.makeCuboidShape(2, 0, 14, 14, 15, 15), + Block.makeCuboidShape(1, 0, 1, 2, 15, 15), Block.makeCuboidShape(14, 8, 3, 15, 15, 13), + Block.makeCuboidShape(14, 0, 3, 15, 3, 13), Block.makeCuboidShape(14, 0, 1, 15, 15, 3), + Block.makeCuboidShape(14, 0, 13, 15, 15, 15), Block.makeCuboidShape(6, 13, 5, 11, 14, 11), + Block.makeCuboidShape(13, 3, 2, 14, 8, 14), Block.makeCuboidShape(0, 0, 0, 1, 1, 1), + Block.makeCuboidShape(0, 0, 15, 1, 1, 16), Block.makeCuboidShape(15, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_S = Stream.of( + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(1, 15, 15, 15, 16, 16), Block.makeCuboidShape(1, 15, 0, 15, 16, 1), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(3, 3, 14, 4, 4, 15), Block.makeCuboidShape(12, 3, 14, 13, 4, 15), + Block.makeCuboidShape(12, 7, 14, 13, 8, 15), Block.makeCuboidShape(3, 7, 14, 4, 8, 15), + Block.makeCuboidShape(10, 10, 15, 12, 11, 15.5), Block.makeCuboidShape(10, 13, 15, 12, 14, 15.5), + Block.makeCuboidShape(12, 11, 15, 13, 13, 15.5), Block.makeCuboidShape(9, 11, 15, 10, 13, 15.5), + Block.makeCuboidShape(10, 11, 15, 12, 13, 16), Block.makeCuboidShape(10, 5, 14, 11, 6, 14.5), + Block.makeCuboidShape(9, 4, 14, 10, 5, 14.5), Block.makeCuboidShape(5, 5, 14, 6, 6, 14.5), + Block.makeCuboidShape(6, 6, 14, 7, 7, 14.5), Block.makeCuboidShape(4, 3, 14, 12, 4, 14.5), + Block.makeCuboidShape(4, 7, 14, 12, 8, 14.5), Block.makeCuboidShape(12, 4, 14, 13, 7, 14.5), + Block.makeCuboidShape(3, 4, 14, 4, 7, 14.5), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(5, 14, 9, 11, 15, 10), Block.makeCuboidShape(5, 14, 7, 11, 15, 8), + Block.makeCuboidShape(5, 14, 2, 11, 15, 6), Block.makeCuboidShape(5, 14, 11, 11, 15, 14), + Block.makeCuboidShape(2, 14, 2, 5, 15, 14), Block.makeCuboidShape(11, 14, 2, 14, 15, 14), + Block.makeCuboidShape(14, 0, 2, 15, 15, 14), Block.makeCuboidShape(1, 0, 2, 2, 15, 14), + Block.makeCuboidShape(1, 0, 1, 15, 15, 2), Block.makeCuboidShape(3, 8, 14, 13, 15, 15), + Block.makeCuboidShape(3, 0, 14, 13, 3, 15), Block.makeCuboidShape(13, 0, 14, 15, 15, 15), + Block.makeCuboidShape(1, 0, 14, 3, 15, 15), Block.makeCuboidShape(5, 13, 6, 11, 14, 11), + Block.makeCuboidShape(2, 3, 13, 14, 8, 14), Block.makeCuboidShape(15, 0, 0, 16, 1, 1), + Block.makeCuboidShape(0, 0, 0, 1, 1, 1), Block.makeCuboidShape(0, 0, 15, 1, 1, 16), + Block.makeCuboidShape(15, 0, 15, 16, 1, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + private static final VoxelShape SHAPE_W = Stream.of( + Block.makeCuboidShape(0, 15, 15, 16, 16, 16), Block.makeCuboidShape(0, 15, 0, 16, 16, 1), + Block.makeCuboidShape(0, 15, 1, 1, 16, 15), Block.makeCuboidShape(15, 15, 1, 16, 16, 15), + Block.makeCuboidShape(15, 1, 15, 16, 15, 16), Block.makeCuboidShape(15, 1, 0, 16, 15, 1), + Block.makeCuboidShape(0, 1, 0, 1, 15, 1), Block.makeCuboidShape(0, 1, 15, 1, 15, 16), + Block.makeCuboidShape(1, 3, 3, 2, 4, 4), Block.makeCuboidShape(1, 3, 12, 2, 4, 13), + Block.makeCuboidShape(1, 7, 12, 2, 8, 13), Block.makeCuboidShape(1, 7, 3, 2, 8, 4), + Block.makeCuboidShape(0.5, 10, 10, 1, 11, 12), Block.makeCuboidShape(0.5, 13, 10, 1, 14, 12), + Block.makeCuboidShape(0.5, 11, 12, 1, 13, 13), Block.makeCuboidShape(0.5, 11, 9, 1, 13, 10), + Block.makeCuboidShape(0, 11, 10, 1, 13, 12), Block.makeCuboidShape(1.5, 5, 10, 2, 6, 11), + Block.makeCuboidShape(1.5, 4, 9, 2, 5, 10), Block.makeCuboidShape(1.5, 5, 5, 2, 6, 6), + Block.makeCuboidShape(1.5, 6, 6, 2, 7, 7), Block.makeCuboidShape(1.5, 3, 4, 2, 4, 12), + Block.makeCuboidShape(1.5, 7, 4, 2, 8, 12), Block.makeCuboidShape(1.5, 4, 12, 2, 7, 13), + Block.makeCuboidShape(1.5, 4, 3, 2, 7, 4), Block.makeCuboidShape(2, 0, 2, 14, 1, 14), + Block.makeCuboidShape(6, 14, 5, 7, 15, 11), Block.makeCuboidShape(8, 14, 5, 9, 15, 11), + Block.makeCuboidShape(10, 14, 5, 14, 15, 11), Block.makeCuboidShape(2, 14, 5, 5, 15, 11), + Block.makeCuboidShape(2, 14, 2, 14, 15, 5), Block.makeCuboidShape(2, 14, 11, 14, 15, 14), + Block.makeCuboidShape(2, 0, 14, 14, 15, 15), Block.makeCuboidShape(2, 0, 1, 14, 15, 2), + Block.makeCuboidShape(14, 0, 1, 15, 15, 15), Block.makeCuboidShape(1, 8, 3, 2, 15, 13), + Block.makeCuboidShape(1, 0, 3, 2, 3, 13), Block.makeCuboidShape(1, 0, 13, 2, 15, 15), + Block.makeCuboidShape(1, 0, 1, 2, 15, 3), Block.makeCuboidShape(5, 13, 5, 10, 14, 11), + Block.makeCuboidShape(2, 3, 2, 3, 8, 14), Block.makeCuboidShape(15, 0, 15, 16, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 0, 0, 1, 1, 1), + Block.makeCuboidShape(0, 0, 15, 1, 1, 16) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case NORTH: + return SHAPE_N; + case EAST: + return SHAPE_E; + case SOUTH: + return SHAPE_S; + case WEST: + return SHAPE_W; + default: + return SHAPE_N; + } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java index b66abd917..fbcf94fd8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java @@ -2,10 +2,20 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class PhantomBlock extends ActuallyBlock { public PhantomBlock(PhantomType type) { super(Properties.create(Material.ROCK)); } -} +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java index df939ce22..2c83af7b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java @@ -1,10 +1,50 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class PhantomBoosterBlock extends ActuallyBlock { public PhantomBoosterBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape BOOSTER_SHAPE = Stream.of( + Block.makeCuboidShape(5, 12, 12, 11, 13, 13), Block.makeCuboidShape(6, 0, 6, 10, 16, 10), + Block.makeCuboidShape(5, 2, 5, 11, 3, 11), Block.makeCuboidShape(5, 4, 12, 11, 5, 13), + Block.makeCuboidShape(5, 6, 12, 11, 7, 13), Block.makeCuboidShape(5, 8, 12, 11, 9, 13), + Block.makeCuboidShape(5, 10, 12, 11, 11, 13), Block.makeCuboidShape(5, 4, 3, 11, 5, 4), + Block.makeCuboidShape(5, 6, 3, 11, 7, 4), Block.makeCuboidShape(5, 8, 3, 11, 9, 4), + Block.makeCuboidShape(5, 10, 3, 11, 11, 4), Block.makeCuboidShape(5, 12, 3, 11, 13, 4), + Block.makeCuboidShape(3, 4, 5, 4, 5, 11), Block.makeCuboidShape(3, 6, 5, 4, 7, 11), + Block.makeCuboidShape(3, 8, 5, 4, 9, 11), Block.makeCuboidShape(3, 10, 5, 4, 11, 11), + Block.makeCuboidShape(3, 12, 5, 4, 13, 11), Block.makeCuboidShape(12, 4, 5, 13, 5, 11), + Block.makeCuboidShape(12, 6, 5, 13, 7, 11), Block.makeCuboidShape(12, 8, 5, 13, 9, 11), + Block.makeCuboidShape(12, 10, 5, 13, 11, 11), Block.makeCuboidShape(12, 12, 5, 13, 13, 11), + Block.makeCuboidShape(5, 14, 5, 11, 15, 11), Block.makeCuboidShape(4, 4, 11, 5, 5, 12), + Block.makeCuboidShape(4, 6, 11, 5, 7, 12), Block.makeCuboidShape(4, 8, 11, 5, 9, 12), + Block.makeCuboidShape(4, 10, 11, 5, 11, 12), Block.makeCuboidShape(4, 12, 11, 5, 13, 12), + Block.makeCuboidShape(4, 4, 4, 5, 5, 5), Block.makeCuboidShape(4, 6, 4, 5, 7, 5), + Block.makeCuboidShape(4, 8, 4, 5, 9, 5), Block.makeCuboidShape(4, 10, 4, 5, 11, 5), + Block.makeCuboidShape(4, 12, 4, 5, 13, 5), Block.makeCuboidShape(11, 4, 4, 12, 5, 5), + Block.makeCuboidShape(11, 6, 4, 12, 7, 5), Block.makeCuboidShape(11, 8, 4, 12, 9, 5), + Block.makeCuboidShape(11, 10, 4, 12, 11, 5), Block.makeCuboidShape(11, 12, 4, 12, 13, 5), + Block.makeCuboidShape(11, 4, 11, 12, 5, 12), Block.makeCuboidShape(11, 6, 11, 12, 7, 12), + Block.makeCuboidShape(11, 8, 11, 12, 9, 12), Block.makeCuboidShape(11, 10, 11, 12, 11, 12), + Block.makeCuboidShape(11, 12, 11, 12, 13, 12) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return BOOSTER_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java index 9384b8f1b..d0b7ff3aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java @@ -1,10 +1,36 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class PlayerInterfaceBlock extends ActuallyBlock { public PlayerInterfaceBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape PLAYER_INTERFACE_SHAPE = Stream.of( + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(1, 1, 1, 15, 15, 15), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return PLAYER_INTERFACE_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java index 7cf95e29b..c0e0a79f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java @@ -1,10 +1,46 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class RangedCollectorBlock extends ActuallyBlock { public RangedCollectorBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape COLLECTOR_SHAPE = Stream.of( + Block.makeCuboidShape(0, 0, 0, 1, 1, 16), Block.makeCuboidShape(1, 0, 15, 15, 1, 16), + Block.makeCuboidShape(15, 0, 0, 16, 1, 16), Block.makeCuboidShape(1, 0, 0, 15, 1, 1), + Block.makeCuboidShape(0, 15, 0, 1, 16, 16), Block.makeCuboidShape(15, 15, 0, 16, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(1, 1, 4, 2, 4, 12), Block.makeCuboidShape(14, 1, 4, 15, 4, 12), + Block.makeCuboidShape(4, 1, 1, 12, 4, 2), Block.makeCuboidShape(4, 1, 14, 12, 4, 15), + Block.makeCuboidShape(4, 14, 12, 12, 15, 14), Block.makeCuboidShape(1, 12, 4, 2, 15, 12), + Block.makeCuboidShape(14, 12, 4, 15, 15, 12), Block.makeCuboidShape(4, 12, 1, 12, 15, 2), + Block.makeCuboidShape(4, 12, 14, 12, 15, 15), Block.makeCuboidShape(4, 14, 2, 12, 15, 4), + Block.makeCuboidShape(1, 1, 12, 2, 15, 14), Block.makeCuboidShape(14, 1, 2, 15, 15, 4), + Block.makeCuboidShape(1, 1, 1, 4, 15, 2), Block.makeCuboidShape(12, 1, 14, 15, 15, 15), + Block.makeCuboidShape(12, 14, 2, 14, 15, 14), Block.makeCuboidShape(1, 1, 2, 2, 15, 4), + Block.makeCuboidShape(14, 1, 12, 15, 15, 14), Block.makeCuboidShape(12, 1, 1, 15, 15, 2), + Block.makeCuboidShape(1, 1, 14, 4, 15, 15), Block.makeCuboidShape(2, 14, 2, 4, 15, 14), + Block.makeCuboidShape(2, 2, 2, 14, 14, 14), Block.makeCuboidShape(1, 0, 1, 15, 1, 15) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return COLLECTOR_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java index 547484d13..4659f7a0e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java @@ -1,10 +1,41 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class ShockSuppressorBlock extends ActuallyBlock { public ShockSuppressorBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SUPPRESSOR_SHAPE = Stream.of( + Block.makeCuboidShape(15, 15, 0, 16, 16, 16), Block.makeCuboidShape(0, 0, 0, 1, 1, 16), + Block.makeCuboidShape(1, 0, 15, 15, 1, 16), Block.makeCuboidShape(15, 0, 0, 16, 1, 16), + Block.makeCuboidShape(1, 0, 0, 15, 1, 1), Block.makeCuboidShape(0, 15, 0, 1, 16, 16), + Block.makeCuboidShape(1, 15, 0, 15, 16, 1), Block.makeCuboidShape(1, 15, 15, 15, 16, 16), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(1, 14, 1, 15, 15, 15), Block.makeCuboidShape(1, 1, 1, 15, 2, 15), + Block.makeCuboidShape(9, 13, 9, 13, 16, 13), Block.makeCuboidShape(9, 2, 9, 13, 3, 13), + Block.makeCuboidShape(3, 13, 9, 7, 16, 13), Block.makeCuboidShape(3, 2, 9, 7, 3, 13), + Block.makeCuboidShape(9, 13, 3, 13, 16, 7), Block.makeCuboidShape(9, 2, 3, 13, 3, 7), + Block.makeCuboidShape(3, 13, 3, 7, 16, 7), Block.makeCuboidShape(3, 2, 3, 7, 3, 7), + Block.makeCuboidShape(4, 3, 10, 6, 13, 12), Block.makeCuboidShape(10, 3, 10, 12, 13, 12), + Block.makeCuboidShape(10, 3, 4, 12, 13, 6), Block.makeCuboidShape(4, 3, 4, 6, 13, 6) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return SUPPRESSOR_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java index c6533b691..792bc697a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java @@ -1,10 +1,36 @@ package de.ellpeck.actuallyadditions.common.blocks.functional; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; + +import java.util.stream.Stream; public class XPSolidifierBlock extends ActuallyBlock { public XPSolidifierBlock() { super(Properties.create(Material.ROCK)); } + + private static final VoxelShape SOLIDIFIER_SHAPE = Stream.of( + Block.makeCuboidShape(15, 0, 1, 16, 1, 15), Block.makeCuboidShape(1, 1, 1, 15, 15, 15), + Block.makeCuboidShape(0, 0, 0, 16, 1, 1), Block.makeCuboidShape(0, 0, 15, 16, 1, 16), + Block.makeCuboidShape(0, 15, 0, 16, 16, 1), Block.makeCuboidShape(0, 15, 15, 16, 16, 16), + Block.makeCuboidShape(0, 0, 1, 1, 1, 15), Block.makeCuboidShape(0, 15, 1, 1, 16, 15), + Block.makeCuboidShape(15, 15, 1, 16, 16, 15), Block.makeCuboidShape(0, 1, 0, 1, 15, 1), + Block.makeCuboidShape(0, 1, 15, 1, 15, 16), Block.makeCuboidShape(15, 1, 15, 16, 15, 16), + Block.makeCuboidShape(15, 1, 0, 16, 15, 1) + ).reduce((v1, v2) -> {return VoxelShapes.combineAndSimplify(v1, v2, IBooleanFunction.OR);}).get(); + + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + return SOLIDIFIER_SHAPE; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java index 1fbd25821..398ff4680 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -103,6 +103,7 @@ public final class ActuallyItems { public static final RegistryObject LENS_OF_THE_KILLER = ITEMS.register("lens_of_the_killer", basicItem()); public static final RegistryObject LENS_OF_DISENCHANTING = ITEMS.register("lens_of_disenchanting", basicItem()); public static final RegistryObject LENS_OF_THE_MINER = ITEMS.register("lens_of_the_miner", basicItem()); + public static final RegistryObject LENS_OF_CONVERSION = ITEMS.register("lens_of_conversion", basicItem()); public static final RegistryObject LASER_WRENCH = ITEMS.register("laser_wrench", basicItem()); public static final RegistryObject TELEPORT_STAFF = ITEMS.register("teleport_staff", TeleportStaffItem::new); public static final RegistryObject WINGS_OF_THE_BATS = ITEMS.register("wings_of_the_bats", basicItem()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java index 98deb6ddd..211943b05 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java @@ -2,6 +2,7 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.common.blocks.functional.AtomicReconstructorBlock; import net.minecraft.block.Block; import net.minecraft.block.SlabBlock; import net.minecraft.block.StairsBlock; @@ -12,6 +13,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; import java.util.function.Supplier; @@ -23,56 +25,82 @@ public class GeneratorBlockStates extends BlockStateProvider { @Override protected void registerStatesAndModels() { + // Fully Directional Blocks fullyDirectionalBlock(ActuallyBlocks.ATOMIC_RECONSTRUCTOR); + fullyDirectionalBlock(ActuallyBlocks.BREAKER); + fullyDirectionalBlock(ActuallyBlocks.PLACER); + fullyDirectionalBlock(ActuallyBlocks.DROPPER); + fullyDirectionalBlock(ActuallyBlocks.FLUID_PLACER); + fullyDirectionalBlock(ActuallyBlocks.FLUID_COLLECTOR); + fullyDirectionalBlock(ActuallyBlocks.DIRECTIONAL_BREAKER); - buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_RESTONIA); - buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_PALIS); - buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_DIAMATINE); - buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_VOID); - buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_EMERADIC); - buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_ENORI); - buildCubeAll(ActuallyBlocks.BATTERY_BOX); - buildCubeAll(ActuallyBlocks.HOPPING_ITEM_INTERFACE); - buildCubeAll(ActuallyBlocks.FARMER); - buildCubeAll(ActuallyBlocks.BIO_REACTOR); - buildCubeAll(ActuallyBlocks.EMPOWERER); - buildCubeAll(ActuallyBlocks.TINY_TORCH); - buildCubeAll(ActuallyBlocks.SHOCK_SUPPRESSOR); - buildCubeAll(ActuallyBlocks.DISPLAY_STAND); - buildCubeAll(ActuallyBlocks.PLAYER_INTERFACE); - buildCubeAll(ActuallyBlocks.ITEM_INTERFACE); - buildCubeAll(ActuallyBlocks.FIREWORK_BOX); - buildCubeAll(ActuallyBlocks.MINER); - buildCubeAll(ActuallyBlocks.CRYSTAL_RESTONIA); - buildCubeAll(ActuallyBlocks.CRYSTAL_PALIS); - buildCubeAll(ActuallyBlocks.CRYSTAL_DIAMATINE); - buildCubeAll(ActuallyBlocks.CRYSTAL_VOID); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMERADIC); - buildCubeAll(ActuallyBlocks.CRYSTAL_ENORI); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_RESTONIA); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_PALIS); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_DIAMATINE); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_VOID); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_EMERADIC); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_ENORI); - buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY); - buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY_ADVANCED); - buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY_EXTREME); - buildCubeAll(ActuallyBlocks.FLUIDS_LASER_RELAY); - buildCubeAll(ActuallyBlocks.ITEM_LASER_RELAY); - buildCubeAll(ActuallyBlocks.ADVANCED_ITEM_LASER_RELAY); - buildCubeAll(ActuallyBlocks.RANGED_COLLECTOR); - buildCubeAll(ActuallyBlocks.DIRECTIONAL_BREAKER); - buildCubeAll(ActuallyBlocks.LEAF_GENERATOR); - buildCubeAll(ActuallyBlocks.XP_SOLIDIFIER); - buildCubeAll(ActuallyBlocks.GREEN_BLOCK); - buildCubeAll(ActuallyBlocks.WHITE_BLOCK); - stairsBlock((StairsBlock) ActuallyBlocks.GREEN_STAIRS.get(), modLoc("block/green_block")); - stairsBlock((StairsBlock) ActuallyBlocks.WHITE_STAIRS.get(), modLoc("block/white_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")); - wallBlock((WallBlock) ActuallyBlocks.GREEN_WALL.get(), modLoc("block/green_block")); - wallBlock((WallBlock) ActuallyBlocks.WHITE_WALL.get(), modLoc("block/white_block")); + // Horizontal Directional Blocks + horizontallyDirectionalBlock(ActuallyBlocks.FARMER); + horizontallyDirectionalBlock(ActuallyBlocks.BIO_REACTOR); + horizontallyDirectionalBlock(ActuallyBlocks.MINER); + horizontallyDirectionalBlock(ActuallyBlocks.LEAF_GENERATOR); + horizontallyDirectionalBlock(ActuallyBlocks.COFFEE_MACHINE); + horizontallyDirectionalBlock(ActuallyBlocks.CRUSHER); + horizontallyDirectionalBlock(ActuallyBlocks.CRUSHER_DOUBLE); + horizontallyDirectionalBlock(ActuallyBlocks.POWERED_FURNACE); + horizontallyDirectionalBlock(ActuallyBlocks.DOUBLE_POWERED_FURNACE); + horizontallyDirectionalBlock(ActuallyBlocks.COAL_GENERATOR); + horizontallyDirectionalBlock(ActuallyBlocks.OIL_GENERATOR); + horizontallyDirectionalBlock(ActuallyBlocks.LAMP_CONTROLLER); + horizontallyDirectionalBlock(ActuallyBlocks.LAVA_FACTORY_CONTROLLER); + + // Standard Block + standardBlock(ActuallyBlocks.CRYSTAL_CLUSTER_RESTONIA); + standardBlock(ActuallyBlocks.CRYSTAL_CLUSTER_PALIS); + standardBlock(ActuallyBlocks.CRYSTAL_CLUSTER_DIAMATINE); + standardBlock(ActuallyBlocks.CRYSTAL_CLUSTER_VOID); + standardBlock(ActuallyBlocks.CRYSTAL_CLUSTER_EMERADIC); + standardBlock(ActuallyBlocks.CRYSTAL_CLUSTER_ENORI); + standardBlock(ActuallyBlocks.BATTERY_BOX); + standardBlock(ActuallyBlocks.HOPPING_ITEM_INTERFACE); + standardBlock(ActuallyBlocks.EMPOWERER); + standardBlock(ActuallyBlocks.TINY_TORCH); + standardBlock(ActuallyBlocks.SHOCK_SUPPRESSOR); + standardBlock(ActuallyBlocks.DISPLAY_STAND); + standardBlock(ActuallyBlocks.PLAYER_INTERFACE); + standardBlock(ActuallyBlocks.ITEM_INTERFACE); + standardBlock(ActuallyBlocks.FIREWORK_BOX); + standardBlock(ActuallyBlocks.CRYSTAL_RESTONIA); + standardBlock(ActuallyBlocks.CRYSTAL_PALIS); + standardBlock(ActuallyBlocks.CRYSTAL_DIAMATINE); + standardBlock(ActuallyBlocks.CRYSTAL_VOID); + standardBlock(ActuallyBlocks.CRYSTAL_EMERADIC); + standardBlock(ActuallyBlocks.CRYSTAL_ENORI); + standardBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_RESTONIA); + standardBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_PALIS); + standardBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_DIAMATINE); + standardBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_VOID); + standardBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_EMERADIC); + standardBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_ENORI); + standardBlock(ActuallyBlocks.ENERGY_LASER_RELAY); + standardBlock(ActuallyBlocks.ENERGY_LASER_RELAY_ADVANCED); + standardBlock(ActuallyBlocks.ENERGY_LASER_RELAY_EXTREME); + standardBlock(ActuallyBlocks.FLUIDS_LASER_RELAY); + standardBlock(ActuallyBlocks.ITEM_LASER_RELAY); + standardBlock(ActuallyBlocks.ADVANCED_ITEM_LASER_RELAY); + standardBlock(ActuallyBlocks.RANGED_COLLECTOR); + standardBlock(ActuallyBlocks.XP_SOLIDIFIER); + standardBlock(ActuallyBlocks.ENERGIZER); + standardBlock(ActuallyBlocks.ENERVATOR); + standardBlock(ActuallyBlocks.CANOLA_PRESS); + standardBlock(ActuallyBlocks.PHANTOMFACE); + standardBlock(ActuallyBlocks.PHANTOM_PLACER); + standardBlock(ActuallyBlocks.PHANTOM_LIQUIFACE); + standardBlock(ActuallyBlocks.PHANTOM_ENERGYFACE); + standardBlock(ActuallyBlocks.PHANTOM_REDSTONEFACE); + standardBlock(ActuallyBlocks.PHANTOM_BREAKER); + standardBlock(ActuallyBlocks.FERMENTING_BARREL); + standardBlock(ActuallyBlocks.FEEDER); + standardBlock(ActuallyBlocks.HEAT_COLLECTOR); + standardBlock(ActuallyBlocks.GREENHOUSE_GLASS); + standardBlock(ActuallyBlocks.PHANTOM_BOOSTER); + + // Lamps buildLitState(ActuallyBlocks.LAMP_WHITE); buildLitState(ActuallyBlocks.LAMP_ORANGE); buildLitState(ActuallyBlocks.LAMP_MAGENTA); @@ -89,67 +117,78 @@ public class GeneratorBlockStates extends BlockStateProvider { buildLitState(ActuallyBlocks.LAMP_GREEN); buildLitState(ActuallyBlocks.LAMP_RED); buildLitState(ActuallyBlocks.LAMP_BLACK); - buildCubeAll(ActuallyBlocks.LAMP_CONTROLLER); - buildCubeAll(ActuallyBlocks.ENERGIZER); - buildCubeAll(ActuallyBlocks.ENERVATOR); - buildCubeAll(ActuallyBlocks.LAVA_FACTORY_CONTROLLER); - buildCubeAll(ActuallyBlocks.CANOLA_PRESS); - buildCubeAll(ActuallyBlocks.PHANTOMFACE); - buildCubeAll(ActuallyBlocks.PHANTOM_PLACER); - buildCubeAll(ActuallyBlocks.PHANTOM_LIQUIFACE); - buildCubeAll(ActuallyBlocks.PHANTOM_ENERGYFACE); - buildCubeAll(ActuallyBlocks.PHANTOM_REDSTONEFACE); - buildCubeAll(ActuallyBlocks.PHANTOM_BREAKER); - buildCubeAll(ActuallyBlocks.COAL_GENERATOR); - buildCubeAll(ActuallyBlocks.OIL_GENERATOR); - buildCubeAll(ActuallyBlocks.FERMENTING_BARREL); + + // TO BE SORTED buildCubeAll(ActuallyBlocks.RICE); buildCubeAll(ActuallyBlocks.CANOLA); buildCubeAll(ActuallyBlocks.FLAX); buildCubeAll(ActuallyBlocks.COFFEE); - buildCubeAll(ActuallyBlocks.BLACK_QUARTZ); - buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_CHISELED); - buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_PILLAR); + buildCubeAll(ActuallyBlocks.CHARCOAL); buildCubeAll(ActuallyBlocks.ENDER_CASING); buildCubeAll(ActuallyBlocks.ENDERPEARL); buildCubeAll(ActuallyBlocks.IRON_CASING); - buildCubeAll(ActuallyBlocks.LAVA_FACTORY_CASE); + standardBlock(ActuallyBlocks.LAVA_FACTORY_CASE); buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTZ); buildCubeAll(ActuallyBlocks.WOOD_CASING); - buildCubeAll(ActuallyBlocks.FEEDER); - buildCubeAll(ActuallyBlocks.CRUSHER); - buildCubeAll(ActuallyBlocks.CRUSHER_DOUBLE); - buildCubeAll(ActuallyBlocks.POWERED_FURNACE); - buildCubeAll(ActuallyBlocks.ESD); - buildCubeAll(ActuallyBlocks.ESD_ADVANCED); - buildCubeAll(ActuallyBlocks.HEAT_COLLECTOR); - buildCubeAll(ActuallyBlocks.GREENHOUSE_GLASS); - buildCubeAll(ActuallyBlocks.BREAKER); - buildCubeAll(ActuallyBlocks.PLACER); - buildCubeAll(ActuallyBlocks.DROPPER); - buildCubeAll(ActuallyBlocks.FLUID_PLACER); - buildCubeAll(ActuallyBlocks.FLUID_COLLECTOR); - buildCubeAll(ActuallyBlocks.COFFEE_MACHINE); - buildCubeAll(ActuallyBlocks.PHANTOM_BOOSTER); -// buildCubeAll(ActuallyBlocks.WildPlant); + + // Quartz + standardBlock(ActuallyBlocks.BLACK_QUARTZ); + buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_SMOOTH); + standardBlock(ActuallyBlocks.BLACK_QUARTZ_CHISELED); + standardBlock(ActuallyBlocks.BLACK_QUARTZ_PILLAR); + buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_BRICK); + buildCubeAll(ActuallyBlocks.GREEN_BLOCK); + buildCubeAll(ActuallyBlocks.WHITE_BLOCK); + + // Walls wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_WALL.get(), modLoc("block/black_quartz_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_SMOOTH_QUARTZ_WALL.get(), modLoc("block/black_quartz_smooth_block")); wallBlock((WallBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get(), modLoc("block/black_quartz_chiseled_block")); wallBlock((WallBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL.get(), modLoc("block/black_quartz_pillar_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_BRICK_QUARTZ_WALL.get(), modLoc("block/black_quartz_brick_block")); + + wallBlock((WallBlock) ActuallyBlocks.GREEN_WALL.get(), modLoc("block/green_block")); + wallBlock((WallBlock) ActuallyBlocks.WHITE_WALL.get(), modLoc("block/white_block")); + + // Stairs stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), modLoc("block/black_quartz_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_SMOOTH_QUARTZ_STAIR.get(), modLoc("block/black_quartz_smooth_block")); stairsBlock((StairsBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_STAIR.get(), modLoc("block/black_quartz_chiseled_block")); stairsBlock((StairsBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_STAIR.get(), modLoc("block/black_quartz_pillar_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_BRICK_QUARTZ_STAIR.get(), modLoc("block/black_quartz_brick_block")); + + stairsBlock((StairsBlock) ActuallyBlocks.GREEN_STAIRS.get(), modLoc("block/green_block")); + stairsBlock((StairsBlock) ActuallyBlocks.WHITE_STAIRS.get(), modLoc("block/white_block")); + + // Slabs slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_block"), modLoc("block/black_quartz_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_SMOOTH_QUARTZ_SLAB.get(), modLoc("block/black_quartz_smooth_block"), modLoc("block/black_quartz_smooth_block")); slabBlock((SlabBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_SLAB.get(), modLoc("block/black_quartz_chiseled_block"), modLoc("block/black_quartz_chiseled_block")); slabBlock((SlabBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_SLAB.get(), modLoc("block/black_quartz_pillar_block"), modLoc("block/black_quartz_pillar_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_BRICK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_brick_block"), modLoc("block/black_quartz_brick_block")); + slabBlock((SlabBlock) ActuallyBlocks.GREEN_SLAB.get(), modLoc("block/green_block"), modLoc("block/green_block")); + slabBlock((SlabBlock) ActuallyBlocks.WHITE_SLAB.get(), modLoc("block/white_block"), modLoc("block/white_block")); + //buildCubeAll(ActuallyBlocks.ESD); + //buildCubeAll(ActuallyBlocks.ESD_ADVANCED); + //buildCubeAll(ActuallyBlocks.WildPlant); + //buildCubeAll(ActuallyBlocks.IRON_CASING_SNOW); } private void buildCubeAll(Supplier block) { simpleBlock(block.get()); } + private void standardBlock(Supplier block) { + ResourceLocation name = block.get().getRegistryName(); + ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1])); + + assert name != null; + simpleBlock(block.get(), model); + } + private void buildLitState(Supplier block) { ResourceLocation name = block.get().getRegistryName(); assert name != null; @@ -163,22 +202,19 @@ public class GeneratorBlockStates extends BlockStateProvider { private void fullyDirectionalBlock(Supplier block) { ResourceLocation name = block.get().getRegistryName(); + ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1])); + ModelFile verModel = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1] + "_ver")); - // Todo: come back and fix this, it's still not right assert name != null; - getVariantBuilder(block.get()) - .forAllStates(state -> { - Direction dir = state.get(BlockStateProperties.FACING); - System.out.println(dir); - return ConfiguredModel.builder() - .modelFile(models().withExistingParent(name.toString(), "block/orientable") - .texture("side", modLoc(String.format("block/%s", name.getPath()))) - .texture("front", modLoc(String.format("block/%s_front", name.getPath()))) - .texture("top", modLoc(String.format("block/%s_top", name.getPath())))) - .rotationX(dir == Direction.DOWN ? 90 : (dir == Direction.UP ? 270 : 0)) - .rotationY(dir.getAxis().isVertical() ? 0 : dir.getHorizontalIndex() * 90) - .build(); - }); + directionalBlock(block.get(), model); + } + + private void horizontallyDirectionalBlock(Supplier block) { + ResourceLocation name = block.get().getRegistryName(); + ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1])); + + assert name != null; + horizontalBlock(block.get(), model); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java index 8b88513de..46fbed92f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java @@ -22,8 +22,10 @@ public class GeneratorBlockTags extends BlockTagsProvider { ActuallyBlocks.WHITE_WALL.get(), ActuallyBlocks.GREEN_WALL.get(), ActuallyBlocks.BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_SMOOTH_QUARTZ_WALL.get(), ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL.get(), - ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get() + ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_BRICK_QUARTZ_WALL.get() ); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index acf186d25..13f7d42b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -49,8 +49,9 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.CRUSHER, "Crusher"); addBlock(ActuallyBlocks.CRUSHER_DOUBLE, "Double Crusher"); addBlock(ActuallyBlocks.POWERED_FURNACE, "Powered Furnace"); - addBlock(ActuallyBlocks.ESD, "ESD"); - addBlock(ActuallyBlocks.ESD_ADVANCED, "Advanced ASD"); + addBlock(ActuallyBlocks.DOUBLE_POWERED_FURNACE, "Double Powered Furnace"); + //addBlock(ActuallyBlocks.ESD, "ESD"); + //addBlock(ActuallyBlocks.ESD_ADVANCED, "Advanced ASD"); addBlock(ActuallyBlocks.HEAT_COLLECTOR, "Heat Collector"); addBlock(ActuallyBlocks.GREENHOUSE_GLASS, "Greenhouse Glass"); addBlock(ActuallyBlocks.BREAKER, "Auto-Breaker"); @@ -97,17 +98,25 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.GREEN_WALL, "Ethentic Green Wall"); addBlock(ActuallyBlocks.WHITE_WALL, "Ethentic Quartz Wall"); addBlock(ActuallyBlocks.BLACK_QUARTZ, "Block of Black Quartz"); - addBlock(ActuallyBlocks.BLACK_QUARTZ_CHISELED, "Chiseled Black Quartz"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_SMOOTH, "Smooth Black Quartz Block"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_CHISELED, "Chiseled Black Quartz Block"); addBlock(ActuallyBlocks.BLACK_QUARTZ_PILLAR, "Black Quartz Pillar"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_BRICK, "Black Quartz Bricks"); addBlock(ActuallyBlocks.BLACK_QUARTZ_WALL, "Black Quartz Wall"); + addBlock(ActuallyBlocks.BLACK_SMOOTH_QUARTZ_WALL, "Smooth Black Quartz Wall"); addBlock(ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL, "Chiseled Black Quartz Wall"); - addBlock(ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL, "Black Quartz Wall Pillar"); + addBlock(ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL, "Black Quartz Pillar Wall"); + addBlock(ActuallyBlocks.BLACK_BRICK_QUARTZ_WALL, "Black Quartz Brick Wall"); addBlock(ActuallyBlocks.BLACK_QUARTZ_STAIR, "Black Quartz Stairs"); + addBlock(ActuallyBlocks.BLACK_SMOOTH_QUARTZ_STAIR, "Smooth Black Quartz Stairs"); addBlock(ActuallyBlocks.BLACK_CHISELED_QUARTZ_STAIR, "Chiseled Black Quartz Stairs"); addBlock(ActuallyBlocks.BLACK_PILLAR_QUARTZ_STAIR, "Black Quartz Pillar Stairs"); + addBlock(ActuallyBlocks.BLACK_BRICK_QUARTZ_STAIR, "Black Quartz Brick Stairs"); addBlock(ActuallyBlocks.BLACK_QUARTZ_SLAB, "Black Quartz Slab"); + addBlock(ActuallyBlocks.BLACK_SMOOTH_QUARTZ_SLAB, "Smooth Black Quartz Slab"); addBlock(ActuallyBlocks.BLACK_CHISELED_QUARTZ_SLAB, "Chiseled Black Quartz Slab"); addBlock(ActuallyBlocks.BLACK_PILLAR_QUARTZ_SLAB, "Black Quartz Pillar Slab"); + addBlock(ActuallyBlocks.BLACK_BRICK_QUARTZ_SLAB, "Black Quartz Brick Slab"); addBlock(ActuallyBlocks.LAMP_WHITE, "White Lamp"); addBlock(ActuallyBlocks.LAMP_ORANGE, "Orange Lamp"); addBlock(ActuallyBlocks.LAMP_MAGENTA, "Magenta Lamp"); @@ -130,6 +139,7 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.ORE_BLACK_QUARTZ, "Black Quartz Ore"); addBlock(ActuallyBlocks.ENDER_CASING, "Ender Casing"); addBlock(ActuallyBlocks.IRON_CASING, "Iron Casing"); + //addBlock(ActuallyBlocks.IRON_CASING_SNOW, "?"); addBlock(ActuallyBlocks.LAVA_FACTORY_CASE, "Casing"); addBlock(ActuallyBlocks.WOOD_CASING, "Wood Casing"); @@ -154,6 +164,7 @@ public class GeneratorLanguage extends LanguageProvider { addItem(ActuallyItems.BLACK_QUARTZ, "Black Quartz"); // Crystals + addItem(ActuallyItems.BLACK_QUARTS, "Black Quarts"); addItem(ActuallyItems.RESTONIA_CRYSTAL, "Restonia Crystal"); addItem(ActuallyItems.PALIS_CRYSTAL, "Palis Crystal"); addItem(ActuallyItems.DIAMATINE_CRYSTAL, "Diamatine Crystal"); @@ -209,6 +220,7 @@ public class GeneratorLanguage extends LanguageProvider { addItem(ActuallyItems.LENS_OF_THE_KILLER, "Lens of the Killer"); addItem(ActuallyItems.LENS_OF_DISENCHANTING, "Lens of Disenchanting"); addItem(ActuallyItems.LENS_OF_THE_MINER, "Lens of the Miner"); + addItem(ActuallyItems.LENS_OF_CONVERSION, "Lens of Conversion"); addItem(ActuallyItems.LASER_WRENCH, "Laser Wrench"); addItem(ActuallyItems.TELEPORT_STAFF, "Teleport Staff"); addItem(ActuallyItems.WINGS_OF_THE_BATS, "Wings Of The Bats"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java index 1a64dd367..bc42b6a6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java @@ -75,8 +75,9 @@ public class GeneratorLoot extends LootTableProvider { this.registerDropSelfLootTable(ActuallyBlocks.CRUSHER.get()); this.registerDropSelfLootTable(ActuallyBlocks.CRUSHER_DOUBLE.get()); this.registerDropSelfLootTable(ActuallyBlocks.POWERED_FURNACE.get()); - this.registerDropSelfLootTable(ActuallyBlocks.ESD.get()); - this.registerDropSelfLootTable(ActuallyBlocks.ESD_ADVANCED.get()); + this.registerDropSelfLootTable(ActuallyBlocks.DOUBLE_POWERED_FURNACE.get()); + //this.registerDropSelfLootTable(ActuallyBlocks.ESD.get()); + //this.registerDropSelfLootTable(ActuallyBlocks.ESD_ADVANCED.get()); this.registerDropSelfLootTable(ActuallyBlocks.HEAT_COLLECTOR.get()); this.registerDropSelfLootTable(ActuallyBlocks.GREENHOUSE_GLASS.get()); this.registerDropSelfLootTable(ActuallyBlocks.BREAKER.get()); @@ -106,17 +107,25 @@ public class GeneratorLoot extends LootTableProvider { this.registerDropSelfLootTable(ActuallyBlocks.GREEN_WALL.get()); this.registerDropSelfLootTable(ActuallyBlocks.WHITE_WALL.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ_SMOOTH.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ_CHISELED.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ_PILLAR.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ_BRICK.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ_WALL.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_SMOOTH_QUARTZ_WALL.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_BRICK_QUARTZ_WALL.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ_STAIR.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_SMOOTH_QUARTZ_STAIR.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_CHISELED_QUARTZ_STAIR.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_PILLAR_QUARTZ_STAIR.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_BRICK_QUARTZ_STAIR.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_QUARTZ_SLAB.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_SMOOTH_QUARTZ_SLAB.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_CHISELED_QUARTZ_SLAB.get()); this.registerDropSelfLootTable(ActuallyBlocks.BLACK_PILLAR_QUARTZ_SLAB.get()); + this.registerDropSelfLootTable(ActuallyBlocks.BLACK_BRICK_QUARTZ_SLAB.get()); this.registerDropSelfLootTable(ActuallyBlocks.LAMP_WHITE.get()); this.registerDropSelfLootTable(ActuallyBlocks.LAMP_ORANGE.get()); this.registerDropSelfLootTable(ActuallyBlocks.LAMP_MAGENTA.get()); @@ -138,6 +147,7 @@ public class GeneratorLoot extends LootTableProvider { this.registerDropSelfLootTable(ActuallyBlocks.CHARCOAL.get()); this.registerDropSelfLootTable(ActuallyBlocks.ENDER_CASING.get()); this.registerDropSelfLootTable(ActuallyBlocks.IRON_CASING.get()); + //this.registerDropSelfLootTable(ActuallyBlocks.IRON_CASING_SNOW.get()); this.registerDropSelfLootTable(ActuallyBlocks.LAVA_FACTORY_CASE.get()); this.registerDropSelfLootTable(ActuallyBlocks.WOOD_CASING.get()); diff --git a/src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json new file mode 100644 index 000000000..7b72ce088 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json @@ -0,0 +1,502 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "relay": "actuallyadditions:block/models/laser_relay" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 4, 12], + "faces": { + "north": {"uv": [5, 2, 9, 3], "texture": "#relay"}, + "east": {"uv": [5, 2, 9, 3], "texture": "#relay"}, + "south": {"uv": [5, 2, 9, 3], "texture": "#relay"}, + "west": {"uv": [5, 2, 9, 3], "texture": "#relay"}, + "up": {"uv": [3, 6.5, 7, 10.5], "texture": "#relay"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#relay"} + } + }, + { + "from": [6, 4, 6], + "to": [7, 6, 7], + "faces": { + "north": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "east": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "west": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "up": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "down": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"} + } + }, + { + "from": [9, 4, 9], + "to": [10, 6, 10], + "faces": { + "north": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "east": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "south": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "west": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "up": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "down": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"} + } + }, + { + "from": [6, 4, 9], + "to": [7, 6, 10], + "faces": { + "north": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "south": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "up": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"} + } + }, + { + "from": [3, 1, 12], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [12, 1, 12], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [3, 4, 4], + "to": [4, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [3, 1, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 4, 4], + "to": [13, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [12, 1, 4], + "to": [13, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 270, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 4, 12], + "to": [12, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 4, 3], + "to": [12, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, -7]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, -7]}, + "faces": { + "north": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [9, 4, 6], + "to": [10, 6, 7], + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [8, 4, 7], + "to": [11, 4.5, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [9.5, 4.25, 8]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 8, 6, 9], "rotation": 90, "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 8, 6, 9], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [5, 4, 7], + "to": [8, 4.5, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [6.5, 4.25, 8]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "east": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "south": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "west": {"uv": [4, 8, 4.5, 9], "rotation": 270, "texture": "#relay"}, + "up": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "down": {"uv": [4, 8, 4.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 2.75, 6.25], + "to": [9, 5.75, 6.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 6.5]}, + "faces": { + "north": {"uv": [4.5, 7.5, 5.5, 8], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 8], + "to": [9, 4.5, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 9.5]}, + "faces": { + "north": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "east": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "south": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "west": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "up": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "down": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 6, 7], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "east": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "south": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "west": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "up": {"uv": [1, 6.5, 2, 7.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [1, 6.5, 2, 7.5], "texture": "#relay"} + } + }, + { + "from": [6.5, 5, 7], + "to": [7, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 7, 7], + "to": [7, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 9, 7], + "to": [7, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 5, 7], + "to": [9.5, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 7, 7], + "to": [9.5, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 9, 7], + "to": [9.5, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 6.5], + "to": [9, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 7, 6.5], + "to": [9, 7.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 9, 6.5], + "to": [9, 9.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 9], + "to": [9, 6, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 7, 9], + "to": [9, 7.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 9, 9], + "to": [9, 9.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + } + ], + "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/atomic_reconstructor_block.json b/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json new file mode 100644 index 000000000..f887c770e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json @@ -0,0 +1,359 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "front": "actuallyadditions:block/atomic_reconstructor_front", + "side": "actuallyadditions:block/atomic_reconstructor_side" + }, + "elements": [ + { + "from": [0, 0, 15], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 0, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "up": {"uv": [0, 15, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "south": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "up": {"uv": [15, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [1, 1, 14], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 2], "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 15, 2], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 14, 15, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 14, 15, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [10, 14, 10], + "to": [11, 15, 11], + "faces": { + "north": {"uv": [5, 5, 6, 6], "rotation": 180, "texture": "#front"}, + "east": {"uv": [5, 5, 6, 6], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#front"}, + "west": {"uv": [5, 5, 6, 6], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 5, 6, 6], "rotation": 180, "texture": "#front"}, + "down": {"uv": [5, 5, 6, 6], "texture": "#front"} + } + }, + { + "from": [10, 14, 5], + "to": [11, 15, 6], + "faces": { + "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#front"}, + "east": {"uv": [5, 10, 6, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 10, 6, 11], "texture": "#front"}, + "west": {"uv": [5, 10, 6, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [5, 10, 6, 11], "texture": "#front"} + } + }, + { + "from": [5, 14, 10], + "to": [6, 15, 11], + "faces": { + "north": {"uv": [10, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "east": {"uv": [10, 5, 11, 6], "rotation": 270, "texture": "#front"}, + "south": {"uv": [10, 5, 11, 6], "texture": "#front"}, + "west": {"uv": [10, 5, 11, 6], "rotation": 90, "texture": "#front"}, + "up": {"uv": [10, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "down": {"uv": [10, 5, 11, 6], "texture": "#front"} + } + }, + { + "from": [5, 14, 5], + "to": [6, 15, 6], + "faces": { + "north": {"uv": [10, 10, 11, 11], "rotation": 180, "texture": "#front"}, + "east": {"uv": [10, 10, 11, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [10, 10, 11, 11], "texture": "#front"}, + "west": {"uv": [10, 10, 11, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [10, 10, 11, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [10, 10, 11, 11], "texture": "#front"} + } + }, + { + "from": [5, 14, 11], + "to": [11, 15, 14], + "faces": { + "north": {"uv": [5, 4, 11, 5], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 2, 11, 3], "rotation": 180, "texture": "#front"}, + "west": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 2, 11, 5], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#front"} + } + }, + { + "from": [5, 14, 2], + "to": [11, 15, 5], + "faces": { + "north": {"uv": [5, 13, 11, 14], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 11, 11, 12], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 11, 11, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#front"} + } + }, + { + "from": [2, 14, 2], + "to": [5, 15, 14], + "faces": { + "north": {"uv": [11, 13, 14, 14], "rotation": 180, "texture": "#front"}, + "east": {"uv": [11, 2, 12, 14], "rotation": 270, "texture": "#front"}, + "south": {"uv": [11, 2, 14, 3], "texture": "#front"}, + "west": {"uv": [13, 2, 14, 14], "rotation": 90, "texture": "#front"}, + "up": {"uv": [11, 2, 14, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 3, 12], "texture": "#front"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 15, 14], + "faces": { + "north": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#front"}, + "east": {"uv": [2, 2, 3, 14], "rotation": 270, "texture": "#front"}, + "south": {"uv": [2, 2, 5, 3], "texture": "#front"}, + "west": {"uv": [4, 2, 5, 14], "rotation": 90, "texture": "#front"}, + "up": {"uv": [2, 2, 5, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 3, 12], "texture": "#front"} + } + }, + { + "from": [14, 1, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#missing"}, + "east": {"uv": [1, 2, 15, 14], "rotation": 270, "texture": "#side"}, + "south": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#missing"}, + "west": {"uv": [2, 2, 16, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#side"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#missing"}, + "east": {"uv": [2, 2, 16, 14], "rotation": 270, "texture": "#base"}, + "south": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#missing"}, + "west": {"uv": [1, 2, 15, 14], "rotation": 90, "texture": "#side"}, + "up": {"uv": [14, 2, 15, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#side"} + } + }, + { + "from": [2, 1, 2], + "to": [14, 2, 14], + "faces": { + "north": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [13, 2, 14, 14], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [2, 2, 14, 3], "texture": "#missing"}, + "west": {"uv": [2, 2, 3, 14], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#side"} + } + }, + { + "from": [2, 13, 2], + "to": [14, 14, 14], + "faces": { + "north": {"uv": [2, 13, 14, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 3, 14], "rotation": 270, "texture": "#base"}, + "south": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [-90, 0, 45], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [-90, 0, -45], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [-90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [-60, 0, -135], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, 0, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/battery_box_block.json b/src/main/resources/assets/actuallyadditions/models/block/battery_box_block.json new file mode 100644 index 000000000..a8452efa3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/battery_box_block.json @@ -0,0 +1,336 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/battery_box_side", + "top": "actuallyadditions:block/battery_box_top" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [2, 2, 2], + "to": [14, 5, 14], + "faces": { + "north": {"uv": [2, 13, 14, 16], "texture": "#side"}, + "east": {"uv": [2, 10, 14, 13], "texture": "#side"}, + "south": {"uv": [2, 0, 14, 3], "texture": "#side"}, + "west": {"uv": [2, 7, 14, 10], "texture": "#side"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#top"} + } + }, + { + "from": [5, 5, 5], + "to": [6, 7, 6], + "faces": { + "north": {"uv": [10, 5, 11, 6], "texture": "#top"}, + "east": {"uv": [10, 5, 11, 6], "texture": "#top"}, + "south": {"uv": [10, 5, 11, 6], "texture": "#top"}, + "west": {"uv": [10, 5, 11, 6], "texture": "#top"}, + "up": {"uv": [10, 5, 11, 6], "texture": "#top"}, + "down": {"uv": [4, 7.5, 4.5, 8], "texture": "#missing"} + } + }, + { + "from": [10, 5, 10], + "to": [11, 7, 11], + "faces": { + "north": {"uv": [10, 10, 11, 11], "texture": "#top"}, + "east": {"uv": [10, 10, 11, 11], "texture": "#top"}, + "south": {"uv": [10, 10, 11, 11], "texture": "#top"}, + "west": {"uv": [10, 10, 11, 11], "texture": "#top"}, + "up": {"uv": [10, 10, 11, 11], "texture": "#top"}, + "down": {"uv": [10, 10, 11, 11], "texture": "#top"} + } + }, + { + "from": [5, 5, 10], + "to": [6, 7, 11], + "faces": { + "north": {"uv": [5, 10, 6, 11], "texture": "#top"}, + "east": {"uv": [5, 10, 6, 11], "texture": "#top"}, + "south": {"uv": [5, 10, 6, 11], "texture": "#top"}, + "west": {"uv": [5, 10, 6, 11], "texture": "#top"}, + "up": {"uv": [5, 10, 6, 11], "texture": "#top"}, + "down": {"uv": [5, 10, 6, 11], "texture": "#top"} + } + }, + { + "from": [1, 1, 14], + "to": [2, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 9, 13]}, + "faces": { + "north": {"uv": [14, 1, 15, 6], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 6], "rotation": 180, "texture": "#base"}, + "south": {"uv": [14, 1, 15, 6], "rotation": 180, "texture": "#base"}, + "west": {"uv": [14, 1, 15, 6], "rotation": 180, "texture": "#base"}, + "up": {"uv": [14, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#base"} + } + }, + { + "from": [14, 1, 14], + "to": [15, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 9, 12]}, + "faces": { + "north": {"uv": [14, 10, 15, 15], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 10, 15, 15], "rotation": 180, "texture": "#base"}, + "south": {"uv": [14, 10, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [14, 10, 15, 15], "rotation": 180, "texture": "#base"}, + "up": {"uv": [14, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [1, 1, 1], + "to": [2, 6, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 9, 0]}, + "faces": { + "north": {"uv": [1, 1, 2, 6], "rotation": 180, "texture": "#base"}, + "east": {"uv": [1, 1, 2, 6], "rotation": 180, "texture": "#base"}, + "south": {"uv": [1, 1, 2, 6], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 1, 2, 6], "rotation": 180, "texture": "#base"}, + "up": {"uv": [1, 1, 2, 2], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [14, 1, 1], + "to": [15, 6, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 9, 1]}, + "faces": { + "north": {"uv": [1, 10, 2, 15], "rotation": 180, "texture": "#base"}, + "east": {"uv": [1, 10, 2, 15], "rotation": 180, "texture": "#base"}, + "south": {"uv": [1, 10, 2, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 10, 2, 15], "rotation": 180, "texture": "#base"}, + "up": {"uv": [1, 11, 2, 12], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [1, 5, 2], + "to": [2, 6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 9, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "east": {"uv": [1, 2, 2, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "west": {"uv": [1, 2, 2, 14], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "down": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 1, 2], + "to": [15, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "east": {"uv": [1, 2, 2, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "west": {"uv": [1, 2, 2, 14], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "down": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 5, 2], + "to": [15, 6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "east": {"uv": [14, 2, 15, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "west": {"uv": [14, 2, 15, 14], "rotation": 270, "texture": "#base"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "down": {"uv": [14, 2, 15, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "east": {"uv": [14, 2, 15, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "west": {"uv": [14, 2, 15, 14], "rotation": 270, "texture": "#base"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "down": {"uv": [14, 2, 15, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [2, 5, 14], + "to": [14, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 4]}, + "faces": { + "north": {"uv": [2, 14, 14, 15], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "south": {"uv": [2, 14, 14, 15], "texture": "#base"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "up": {"uv": [2, 14, 14, 15], "texture": "#base"}, + "down": {"uv": [2, 14, 14, 15], "texture": "#base"} + } + }, + { + "from": [2, 1, 1], + "to": [14, 2, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, -9]}, + "faces": { + "north": {"uv": [2, 14, 14, 15], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "south": {"uv": [2, 14, 14, 15], "texture": "#base"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "up": {"uv": [2, 14, 14, 15], "texture": "#base"}, + "down": {"uv": [2, 14, 14, 15], "texture": "#base"} + } + }, + { + "from": [2, 5, 1], + "to": [14, 6, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, -8]}, + "faces": { + "north": {"uv": [2, 1, 14, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "south": {"uv": [2, 1, 14, 2], "texture": "#base"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "up": {"uv": [2, 1, 14, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 14, 2], "texture": "#base"} + } + }, + { + "from": [2, 1, 14], + "to": [14, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 5]}, + "faces": { + "north": {"uv": [2, 1, 14, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "south": {"uv": [2, 1, 14, 2], "texture": "#base"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#side"}, + "up": {"uv": [2, 1, 14, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 14, 2], "texture": "#base"} + } + }, + { + "from": [10, 5, 5], + "to": [11, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "west": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "up": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "down": {"uv": [5, 5, 6, 6], "texture": "#top"} + } + }, + { + "from": [5.5, 6, 6], + "to": [6, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 15]}, + "faces": { + "north": {"uv": [1, 6, 2, 10], "rotation": 270, "texture": "#top"}, + "east": {"uv": [1, 6, 2, 10], "rotation": 270, "texture": "#top"}, + "south": {"uv": [1, 6, 2, 10], "rotation": 270, "texture": "#top"}, + "west": {"uv": [1, 6, 2, 10], "rotation": 270, "texture": "#top"}, + "up": {"uv": [1, 6, 2, 10], "texture": "#top"}, + "down": {"uv": [1, 6, 2, 10], "rotation": 270, "texture": "#top"} + } + }, + { + "from": [10, 6, 6], + "to": [10.5, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, + "faces": { + "north": {"uv": [14, 6, 15, 10], "texture": "#top"}, + "east": {"uv": [14, 6, 15, 10], "texture": "#top"}, + "south": {"uv": [14, 6, 15, 10], "texture": "#top"}, + "west": {"uv": [14, 6, 15, 10], "texture": "#top"}, + "up": {"uv": [14, 6, 15, 10], "texture": "#top"}, + "down": {"uv": [14, 6, 15, 10], "texture": "#top"} + } + }, + { + "from": [6, 6, 5.5], + "to": [10, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 14]}, + "faces": { + "north": {"uv": [6, 1, 10, 2], "rotation": 180, "texture": "#top"}, + "east": {"uv": [6, 1, 10, 2], "rotation": 180, "texture": "#top"}, + "south": {"uv": [6, 1, 10, 2], "rotation": 180, "texture": "#top"}, + "west": {"uv": [6, 1, 10, 2], "rotation": 180, "texture": "#top"}, + "up": {"uv": [6, 1, 10, 2], "rotation": 180, "texture": "#top"}, + "down": {"uv": [6, 1, 10, 2], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [6, 6, 10], + "to": [10, 7, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 17]}, + "faces": { + "north": {"uv": [6, 14, 10, 15], "texture": "#top"}, + "east": {"uv": [6, 14, 10, 15], "texture": "#top"}, + "south": {"uv": [6, 14, 10, 15], "texture": "#top"}, + "west": {"uv": [6, 14, 10, 15], "texture": "#top"}, + "up": {"uv": [6, 14, 10, 15], "texture": "#top"}, + "down": {"uv": [6, 14, 10, 15], "texture": "#top"} + } + }, + { + "from": [6, 5, 6], + "to": [10, 7, 10], + "faces": { + "north": {"uv": [6, 2, 10, 4], "rotation": 180, "texture": "#top"}, + "east": {"uv": [12, 6, 14, 10], "rotation": 90, "texture": "#top"}, + "south": {"uv": [6, 12, 10, 14], "texture": "#top"}, + "west": {"uv": [2, 6, 4, 10], "rotation": 270, "texture": "#top"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#top"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#top"} + } + } + ], + "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/bio_reactor_block.json b/src/main/resources/assets/actuallyadditions/models/block/bio_reactor_block.json new file mode 100644 index 000000000..5ec1325bc --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/bio_reactor_block.json @@ -0,0 +1,670 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/heat_collector_top", + "back": "actuallyadditions:block/base_texture_side", + "top_animation": "actuallyadditions:block/bioreactor_glow_animated", + "side": "actuallyadditions:block/bioreactor_side", + "side_glass": "actuallyadditions:block/bioreactor_side_glass", + "front": "actuallyadditions:block/bioreactor_front" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 11, 5], + "to": [16, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 19, 13]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "east": {"uv": [5, 4, 11, 5], "rotation": 180, "texture": "#side_glass"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "west": {"uv": [5, 4, 11, 5], "texture": "#side_glass"}, + "up": {"uv": [5, 4, 11, 5], "rotation": 90, "texture": "#side_glass"}, + "down": {"uv": [5, 4, 11, 5], "rotation": 270, "texture": "#side_glass"} + } + }, + { + "from": [0, 11, 5], + "to": [1, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 13]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "east": {"uv": [0, 0, 6, 1], "texture": "#side_glass"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "west": {"uv": [5, 4, 11, 5], "texture": "#side_glass"}, + "up": {"uv": [5, 4, 11, 5], "rotation": 90, "texture": "#side_glass"}, + "down": {"uv": [5, 4, 11, 5], "rotation": 270, "texture": "#side_glass"} + } + }, + { + "from": [15, 4, 5], + "to": [16, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 12, 13]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "east": {"uv": [5, 11, 11, 12], "rotation": 180, "texture": "#side_glass"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "west": {"uv": [5, 11, 11, 12], "texture": "#side_glass"}, + "up": {"uv": [5, 11, 11, 12], "rotation": 90, "texture": "#side_glass"}, + "down": {"uv": [0, 0, 1, 6], "texture": "#side_glass"} + } + }, + { + "from": [0, 4, 5], + "to": [1, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 13]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "east": {"uv": [0, 0, 6, 1], "texture": "#side_glass"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "west": {"uv": [5, 11, 11, 12], "texture": "#side_glass"}, + "up": {"uv": [5, 11, 11, 12], "rotation": 90, "texture": "#side_glass"}, + "down": {"uv": [0, 0, 1, 6], "texture": "#side_glass"} + } + }, + { + "from": [15, 4, 11], + "to": [16, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 12, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 12], "texture": "#side_glass"}, + "east": {"uv": [11, 4, 12, 12], "texture": "#side_glass"}, + "south": {"uv": [11, 4, 12, 12], "texture": "#side_glass"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side_glass"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#side_glass"} + } + }, + { + "from": [0, 4, 11], + "to": [1, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 12], "texture": "#side_glass"}, + "east": {"uv": [0, 0, 1, 8], "texture": "#side_glass"}, + "south": {"uv": [11, 4, 12, 12], "texture": "#side_glass"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side_glass"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#side_glass"} + } + }, + { + "from": [15, 4, 4], + "to": [16, 12, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 12, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 8], "texture": "#side_glass"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#side_glass"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#side_glass"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side_glass"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#side_glass"} + } + }, + { + "from": [0, 4, 4], + "to": [1, 12, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 8], "texture": "#side_glass"}, + "east": {"uv": [0, 0, 1, 8], "texture": "#side_glass"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#side_glass"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side_glass"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#side_glass"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#side_glass"} + } + }, + { + "from": [15, 12, 4], + "to": [16, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 20, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "east": {"uv": [4, 3, 12, 4], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "west": {"uv": [4, 3, 12, 4], "rotation": 180, "texture": "#side"}, + "up": {"uv": [4, 3, 12, 4], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [0, 12, 4], + "to": [1, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "west": {"uv": [4, 3, 12, 4], "rotation": 180, "texture": "#side"}, + "up": {"uv": [4, 3, 12, 4], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [15, 3, 4], + "to": [16, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 11, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "east": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#side"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "west": {"uv": [4, 12, 12, 13], "texture": "#side"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 12, 12, 13], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [0, 3, 4], + "to": [1, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side"}, + "west": {"uv": [4, 12, 12, 13], "texture": "#side"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 12, 12, 13], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [15, 3, 12], + "to": [16, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 11, 20]}, + "faces": { + "north": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "east": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "south": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "west": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "up": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "down": {"uv": [3, 12, 4, 13], "texture": "#side"} + } + }, + { + "from": [0, 3, 12], + "to": [1, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 20]}, + "faces": { + "north": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "east": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "south": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "west": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "up": {"uv": [12, 3, 13, 4], "texture": "#side"}, + "down": {"uv": [12, 12, 13, 13], "texture": "#side"} + } + }, + { + "from": [15, 3, 3], + "to": [16, 13, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 11, 11]}, + "faces": { + "north": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "east": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "south": {"uv": [12, 3, 13, 13], "texture": "#side"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "up": {"uv": [12, 3, 13, 4], "texture": "#side"}, + "down": {"uv": [12, 12, 13, 13], "texture": "#side"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 13, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 11]}, + "faces": { + "north": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "east": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "south": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#side"}, + "up": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "down": {"uv": [3, 12, 4, 13], "texture": "#side"} + } + }, + { + "from": [4, 13, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#top_animation"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 12]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 19]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 0]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 10]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#side"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#back"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#front"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#front"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#front"}, + "up": {"uv": [1, 1, 15, 2], "texture": "#top"}, + "down": {"uv": [0, 0, 14, 1], "texture": "#front"} + } + }, + { + "from": [0, 8, 6], + "to": [1, 9, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 14]}, + "faces": { + "north": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "east": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "south": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "west": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "up": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "down": {"uv": [6, 7, 7, 8], "texture": "#side_glass"} + } + }, + { + "from": [15, 8, 6], + "to": [16, 9, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 16, 14]}, + "faces": { + "north": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "east": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "south": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "west": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "up": {"uv": [6, 7, 7, 8], "texture": "#side_glass"}, + "down": {"uv": [6, 7, 7, 8], "texture": "#side_glass"} + } + }, + { + "from": [0, 9, 7], + "to": [1, 10, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 15]}, + "faces": { + "north": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "east": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "south": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "west": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "up": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "down": {"uv": [7, 6, 8, 7], "texture": "#side_glass"} + } + }, + { + "from": [15, 9, 7], + "to": [16, 10, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 17, 15]}, + "faces": { + "north": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "east": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "south": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "west": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "up": {"uv": [7, 6, 8, 7], "texture": "#side_glass"}, + "down": {"uv": [7, 6, 8, 7], "texture": "#side_glass"} + } + }, + { + "from": [0, 6, 9], + "to": [1, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 17]}, + "faces": { + "north": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "east": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "south": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "west": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "up": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "down": {"uv": [9, 9, 10, 10], "texture": "#side_glass"} + } + }, + { + "from": [15, 6, 9], + "to": [16, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 14, 17]}, + "faces": { + "north": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "east": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "south": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "west": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "up": {"uv": [9, 9, 10, 10], "texture": "#side_glass"}, + "down": {"uv": [9, 9, 10, 10], "texture": "#side_glass"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_block.json new file mode 100644 index 000000000..ca371f3f2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "actuallyadditions:block/black_quartz_block_top", + "side": "actuallyadditions:block/black_quartz_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json new file mode 100644 index 000000000..d37689b8d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "actuallyadditions:block/black_quartz_chiseled_block_top", + "side": "actuallyadditions:block/black_quartz_chiseled_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json new file mode 100644 index 000000000..723f2a268 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "actuallyadditions:block/black_quartz_pillar_block_top", + "side": "actuallyadditions:block/black_quartz_pillar_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_smooth_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_smooth_block.json new file mode 100644 index 000000000..e269ec264 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_smooth_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/black_quartz_smooth_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/breaker_block.json b/src/main/resources/assets/actuallyadditions/models/block/breaker_block.json new file mode 100644 index 000000000..f49d68f48 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/breaker_block.json @@ -0,0 +1,265 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "back": "actuallyadditions:block/base_texture_back", + "front": "actuallyadditions:block/block_breaker_front", + "top": "actuallyadditions:block/base_texture_arrow", + "side": "actuallyadditions:block/block_breaker_side" + }, + "elements": [ + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [3, 9, 5, 10], "texture": "#front"}, + "east": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#front"}, + "south": {"uv": [3, 6, 5, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [11, 9, 13, 10], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#front"}, + "south": {"uv": [11, 6, 13, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 10, 11, 11], "texture": "#front"}, + "east": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "west": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#front"} + } + }, + { + "from": [0, 3, 6], + "to": [1, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 90, "texture": "#side"}, + "east": {"uv": [0, 0, 10, 4], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 90, "texture": "#side"}, + "west": {"uv": [3, 6, 13, 10], "rotation": 90, "texture": "#side"}, + "up": {"uv": [3, 6, 4, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [12, 6, 13, 10], "texture": "#side"} + } + }, + { + "from": [15, 3, 6], + "to": [16, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 270, "texture": "#side"}, + "east": {"uv": [3, 6, 13, 10], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 270, "texture": "#side"}, + "west": {"uv": [0, 0, 10, 4], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [12, 6, 13, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 6, 4, 10], "texture": "#side"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 15, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 15, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "east": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#front"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#back"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [-90, 0, 45], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [-90, 0, -45], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [-90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [-60, 0, -135], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, 0, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/canola_press_block.json b/src/main/resources/assets/actuallyadditions/models/block/canola_press_block.json new file mode 100644 index 000000000..c95d652ba --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/canola_press_block.json @@ -0,0 +1,339 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/canola_press", + "side": "actuallyadditions:block/canola_press", + "metal_rim": "actuallyadditions:block/misc_barrel_top", + "wood": "actuallyadditions:block/misc_wood", + "top": "actuallyadditions:block/canola_top" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [14, 6, 14], + "faces": { + "north": {"uv": [2, 10, 14, 16], "texture": "#side"}, + "east": {"uv": [2, 10, 14, 16], "texture": "#side"}, + "south": {"uv": [2, 10, 14, 16], "texture": "#side"}, + "west": {"uv": [2, 10, 14, 16], "texture": "#side"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#top"} + } + }, + { + "from": [2, 10, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, + "faces": { + "north": {"uv": [2, 0, 14, 5], "texture": "#side"}, + "east": {"uv": [2, 0, 14, 5], "texture": "#side"}, + "south": {"uv": [2, 0, 14, 5], "texture": "#side"}, + "west": {"uv": [2, 0, 14, 5], "texture": "#side"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#top"} + } + }, + { + "from": [3, 6, 3], + "to": [13, 10, 13], + "faces": { + "north": {"uv": [3, 6, 13, 10], "texture": "#side"}, + "east": {"uv": [3, 6, 13, 10], "texture": "#side"}, + "south": {"uv": [3, 6, 13, 10], "texture": "#side"}, + "west": {"uv": [3, 6, 13, 10], "texture": "#side"}, + "up": {"uv": [0, 0, 10, 10], "texture": "#side"}, + "down": {"uv": [0, 0, 10, 10], "texture": "#side"} + } + }, + { + "from": [1, 0, 1], + "to": [3, 15.5, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "east": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "south": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "west": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#wood"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#wood"} + } + }, + { + "from": [1, 0, 13], + "to": [3, 15.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 21]}, + "faces": { + "north": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "east": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "south": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "west": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#wood"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#wood"} + } + }, + { + "from": [13, 0, 1], + "to": [15, 15.5, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 9]}, + "faces": { + "north": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "east": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "south": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "west": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#wood"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#wood"} + } + }, + { + "from": [13, 0, 13], + "to": [15, 15.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 21]}, + "faces": { + "north": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "east": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "south": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "west": {"uv": [1, 0, 3, 16], "texture": "#wood"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#wood"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#wood"} + } + }, + { + "from": [0.9, 0, 0.9], + "to": [3.1, 0.5, 3.1], + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [0.9, 0, 12.9], + "to": [3.1, 0.5, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [0.9, 5, 12.9], + "to": [3.1, 6.5, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [0.9, 5, 0.9], + "to": [3.1, 6.5, 3.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 5, 12.9], + "to": [15.1, 6.5, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 13, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 5, 0.9], + "to": [15.1, 6.5, 3.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 13, 8]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [0.9, 9.5, 12.9], + "to": [3.1, 11, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [0.9, 9.5, 0.9], + "to": [3.1, 11, 3.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 9.5, 12.9], + "to": [15.1, 11, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 18, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 9.5, 0.9], + "to": [15.1, 11, 3.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 18, 8]}, + "faces": { + "north": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 0, 0.9], + "to": [15.1, 0.5, 3.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 8, 8]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 0, 12.9], + "to": [15.1, 0.5, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 8, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "south": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 15.5, 0.9], + "to": [15.1, 16, 3.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 24, 8]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [5, 7, 6, 9], "rotation": 90, "texture": "#metal_rim"}, + "south": {"uv": [4, 8, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [12.9, 15.5, 12.9], + "to": [15.1, 16, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 24, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [5, 7, 6, 9], "rotation": 90, "texture": "#metal_rim"}, + "south": {"uv": [4, 8, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [0.9, 15.5, 0.9], + "to": [3.1, 16, 3.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [5, 7, 6, 9], "rotation": 90, "texture": "#metal_rim"}, + "south": {"uv": [4, 8, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + }, + { + "from": [0.9, 15.5, 12.9], + "to": [3.1, 16, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 20]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#metal_rim"}, + "east": {"uv": [5, 7, 6, 9], "rotation": 90, "texture": "#metal_rim"}, + "south": {"uv": [4, 8, 6, 9], "texture": "#metal_rim"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#metal_rim"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#metal_rim"}, + "down": {"uv": [0, 0, 2.2, 2.2], "texture": "#metal_rim"} + } + } + ], + "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/charcoal_block.json b/src/main/resources/assets/actuallyadditions/models/block/charcoal_block.json new file mode 100644 index 000000000..2f90e93a1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/charcoal_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/charcoal_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/coal_generator_block.json b/src/main/resources/assets/actuallyadditions/models/block/coal_generator_block.json new file mode 100644 index 000000000..a2b3fdff0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/coal_generator_block.json @@ -0,0 +1,444 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "front": "actuallyadditions:block/coal_generator_front", + "side": "actuallyadditions:block/generator_side", + "top": "actuallyadditions:block/generator_top", + "animation": "actuallyadditions:block/coal_generator_fire_animated" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [5, 14, 6], + "to": [11, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 15]}, + "faces": { + "north": {"uv": [5, 6, 11, 7], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "south": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "west": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "up": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "down": {"uv": [5, 6, 11, 7], "texture": "#top"} + } + }, + { + "from": [5, 14, 8], + "to": [11, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 17]}, + "faces": { + "north": {"uv": [5, 8, 11, 9], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "south": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "west": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "up": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "down": {"uv": [5, 8, 11, 9], "texture": "#top"} + } + }, + { + "from": [5, 14, 10], + "to": [11, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 19]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 10, 11, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [5, 14, 2], + "to": [11, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 10]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 2, 11, 5], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [11, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [5, 15, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [2, 2, 5, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#side"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#side"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [3, 11, 0], + "to": [13, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 8]}, + "faces": { + "north": {"uv": [3, 4, 13, 5], "texture": "#front"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#front"}, + "west": {"uv": [12, 4, 13, 5], "texture": "#front"}, + "up": {"uv": [3, 4, 13, 5], "texture": "#front"}, + "down": {"uv": [3, 4, 13, 5], "texture": "#front"} + } + }, + { + "from": [5, 3, 1], + "to": [6, 8, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]}, + "faces": { + "north": {"uv": [10, 8, 11, 13], "texture": "#front"}, + "east": {"uv": [10, 8, 11, 13], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#front"}, + "west": {"uv": [10, 8, 11, 13], "texture": "#front"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#front"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#front"} + } + }, + { + "from": [10, 3, 1], + "to": [11, 8, 2], + "faces": { + "north": {"uv": [5, 8, 6, 13], "texture": "#front"}, + "east": {"uv": [5, 8, 6, 13], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#front"}, + "west": {"uv": [5, 8, 6, 13], "texture": "#front"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#front"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#front"} + } + }, + { + "from": [3, 8, 1], + "to": [13, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 20, 9]}, + "faces": { + "north": {"uv": [3, 1, 13, 8], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [3, 1, 13, 2], "texture": "#top"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#front"} + } + }, + { + "from": [3, 0, 1], + "to": [13, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 9]}, + "faces": { + "north": {"uv": [3, 13, 13, 16], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#front"}, + "down": {"uv": [3, 1, 13, 2], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [3, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-4, 8, 8]}, + "faces": { + "north": {"uv": [13, 1, 15, 16], "texture": "#front"}, + "east": {"uv": [13, 1, 14, 16], "texture": "#front"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "up": {"uv": [1, 1, 3, 2], "texture": "#top"}, + "down": {"uv": [13, 1, 15, 2], "texture": "#base"} + } + }, + { + "from": [13, 0, 1], + "to": [15, 15, 2], + "faces": { + "north": {"uv": [1, 1, 3, 16], "texture": "#front"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [2, 1, 3, 16], "texture": "#front"}, + "up": {"uv": [13, 1, 15, 2], "texture": "#top"}, + "down": {"uv": [1, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [5, 13, 5], + "to": [11, 14, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, 15]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [2, 2, 8, 7], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + }, + { + "from": [2, 3, 2], + "to": [14, 8, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [4, 4, 16, 16], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + }, + { + "from": [0, 0, 15], + "to": [1, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 23]}, + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [15, 0, 15], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 23]}, + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 1], + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/coffee_machine_block.json b/src/main/resources/assets/actuallyadditions/models/block/coffee_machine_block.json new file mode 100644 index 000000000..d07a79d68 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/coffee_machine_block.json @@ -0,0 +1,482 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "actuallyadditions:block/models/coffee_machine", + "coffee_machine": "actuallyadditions:block/models/coffee_machine" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "faces": { + "north": {"uv": [9, 15.5, 16, 16], "texture": "#coffee_machine"}, + "east": {"uv": [9, 9, 9.5, 16], "rotation": 270, "texture": "#coffee_machine"}, + "south": {"uv": [9, 9, 16, 9.5], "rotation": 180, "texture": "#coffee_machine"}, + "west": {"uv": [15.5, 9, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [9, 9, 16, 16], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [9, 9, 16, 16], "texture": "#coffee_machine"} + } + }, + { + "from": [7, 1, 8], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [4, 0, 8, 4.5], "texture": "#coffee_machine"}, + "east": {"uv": [4, 0, 8, 4.5], "texture": "#coffee_machine"}, + "south": {"uv": [0, 0, 4, 4.5], "texture": "#coffee_machine"}, + "west": {"uv": [4, 0, 8, 4.5], "texture": "#coffee_machine"}, + "up": {"uv": [0, 0, 8, 6], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 8, 6], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [6, 9, 3], + "to": [15, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [6.5, 9.5, 7, 15], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [0, 14.5, 7, 15], "texture": "#coffee_machine"}, + "south": {"uv": [0, 9.5, 0.5, 15], "rotation": 270, "texture": "#coffee_machine"}, + "west": {"uv": [0, 9.5, 7, 10], "rotation": 180, "texture": "#coffee_machine"}, + "up": {"uv": [0, 9.5, 7, 15], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [0, 9.5, 7, 15], "rotation": 270, "texture": "#coffee_machine"} + } + }, + { + "from": [8, 11, 8], + "to": [13, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 7]}, + "faces": { + "north": {"uv": [0, 0, 6, 2], "texture": "#coffee_machine"}, + "east": {"uv": [0, 0, 6, 2], "texture": "#coffee_machine"}, + "south": {"uv": [0, 0, 6, 2], "texture": "#coffee_machine"}, + "west": {"uv": [0, 0, 6, 2], "texture": "#coffee_machine"}, + "up": {"uv": [4, 4.5, 7, 7.5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [10, 8, 3.5], + "to": [11, 9, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 7]}, + "faces": { + "north": {"uv": [5.5, 8, 6, 8.5], "texture": "#coffee_machine"}, + "east": {"uv": [5.5, 8, 6, 8.5], "texture": "#coffee_machine"}, + "south": {"uv": [5.5, 8, 6, 8.5], "texture": "#coffee_machine"}, + "west": {"uv": [5.5, 8, 6, 8.5], "texture": "#coffee_machine"}, + "up": {"uv": [5.5, 8, 6, 8.5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [9, 1, 2], + "to": [12, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [13, 4.5, 15, 5], "texture": "#coffee_machine"}, + "east": {"uv": [13, 4.5, 15, 5], "texture": "#coffee_machine"}, + "south": {"uv": [13, 4.5, 15, 5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 4.5, 15, 5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 4.5, 15, 5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 4.5, 15, 5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [9, 2, 5], + "to": [12, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [13, 5, 15, 7.5], "texture": "#coffee_machine"}, + "east": {"uv": [14.5, 2.5, 15, 5], "texture": "#coffee_machine"}, + "south": {"uv": [13, 2.5, 15, 5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 2.5, 13.5, 5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 2.5, 15, 3], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 4.5, 15, 5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [9, 2, 1], + "to": [12, 7, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [13, 0, 15, 2.5], "texture": "#coffee_machine"}, + "east": {"uv": [13, 0, 13.5, 2.5], "texture": "#coffee_machine"}, + "south": {"uv": [13, 5, 15, 7.5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 0, 13.5, 2.5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 0, 15, 0.5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 2, 15, 2.5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [12, 2, 2], + "to": [13, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [14.5, 2.5, 15, 5], "texture": "#coffee_machine"}, + "east": {"uv": [13, 2.5, 15, 5], "texture": "#coffee_machine"}, + "south": {"uv": [13, 2.5, 13.5, 5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 5, 15, 7.5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 2.5, 15, 3], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 4.5, 15, 5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [8, 2, 2], + "to": [9, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [13, 2.5, 13.5, 5], "texture": "#coffee_machine"}, + "east": {"uv": [13, 5, 15, 7.5], "texture": "#coffee_machine"}, + "south": {"uv": [14.5, 2.5, 15, 5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 2.5, 15, 5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 2.5, 15, 3], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 4.5, 15, 5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [13, 4.5, 13.5, 5], "texture": "#coffee_machine"}, + "east": {"uv": [13, 4.5, 13.5, 5], "texture": "#coffee_machine"}, + "south": {"uv": [13, 4.5, 13.5, 5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 4.5, 13.5, 5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 4.5, 13.5, 5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 4.5, 13.5, 5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [13, 5, 3], + "to": [14, 6, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "east": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "south": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 4, 13.5, 4.5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 4, 13.5, 4.5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [14, 3, 3], + "to": [15, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "north": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "east": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "south": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "west": {"uv": [13, 4, 13.5, 4.5], "texture": "#coffee_machine"}, + "up": {"uv": [13, 4, 13.5, 4.5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [13, 4, 13.5, 4.5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [13, 10.2, 4.2], + "to": [14, 11.2, 5.2], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 8]}, + "faces": { + "north": {"uv": [1.5, 2.5, 2, 3], "texture": "#coffee_machine"}, + "east": {"uv": [1.5, 2.5, 2, 3], "texture": "#coffee_machine"}, + "south": {"uv": [1.5, 2.5, 2, 3], "texture": "#coffee_machine"}, + "west": {"uv": [1.5, 2.5, 2, 3], "texture": "#coffee_machine"}, + "up": {"uv": [1.5, 2.5, 2, 3], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [1.5, 2.5, 2, 3], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [11, 10.2, 4.2], + "to": [12, 11.2, 5.2], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]}, + "faces": { + "north": {"uv": [1.5, 1, 2, 1.5], "texture": "#coffee_machine"}, + "east": {"uv": [1.5, 1, 2, 1.5], "texture": "#coffee_machine"}, + "south": {"uv": [1.5, 1, 2, 1.5], "texture": "#coffee_machine"}, + "west": {"uv": [1.5, 1, 2, 1.5], "texture": "#coffee_machine"}, + "up": {"uv": [1.5, 1, 2, 1.5], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [1.5, 1, 2, 1.5], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [13, 11, 7], + "to": [14, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 7]}, + "faces": { + "north": {"uv": [0, 10.5, 3, 11.5], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [0, 10, 3, 14.5], "rotation": 90, "texture": "#coffee_machine"}, + "south": {"uv": [0, 13.5, 3, 14.5], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [0, 10, 3, 14.5], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [0.5, 14.5, 6.5, 15], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 1, 8], "rotation": 180, "texture": "#missing"} + } + }, + { + "from": [7, 11, 7], + "to": [8, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 7]}, + "faces": { + "north": {"uv": [0, 12, 3, 13], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [0, 10, 3, 14.5], "rotation": 90, "texture": "#coffee_machine"}, + "south": {"uv": [0, 11, 3, 12], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [0, 10, 3, 14.5], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [0.5, 14.5, 6.5, 15], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 1, 8], "rotation": 180, "texture": "#missing"} + } + }, + { + "from": [8, 11, 7], + "to": [13, 14, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 7]}, + "faces": { + "north": {"uv": [0, 10.5, 3, 14], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [0, 0, 1, 3], "texture": "#coffee_machine"}, + "south": {"uv": [0, 10.5, 3, 14], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [0, 0, 1, 3], "texture": "#coffee_machine"}, + "up": {"uv": [6.5, 11, 7, 14.5], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 6, 1], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [8, 11, 13], + "to": [13, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 14]}, + "faces": { + "north": {"uv": [0, 10.5, 3, 14], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [0, 0, 1, 3], "texture": "#missing"}, + "south": {"uv": [0, 10.5, 3, 14], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [0, 0, 1, 3], "texture": "#missing"}, + "up": {"uv": [6.5, 10, 7, 13.5], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 6, 1], "rotation": 180, "texture": "#missing"} + } + }, + { + "from": [14, 1, 14], + "to": [15, 9, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 7]}, + "faces": { + "north": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "south": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [11.5, 15.5, 16, 16], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [11.5, 15.5, 16, 16], "rotation": 270, "texture": "#coffee_machine"} + } + }, + { + "from": [6, 1, 14], + "to": [7, 9, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, 9, 7]}, + "faces": { + "north": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "south": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [11.5, 9, 16, 9.5], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [11.5, 9, 16, 9.5], "rotation": 270, "texture": "#coffee_machine"} + } + }, + { + "from": [14, 1, 7], + "to": [15, 9, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 0]}, + "faces": { + "north": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "south": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [11.5, 9, 16, 9.5], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [11.5, 9, 16, 9.5], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [11.5, 9, 16, 9.5], "rotation": 270, "texture": "#coffee_machine"} + } + }, + { + "from": [6, 1, 7], + "to": [7, 9, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, 9, 0]}, + "faces": { + "north": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "south": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [11.5, 15.5, 16, 16], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [11.5, 15.5, 16, 16], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [11.5, 15.5, 16, 16], "rotation": 270, "texture": "#coffee_machine"} + } + }, + { + "from": [6.8, 1.9, 11.9], + "to": [7, 3.1, 13.1], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 10, 5]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "up": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [6.8, 1.9, 9.9], + "to": [7, 3.1, 11.1], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 10, 3]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "up": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [3, 3, 10], + "to": [4, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 11, 3]}, + "faces": { + "north": {"uv": [5, 7.5, 6, 8], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [5, 7.5, 6, 8], "rotation": 90, "texture": "#coffee_machine"}, + "south": {"uv": [5, 7.5, 6, 8], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [5, 7.5, 6, 8], "rotation": 90, "texture": "#coffee_machine"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [2.9, 4.8, 9.9], + "to": [4.1, 5, 11.1], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 11, 3]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "up": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [2.9, 4.8, 11.9], + "to": [4.1, 5, 13.1], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 11, 5]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#coffee_machine"}, + "up": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [5.5, 7.5, 6, 8], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [3, 2, 12], + "to": [7, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 10, 5]}, + "faces": { + "north": {"uv": [5, 7.5, 7, 8], "rotation": 180, "texture": "#coffee_machine"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#coffee_machine"}, + "south": {"uv": [5, 7.5, 7, 8], "texture": "#coffee_machine"}, + "west": {"uv": [5, 7.5, 5.5, 8], "texture": "#coffee_machine"}, + "up": {"uv": [5, 7.5, 7, 8], "texture": "#coffee_machine"}, + "down": {"uv": [5, 7.5, 7, 8], "texture": "#coffee_machine"} + } + }, + { + "from": [3, 2, 10], + "to": [7, 3, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 10, 3]}, + "faces": { + "north": {"uv": [5, 8.5, 7, 9], "rotation": 180, "texture": "#coffee_machine"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#coffee_machine"}, + "south": {"uv": [5, 8.5, 7, 9], "texture": "#coffee_machine"}, + "west": {"uv": [5, 8.5, 5.5, 9], "texture": "#coffee_machine"}, + "up": {"uv": [5, 8.5, 7, 9], "texture": "#coffee_machine"}, + "down": {"uv": [5, 8.5, 7, 9], "texture": "#coffee_machine"} + } + }, + { + "from": [3, 3, 12], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 11, 5]}, + "faces": { + "north": {"uv": [5.5, 8, 6.5, 8.5], "rotation": 270, "texture": "#coffee_machine"}, + "east": {"uv": [5.5, 8, 6.5, 8.5], "rotation": 270, "texture": "#coffee_machine"}, + "south": {"uv": [5.5, 8, 6.5, 8.5], "rotation": 270, "texture": "#coffee_machine"}, + "west": {"uv": [5.5, 8, 6.5, 8.5], "rotation": 270, "texture": "#coffee_machine"}, + "up": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [2, 5, 9], + "to": [5, 11, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 9, 7]}, + "faces": { + "north": {"uv": [8, 0, 10.5, 4.5], "texture": "#coffee_machine"}, + "east": {"uv": [4, 0, 8, 4.5], "texture": "#coffee_machine"}, + "south": {"uv": [8, 0, 10.5, 4.5], "texture": "#coffee_machine"}, + "west": {"uv": [4, 0, 8, 4.5], "texture": "#coffee_machine"}, + "up": {"uv": [8, 4.5, 10.5, 8], "rotation": 180, "texture": "#coffee_machine"}, + "down": {"uv": [10.5, 4.5, 13, 8], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [2, 11, 11], + "to": [4, 12, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 10, 7]}, + "faces": { + "north": {"uv": [10.5, 0, 11, 1], "rotation": 90, "texture": "#coffee_machine"}, + "east": {"uv": [10, 0, 11, 1], "texture": "#coffee_machine"}, + "south": {"uv": [10, 0, 10.5, 1], "rotation": 90, "texture": "#coffee_machine"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#coffee_machine"}, + "up": {"uv": [10, 0, 11, 1], "rotation": 270, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#coffee_machine"} + } + }, + { + "from": [1, 1, 11], + "to": [2, 12, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 10, 7]}, + "faces": { + "north": {"uv": [10, 0, 10.5, 6], "texture": "#coffee_machine"}, + "east": {"uv": [10, 0, 11, 5.5], "texture": "#coffee_machine"}, + "south": {"uv": [10, 0, 10.5, 6], "texture": "#coffee_machine"}, + "west": {"uv": [10, 0, 11, 6], "texture": "#coffee_machine"}, + "up": {"uv": [10, 0, 11, 0.5], "rotation": 90, "texture": "#coffee_machine"}, + "down": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#missing"} + } + } + ], + "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/crusher_block.json b/src/main/resources/assets/actuallyadditions/models/block/crusher_block.json new file mode 100644 index 000000000..54d083825 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crusher_block.json @@ -0,0 +1,605 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/heat_collector_top", + "back": "actuallyadditions:block/farmer_side", + "top_animation": "actuallyadditions:block/vertical_digger_rotation_animation", + "front": "actuallyadditions:block/crusher_front", + "side": "actuallyadditions:block/crusher_side", + "side_animation": "actuallyadditions:block/single_crusher_rotation_animation" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 12, 4], + "to": [2, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 20, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 1, 12, 4], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [4, 1, 12, 4], "texture": "#side"}, + "up": {"uv": [14, 4, 15, 12], "texture": "#top"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [14, 12, 4], + "to": [15, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 20, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 1, 12, 4], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 4], "texture": "#side"}, + "up": {"uv": [1, 4, 2, 12], "texture": "#top"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [1, 0, 4], + "to": [2, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 12, 12, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [4, 12, 12, 16], "texture": "#side"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 1, 12, 2], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [14, 0, 4], + "to": [15, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 12, 12, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 4], "texture": "#side"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 14, 12, 15], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [4, 13, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#top_animation"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 12]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [3, 12, 5], + "to": [4, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [1, 5, 3, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [12, 12, 5], + "to": [13, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [13, 5, 15, 11], "rotation": 270, "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 3], + "to": [11, 14, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 11]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [5, 1, 11, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 12], + "to": [11, 14, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 20]}, + "faces": { + "north": {"uv": [5, 13, 11, 15], "rotation": 180, "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 11], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 4], + "to": [12, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 4], + "to": [5, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 11], + "to": [5, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 19]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 0]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 10]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [-5, 8, -2]}, + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [12, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [12, 1, 13, 16], "texture": "#side"}, + "west": {"uv": [2, 1, 4, 16], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 4], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -2]}, + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [12, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [12, 1, 13, 16], "texture": "#side"}, + "west": {"uv": [2, 0, 4, 15], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 4], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [1, 0, 12], + "to": [2, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [-5, 8, 8]}, + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [2, 1, 4, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [12, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [14, 12, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [14, 0, 12], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [2, 1, 4, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 4], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#front"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#front"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#missing"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#back"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [13, 4, 4], + "to": [14, 12, 12], + "faces": { + "north": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "east": {"uv": [4, 4, 12, 12], "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#side_animation"}, + "up": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "down": {"uv": [0, 0, 1, 8], "texture": "#side_animation"} + } + }, + { + "from": [2, 4, 4], + "to": [3, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [-3, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "east": {"uv": [4, 4, 12, 12], "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "west": {"uv": [4, 4, 12, 12], "texture": "#side_animation"}, + "up": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "down": {"uv": [0, 0, 1, 8], "texture": "#side_animation"} + } + }, + { + "from": [3, 8, 0], + "to": [6, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 8]}, + "faces": { + "north": {"uv": [10, 6, 13, 8], "texture": "#front"}, + "east": {"uv": [10, 6, 11, 8], "texture": "#front"}, + "south": {"uv": [0, 0, 3, 2], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 8], "texture": "#front"}, + "up": {"uv": [10, 6, 13, 7], "rotation": 180, "texture": "#front"}, + "down": {"uv": [10, 7, 13, 8], "rotation": 180, "texture": "#front"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crusher_double_block.json b/src/main/resources/assets/actuallyadditions/models/block/crusher_double_block.json new file mode 100644 index 000000000..bd5c317ee --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crusher_double_block.json @@ -0,0 +1,616 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/heat_collector_top", + "back": "actuallyadditions:block/farmer_side", + "top_animation": "actuallyadditions:block/vertical_digger_rotation_animation", + "side": "actuallyadditions:block/crusher_side", + "front": "actuallyadditions:block/crusher_front_double", + "side_animation": "actuallyadditions:block/double_crusher_rotation_animation" + }, + "elements": [ + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#missing"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#back"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#front"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#front"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [14, 0, 12], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [2, 1, 4, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 4], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [1, 0, 12], + "to": [2, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [-5, 8, 8]}, + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [2, 1, 4, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [12, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [14, 12, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -2]}, + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [12, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [12, 1, 13, 16], "texture": "#side"}, + "west": {"uv": [2, 0, 4, 15], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 4], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [-5, 8, -2]}, + "faces": { + "north": {"uv": [3, 1, 4, 16], "texture": "#side"}, + "east": {"uv": [12, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [12, 1, 13, 16], "texture": "#side"}, + "west": {"uv": [2, 1, 4, 16], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 4], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 4], "texture": "#base"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 10]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 0]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 19]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 11], + "to": [5, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 4], + "to": [5, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 4], + "to": [12, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 11], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 12], + "to": [11, 14, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 20]}, + "faces": { + "north": {"uv": [5, 13, 11, 15], "rotation": 180, "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 3], + "to": [11, 14, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 11]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [5, 1, 11, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [12, 12, 5], + "to": [13, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [13, 5, 15, 11], "rotation": 270, "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [3, 12, 5], + "to": [4, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [1, 5, 3, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 12]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 13, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#top_animation"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#top"} + } + }, + { + "from": [14, 0, 4], + "to": [15, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 12, 12, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 4], "texture": "#side"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 14, 12, 15], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 0, 4], + "to": [2, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 12, 12, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [4, 12, 12, 16], "texture": "#side"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 1, 12, 2], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [14, 12, 4], + "to": [15, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 20, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 1, 12, 4], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 4], "texture": "#side"}, + "up": {"uv": [1, 4, 2, 12], "texture": "#top"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [1, 12, 4], + "to": [2, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 20, 12]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "east": {"uv": [4, 1, 12, 4], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#side"}, + "west": {"uv": [4, 1, 12, 4], "texture": "#side"}, + "up": {"uv": [14, 4, 15, 12], "texture": "#top"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [13, 4, 4], + "to": [14, 12, 12], + "faces": { + "north": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "east": {"uv": [4, 4, 12, 12], "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#side_animation"}, + "up": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "down": {"uv": [0, 0, 1, 8], "texture": "#side_animation"} + } + }, + { + "from": [2, 4, 4], + "to": [3, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [-3, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "east": {"uv": [4, 4, 12, 12], "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "west": {"uv": [4, 4, 12, 12], "texture": "#side_animation"}, + "up": {"uv": [0, 0, 1, 8], "texture": "#side_animation"}, + "down": {"uv": [0, 0, 1, 8], "texture": "#side_animation"} + } + }, + { + "from": [3, 8, 0], + "to": [6, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 8]}, + "faces": { + "north": {"uv": [10, 6, 13, 8], "texture": "#front"}, + "east": {"uv": [10, 6, 11, 8], "texture": "#front"}, + "south": {"uv": [0, 0, 3, 2], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 8], "texture": "#front"}, + "up": {"uv": [10, 6, 13, 7], "rotation": 180, "texture": "#front"}, + "down": {"uv": [10, 7, 13, 8], "rotation": 180, "texture": "#front"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "frame", + "origin": [8, 23, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + }, + { + "name": "body", + "origin": [18, 18, 9], + "children": [12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39] + }, 40, 41, 42] +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json new file mode 100644 index 000000000..f0e5fb3a1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json @@ -0,0 +1,676 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/crystal_cluster_diamatine_block", + "cluster": "actuallyadditions:block/crystal_cluster_diamatine_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} + } + }, + { + "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} + } + }, + { + "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} + } + }, + { + "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} + } + }, + { + "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} + } + }, + { + "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} + } + }, + { + "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} + } + }, + { + "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} + } + }, + { + "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}, + "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} + } + }, + { + "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}, + "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} + } + }, + { + "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}, + "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}, + "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}, + "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}, + "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": { + "east": {"uv": [0, 0, 1, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"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}, + "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}, + "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": { + "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} + } + }, + { + "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}, + "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}, + "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} + } + }, + { + "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}, + "west": {"uv": [0, 0, 1, 3], "texture": "#cluster", "tintindex": 0}, + "up": {"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}, + "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}, + "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}, + "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}, + "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}, + "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}, + "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} + } + }, + { + "from": [3, 0, 5], + "to": [4, 3, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 14]}, + "faces": { + "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}, + "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} + } + }, + { + "from": [9, 2, 7], + "to": [10, 3, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 2.5, 11.5]}, + "faces": { + "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} + } + }, + { + "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}, + "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} + } + }, + { + "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}, + "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": { + "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": { + "east": {"uv": [0, 0, 2, 1], "texture": "#cluster", "tintindex": 0}, + "south": {"uv": [0, 0, 4, 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}, + "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}, + "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": { + "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} + } + }, + { + "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_emeradic_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json new file mode 100644 index 000000000..774b404b3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json @@ -0,0 +1,728 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/crystal_cluster_emeradic_block", + "cluster": "actuallyadditions:block/crystal_cluster_emeradic_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_enori_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori_block.json new file mode 100644 index 000000000..9184a16ee --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori_block.json @@ -0,0 +1,728 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/crystal_cluster_enori_block", + "cluster": "actuallyadditions:block/crystal_cluster_enori_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_palis_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json new file mode 100644 index 000000000..506f8f5d5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json @@ -0,0 +1,728 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/crystal_cluster_palis_block", + "cluster": "actuallyadditions:block/crystal_cluster_palis_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_restonia_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json new file mode 100644 index 000000000..bfd273fcd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json @@ -0,0 +1,728 @@ +{ + "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_void_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json new file mode 100644 index 000000000..208160c0e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json @@ -0,0 +1,728 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/crystal_cluster_void_block", + "cluster": "actuallyadditions:block/crystal_cluster_void_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_diamatine_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json new file mode 100644 index 000000000..6bd6d1429 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_diamatine_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json new file mode 100644 index 000000000..1588bbe57 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_diamatine_empowered_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json new file mode 100644 index 000000000..5b25d61d7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_emeradic_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json new file mode 100644 index 000000000..43a8cba40 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_emeradic_empowered_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_block.json new file mode 100644 index 000000000..05f13bfd8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_enori_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json new file mode 100644 index 000000000..d58c90ccf --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_enori_empowered_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_block.json new file mode 100644 index 000000000..7b6557b12 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_palis_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json new file mode 100644 index 000000000..047eb04b5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_palis_empowered_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json new file mode 100644 index 000000000..87cacb725 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_restonia_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json new file mode 100644 index 000000000..b0e8e9402 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_restonia_empowered_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_void_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_void_block.json new file mode 100644 index 000000000..432f6023c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_void_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_void_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json new file mode 100644 index 000000000..b6c4308e9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_void_empowered_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/directional_breaker_block.json b/src/main/resources/assets/actuallyadditions/models/block/directional_breaker_block.json new file mode 100644 index 000000000..6a2754269 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/directional_breaker_block.json @@ -0,0 +1,289 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "back": "actuallyadditions:block/base_texture_back", + "front": "actuallyadditions:block/block_breaker_front", + "top": "actuallyadditions:block/base_texture_arrow", + "side": "actuallyadditions:block/block_breaker_side_extended" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "east": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#front"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#back"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 15, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 15, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 3, 9], + "to": [16, 13, 13], + "faces": { + "north": {"uv": [3, 6, 13, 7], "rotation": 270, "texture": "#side"}, + "east": {"uv": [3, 3, 13, 7], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#side"}, + "west": {"uv": [0, 0, 10, 4], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [12, 3, 13, 7], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 3, 4, 7], "texture": "#side"} + } + }, + { + "from": [15, 3, 3], + "to": [16, 13, 7], + "faces": { + "north": {"uv": [3, 12, 13, 13], "rotation": 270, "texture": "#side"}, + "east": {"uv": [3, 9, 13, 13], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 9, 13, 10], "rotation": 270, "texture": "#side"}, + "west": {"uv": [0, 0, 10, 4], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [12, 9, 13, 13], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 9, 4, 13], "texture": "#side"} + } + }, + { + "from": [0, 3, 9], + "to": [1, 13, 13], + "faces": { + "north": {"uv": [3, 6, 13, 7], "rotation": 90, "texture": "#side"}, + "east": {"uv": [0, 0, 10, 4], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [3, 3, 13, 4], "rotation": 90, "texture": "#side"}, + "west": {"uv": [3, 3, 13, 7], "rotation": 90, "texture": "#side"}, + "up": {"uv": [3, 3, 4, 7], "rotation": 180, "texture": "#side"}, + "down": {"uv": [12, 3, 13, 7], "texture": "#side"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 13, 7], + "faces": { + "north": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#side"}, + "east": {"uv": [0, 0, 10, 4], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [3, 9, 13, 10], "rotation": 90, "texture": "#side"}, + "west": {"uv": [3, 9, 13, 13], "rotation": 90, "texture": "#side"}, + "up": {"uv": [3, 9, 4, 13], "rotation": 180, "texture": "#side"}, + "down": {"uv": [12, 9, 13, 13], "texture": "#side"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 10, 11, 11], "texture": "#front"}, + "east": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "west": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#front"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [11, 9, 13, 10], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#front"}, + "south": {"uv": [11, 6, 13, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [3, 9, 5, 10], "texture": "#front"}, + "east": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#front"}, + "south": {"uv": [3, 6, 5, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [-90, 0, 45], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [-90, 0, -45], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [-90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [-60, 0, -135], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, 0, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/display_stand_block.json b/src/main/resources/assets/actuallyadditions/models/block/display_stand_block.json new file mode 100644 index 000000000..cf93bea5a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/display_stand_block.json @@ -0,0 +1,286 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/display_stand_side", + "particle": "actuallyadditions:block/display_stand_top", + "top": "actuallyadditions:block/display_stand_top" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 1, 16, 0], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 16, 16, 0], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 7, 15], + "faces": { + "north": {"uv": [1, 9, 15, 15], "texture": "#side"}, + "east": {"uv": [1, 9, 15, 15], "texture": "#side"}, + "south": {"uv": [1, 9, 15, 15], "texture": "#side"}, + "west": {"uv": [1, 9, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#missing"} + } + }, + { + "from": [6, 7, 6], + "to": [10, 9, 10], + "faces": { + "north": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "west": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#top"}, + "down": {"uv": [6, 6, 10, 10], "texture": "#missing"} + } + }, + { + "from": [4, 7, 6], + "to": [6, 8, 10], + "rotation": {"angle": 45, "axis": "z", "origin": [6, 8, 8]}, + "faces": { + "north": {"uv": [6, 6, 7, 7], "texture": "#missing"}, + "east": {"uv": [6, 6, 8, 10], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [6, 9, 7, 10], "texture": "#missing"}, + "west": {"uv": [6, 6, 8, 10], "rotation": 270, "texture": "#missing"}, + "up": {"uv": [4, 6, 6, 10], "texture": "#top"}, + "down": {"uv": [6, 6, 8, 10], "texture": "#missing"} + } + }, + { + "from": [10, 7, 6], + "to": [12, 8, 10], + "rotation": {"angle": -45, "axis": "z", "origin": [10, 8, 8]}, + "faces": { + "north": {"uv": [9, 6, 10, 7], "texture": "#missing"}, + "east": {"uv": [9, 6, 11, 10], "rotation": 90, "texture": "#missing"}, + "south": {"uv": [9, 9, 10, 10], "texture": "#missing"}, + "west": {"uv": [9, 6, 11, 10], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [10, 6, 12, 10], "texture": "#top"}, + "down": {"uv": [9, 6, 11, 10], "texture": "#missing"} + } + }, + { + "from": [6, 7, 10], + "to": [10, 8, 12], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 10]}, + "faces": { + "north": {"uv": [6, 9, 10, 11], "texture": "#missing"}, + "east": {"uv": [6, 9, 7, 10], "texture": "#missing"}, + "south": {"uv": [6, 9, 10, 11], "texture": "#missing"}, + "west": {"uv": [9, 9, 10, 10], "texture": "#missing"}, + "up": {"uv": [6, 10, 10, 12], "texture": "#top"}, + "down": {"uv": [6, 9, 10, 11], "texture": "#missing"} + } + }, + { + "from": [6, 7, 4], + "to": [10, 8, 6], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 6]}, + "faces": { + "north": {"uv": [6, 6, 10, 8], "texture": "#missing"}, + "east": {"uv": [6, 6, 7, 7], "texture": "#missing"}, + "south": {"uv": [6, 6, 10, 8], "texture": "#missing"}, + "west": {"uv": [9, 6, 10, 7], "texture": "#missing"}, + "up": {"uv": [6, 4, 10, 6], "texture": "#top"}, + "down": {"uv": [6, 6, 10, 8], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 7, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 7, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 7, 0], + "to": [1, 8, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 7, 0], + "to": [16, 8, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 7, 0], + "to": [15, 8, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 7, 15], + "to": [15, 8, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [5, 7, 5], + "to": [6, 9, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 15, 13]}, + "faces": { + "north": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "west": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "up": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [5, 7, 10], + "to": [6, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 15, 18]}, + "faces": { + "north": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "west": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "up": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [10, 7, 10], + "to": [11, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 15, 18]}, + "faces": { + "north": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "west": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "up": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [10, 7, 5], + "to": [11, 9, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 15, 13]}, + "faces": { + "north": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "west": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "up": {"uv": [5, 5, 6, 6], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + } + ], + "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/double_powered_furnace_block.json b/src/main/resources/assets/actuallyadditions/models/block/double_powered_furnace_block.json new file mode 100644 index 000000000..40d6a96a7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/double_powered_furnace_block.json @@ -0,0 +1,368 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/generator_top", + "animation": "actuallyadditions:block/coal_generator_fire_animated", + "particle": "actuallyadditions:block/base_texture_side", + "side": "actuallyadditions:block/base_texture_side", + "front": "actuallyadditions:block/double_furnace_front" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [5, 14, 6], + "to": [11, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 15]}, + "faces": { + "north": {"uv": [5, 6, 11, 7], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "south": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "west": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "up": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "down": {"uv": [5, 6, 11, 7], "texture": "#top"} + } + }, + { + "from": [5, 14, 8], + "to": [11, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 17]}, + "faces": { + "north": {"uv": [5, 8, 11, 9], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "south": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "west": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "up": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "down": {"uv": [5, 8, 11, 9], "texture": "#top"} + } + }, + { + "from": [5, 14, 10], + "to": [11, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 19]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 10, 11, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [5, 14, 2], + "to": [11, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 10]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 2, 11, 5], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [11, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [5, 15, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [2, 2, 5, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 15], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 1, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [2, 1, 14, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 1, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#side"}, + "east": {"uv": [1, 1, 2, 15], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#side"}, + "west": {"uv": [14, 1, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [7, 3, 1], + "to": [9, 7, 2], + "faces": { + "north": {"uv": [7, 9, 9, 13], "texture": "#front"}, + "east": {"uv": [7, 9, 8, 13], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#front"}, + "west": {"uv": [8, 9, 9, 13], "texture": "#front"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#front"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#front"} + } + }, + { + "from": [3, 7, 1], + "to": [13, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 20, 9]}, + "faces": { + "north": {"uv": [3, 1, 13, 9], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [3, 1, 13, 2], "texture": "#top"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#front"} + } + }, + { + "from": [3, 1, 1], + "to": [13, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 9]}, + "faces": { + "north": {"uv": [3, 13, 13, 15], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [3, 13, 13, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [3, 1, 13, 2], "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [3, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-4, 8, 8]}, + "faces": { + "north": {"uv": [13, 1, 15, 15], "texture": "#front"}, + "east": {"uv": [13, 1, 14, 15], "texture": "#front"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [1, 1, 2, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 3, 2], "texture": "#top"}, + "down": {"uv": [13, 1, 15, 2], "texture": "#base"} + } + }, + { + "from": [13, 1, 1], + "to": [15, 15, 2], + "faces": { + "north": {"uv": [1, 1, 3, 15], "texture": "#front"}, + "east": {"uv": [14, 1, 15, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [2, 1, 3, 15], "texture": "#front"}, + "up": {"uv": [13, 1, 15, 2], "texture": "#top"}, + "down": {"uv": [1, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [5, 13, 5], + "to": [11, 14, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, 15]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [2, 2, 8, 7], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + }, + { + "from": [2, 3, 2], + "to": [14, 8, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [4, 4, 16, 16], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/dropper_block.json b/src/main/resources/assets/actuallyadditions/models/block/dropper_block.json new file mode 100644 index 000000000..1163710d8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/dropper_block.json @@ -0,0 +1,265 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "back": "actuallyadditions:block/base_texture_back", + "side": "actuallyadditions:block/block_dropper_side", + "top": "actuallyadditions:block/base_texture_arrow", + "front": "actuallyadditions:block/block_dropper_front" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "east": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#front"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#back"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 15, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 15, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 3, 6], + "to": [16, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 270, "texture": "#side"}, + "east": {"uv": [3, 6, 13, 10], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 270, "texture": "#side"}, + "west": {"uv": [0, 0, 10, 4], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [12, 6, 13, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 6, 4, 10], "texture": "#side"} + } + }, + { + "from": [0, 3, 6], + "to": [1, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 90, "texture": "#side"}, + "east": {"uv": [0, 0, 10, 4], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 90, "texture": "#side"}, + "west": {"uv": [3, 6, 13, 10], "rotation": 90, "texture": "#side"}, + "up": {"uv": [3, 6, 4, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [12, 6, 13, 10], "texture": "#side"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 10, 11, 11], "texture": "#front"}, + "east": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "west": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#front"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [11, 9, 13, 10], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#front"}, + "south": {"uv": [11, 6, 13, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [3, 9, 5, 10], "texture": "#front"}, + "east": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#front"}, + "south": {"uv": [3, 6, 5, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [-90, 0, 45], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [-90, 0, -45], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [-90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [-60, 0, -135], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, 0, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/empowerer_block.json b/src/main/resources/assets/actuallyadditions/models/block/empowerer_block.json new file mode 100644 index 000000000..609e9ed59 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/empowerer_block.json @@ -0,0 +1,347 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/empowerer_side", + "top": "actuallyadditions:block/empowerer_top" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 6, 15], + "faces": { + "north": {"uv": [1, 10, 15, 15], "texture": "#side"}, + "east": {"uv": [1, 10, 15, 15], "texture": "#side"}, + "south": {"uv": [1, 10, 15, 15], "texture": "#side"}, + "west": {"uv": [1, 10, 15, 15], "texture": "#side"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#missing"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#missing"} + } + }, + { + "from": [1, 6, 1], + "to": [15, 7, 15], + "faces": { + "north": {"uv": [1, 9, 15, 10], "texture": "#side"}, + "east": {"uv": [1, 9, 15, 10], "texture": "#side"}, + "south": {"uv": [1, 9, 15, 10], "texture": "#side"}, + "west": {"uv": [1, 9, 15, 10], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#missing"} + } + }, + { + "from": [0, 7, 0], + "to": [16, 8, 1], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [0, 7, 15], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 7, 1], + "to": [1, 8, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 7, 1], + "to": [16, 8, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [2, 7, 5], + "to": [4, 8, 11], + "rotation": {"angle": 45, "axis": "z", "origin": [4, 8, 8]}, + "faces": { + "north": {"uv": [5, 0, 6, 1], "texture": "#missing"}, + "east": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "south": {"uv": [10, 7, 11, 8], "texture": "#missing"}, + "west": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "up": {"uv": [3, 5, 4, 11], "texture": "#top"}, + "down": {"uv": [5, 3, 11, 4], "texture": "#missing"} + } + }, + { + "from": [12, 7, 5], + "to": [14, 8, 11], + "rotation": {"angle": -45, "axis": "z", "origin": [12, 8, 8]}, + "faces": { + "north": {"uv": [4, 8, 5, 9], "texture": "#missing"}, + "east": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "south": {"uv": [11, 7, 12, 8], "texture": "#missing"}, + "west": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "up": {"uv": [12, 5, 13, 11], "texture": "#top"}, + "down": {"uv": [5, 0, 11, 1], "rotation": 90, "texture": "#missing"} + } + }, + { + "from": [5, 7, 2], + "to": [11, 8, 4], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 4]}, + "faces": { + "north": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "east": {"uv": [10, 0, 11, 1], "texture": "#missing"}, + "south": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "west": {"uv": [5, 0, 6, 1], "texture": "#missing"}, + "up": {"uv": [5, 3, 11, 4], "texture": "#top"}, + "down": {"uv": [5, 0, 11, 1], "texture": "#missing"} + } + }, + { + "from": [5, 7, 12], + "to": [11, 8, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 12]}, + "faces": { + "north": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "east": {"uv": [5, 0, 6, 1], "texture": "#missing"}, + "south": {"uv": [5, 0, 11, 1], "texture": "#missing"}, + "west": {"uv": [10, 0, 11, 1], "texture": "#missing"}, + "up": {"uv": [5, 12, 11, 13], "texture": "#top"}, + "down": {"uv": [5, 0, 11, 1], "texture": "#missing"} + } + }, + { + "from": [4, 7, 4], + "to": [12, 9, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [4, 4, 12, 5], "rotation": 180, "texture": "#top"}, + "east": {"uv": [11, 4, 12, 12], "rotation": 90, "texture": "#top"}, + "south": {"uv": [4, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 12], "rotation": 270, "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#top"}, + "down": {"uv": [5, 0, 11, 6], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 7, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 7, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#missing"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 6], "texture": "#base"}, + "up": {"uv": [7, 0, 8, 1], "texture": "#missing"}, + "down": {"uv": [7, 0, 8, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 6], "texture": "#base"}, + "up": {"uv": [7, 0, 8, 1], "texture": "#missing"}, + "down": {"uv": [7, 0, 8, 1], "texture": "#missing"} + } + }, + { + "from": [3, 7, 4], + "to": [4, 8, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 15, 12]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + }, + { + "from": [3, 7, 11], + "to": [4, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 15, 19]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + }, + { + "from": [4, 7, 12], + "to": [5, 8, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 15, 20]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + }, + { + "from": [11, 7, 12], + "to": [12, 8, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 15, 20]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + }, + { + "from": [12, 7, 11], + "to": [13, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 15, 19]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + }, + { + "from": [12, 7, 4], + "to": [13, 8, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 15, 12]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + }, + { + "from": [11, 7, 3], + "to": [12, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 15, 11]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + }, + { + "from": [4, 7, 3], + "to": [5, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 15, 11]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "east": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#missing"}, + "west": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "up": {"uv": [3, 4, 4, 5], "texture": "#top"}, + "down": {"uv": [3, 4, 4, 5], "texture": "#missing"} + } + } + ], + "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/ender_casing_block.json b/src/main/resources/assets/actuallyadditions/models/block/ender_casing_block.json new file mode 100644 index 000000000..ea2d09e43 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/ender_casing_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/ender_casing_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/enderpearl_block.json b/src/main/resources/assets/actuallyadditions/models/block/enderpearl_block.json new file mode 100644 index 000000000..b68e73c25 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/enderpearl_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/enderpearl_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/energizer_block.json b/src/main/resources/assets/actuallyadditions/models/block/energizer_block.json new file mode 100644 index 000000000..e0ec87bfe --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/energizer_block.json @@ -0,0 +1,432 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/energizer_side", + "top": "actuallyadditions:block/energizer_top" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#top"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#top"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#top"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#side"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [9, 3, 0], + "to": [13, 4, 1], + "faces": { + "north": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "south": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "rotation": 180, "texture": "#side"}, + "down": {"uv": [0, 0, 4, 1], "texture": "#side"} + } + }, + { + "from": [3, 3, 15], + "to": [7, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 23]}, + "faces": { + "north": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "south": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "down": {"uv": [3, 12, 7, 13], "texture": "#side"} + } + }, + { + "from": [9, 12, 0], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, + "faces": { + "north": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "east": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "south": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "rotation": 180, "texture": "#side"} + } + }, + { + "from": [3, 12, 15], + "to": [7, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 17, 23]}, + "faces": { + "north": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "east": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "south": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "west": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "texture": "#side"} + } + }, + { + "from": [10, 4, 0], + "to": [12, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 8]}, + "faces": { + "north": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#side"}, + "west": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 2, 1], "texture": "#side"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#side"} + } + }, + { + "from": [4, 4, 15], + "to": [6, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 12, 23]}, + "faces": { + "north": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "east": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "south": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 2, 1], "texture": "#side"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#side"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 4, 7], + "faces": { + "north": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "south": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "rotation": 90, "texture": "#side"}, + "down": {"uv": [3, 12, 7, 13], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [15, 3, 9], + "to": [16, 4, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 14]}, + "faces": { + "north": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "south": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "west": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "rotation": 270, "texture": "#side"}, + "down": {"uv": [3, 12, 7, 13], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [0, 12, 3], + "to": [1, 13, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, + "faces": { + "north": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "east": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "south": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "west": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "rotation": 90, "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [15, 12, 9], + "to": [16, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 17, 14]}, + "faces": { + "north": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "east": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "south": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "west": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "rotation": 270, "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [0, 4, 4], + "to": [1, 12, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, + "faces": { + "north": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#side"}, + "south": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "west": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#side"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#side"} + } + }, + { + "from": [15, 4, 10], + "to": [16, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 12, 18]}, + "faces": { + "north": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "east": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "west": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#side"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#side"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json new file mode 100644 index 000000000..04c8aa362 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json @@ -0,0 +1,502 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "relay": "actuallyadditions:block/models/laser_relay" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 4, 12], + "faces": { + "north": {"uv": [5, 3.5, 9, 4.5], "texture": "#relay"}, + "east": {"uv": [5, 3.5, 9, 4.5], "texture": "#relay"}, + "south": {"uv": [5, 3.5, 9, 4.5], "texture": "#relay"}, + "west": {"uv": [5, 3.5, 9, 4.5], "texture": "#relay"}, + "up": {"uv": [3, 6.5, 7, 10.5], "texture": "#relay"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#relay"} + } + }, + { + "from": [6, 4, 6], + "to": [7, 6, 7], + "faces": { + "north": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "east": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "west": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "up": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "down": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"} + } + }, + { + "from": [9, 4, 9], + "to": [10, 6, 10], + "faces": { + "north": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "east": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "south": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "west": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "up": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "down": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"} + } + }, + { + "from": [6, 4, 9], + "to": [7, 6, 10], + "faces": { + "north": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "south": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "up": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"} + } + }, + { + "from": [3, 1, 12], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [12, 1, 12], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [3, 4, 4], + "to": [4, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [3, 1, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 4, 4], + "to": [13, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [12, 1, 4], + "to": [13, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 270, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 4, 12], + "to": [12, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 4, 3], + "to": [12, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, -7]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, -7]}, + "faces": { + "north": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [9, 4, 6], + "to": [10, 6, 7], + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [8, 4, 7], + "to": [11, 4.5, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [9.5, 4.25, 8]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 8, 6, 9], "rotation": 90, "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 8, 6, 9], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [5, 4, 7], + "to": [8, 4.5, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [6.5, 4.25, 8]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "east": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "south": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "west": {"uv": [4, 8, 4.5, 9], "rotation": 270, "texture": "#relay"}, + "up": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "down": {"uv": [4, 8, 4.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 2.75, 6.25], + "to": [9, 5.75, 6.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 6.5]}, + "faces": { + "north": {"uv": [4.5, 7.5, 5.5, 8], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 8], + "to": [9, 4.5, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 9.5]}, + "faces": { + "north": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "east": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "south": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "west": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "up": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "down": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 6, 7], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "east": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "south": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "west": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "up": {"uv": [0, 6.5, 1, 7.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [1, 6.5, 2, 7.5], "texture": "#relay"} + } + }, + { + "from": [6.5, 5, 7], + "to": [7, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 7, 7], + "to": [7, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 9, 7], + "to": [7, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 5, 7], + "to": [9.5, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 7, 7], + "to": [9.5, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 9, 7], + "to": [9.5, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 6.5], + "to": [9, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 7, 6.5], + "to": [9, 7.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 9, 6.5], + "to": [9, 9.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 9], + "to": [9, 6, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 7, 9], + "to": [9, 7.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 9, 9], + "to": [9, 9.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + } + ], + "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/energy_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json new file mode 100644 index 000000000..812d251a9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json @@ -0,0 +1,502 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "relay": "actuallyadditions:block/models/laser_relay" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 4, 12], + "faces": { + "north": {"uv": [0.5, 3.5, 4.5, 4.5], "texture": "#relay"}, + "east": {"uv": [0.5, 3.5, 4.5, 4.5], "texture": "#relay"}, + "south": {"uv": [0.5, 3.5, 4.5, 4.5], "texture": "#relay"}, + "west": {"uv": [0.5, 3.5, 4.5, 4.5], "texture": "#relay"}, + "up": {"uv": [3, 6.5, 7, 10.5], "texture": "#relay"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#relay"} + } + }, + { + "from": [6, 4, 6], + "to": [7, 6, 7], + "faces": { + "north": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "east": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "west": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "up": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "down": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"} + } + }, + { + "from": [9, 4, 9], + "to": [10, 6, 10], + "faces": { + "north": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "east": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "south": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "west": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "up": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "down": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"} + } + }, + { + "from": [6, 4, 9], + "to": [7, 6, 10], + "faces": { + "north": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "south": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "up": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"} + } + }, + { + "from": [3, 1, 12], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [12, 1, 12], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [3, 4, 4], + "to": [4, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [3, 1, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 4, 4], + "to": [13, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [12, 1, 4], + "to": [13, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 270, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 4, 12], + "to": [12, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 4, 3], + "to": [12, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, -7]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, -7]}, + "faces": { + "north": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [9, 4, 6], + "to": [10, 6, 7], + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [8, 4, 7], + "to": [11, 4.5, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [9.5, 4.25, 8]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 8, 6, 9], "rotation": 90, "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 8, 6, 9], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [5, 4, 7], + "to": [8, 4.5, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [6.5, 4.25, 8]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "east": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "south": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "west": {"uv": [4, 8, 4.5, 9], "rotation": 270, "texture": "#relay"}, + "up": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "down": {"uv": [4, 8, 4.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 2.75, 6.25], + "to": [9, 5.75, 6.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 6.5]}, + "faces": { + "north": {"uv": [4.5, 7.5, 5.5, 8], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 8], + "to": [9, 4.5, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 9.5]}, + "faces": { + "north": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "east": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "south": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "west": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "up": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "down": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 6, 7], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "east": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "south": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "west": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "up": {"uv": [0, 6.5, 1, 7.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [1, 6.5, 2, 7.5], "texture": "#relay"} + } + }, + { + "from": [6.5, 5, 7], + "to": [7, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 7, 7], + "to": [7, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 9, 7], + "to": [7, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 5, 7], + "to": [9.5, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 7, 7], + "to": [9.5, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 9, 7], + "to": [9.5, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 6.5], + "to": [9, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 7, 6.5], + "to": [9, 7.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 9, 6.5], + "to": [9, 9.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 9], + "to": [9, 6, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 7, 9], + "to": [9, 7.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 9, 9], + "to": [9, 9.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + } + ], + "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/energy_laser_relay_extreme_block.json b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json new file mode 100644 index 000000000..d87166ebf --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json @@ -0,0 +1,502 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "relay": "actuallyadditions:block/models/laser_relay" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 4, 12], + "faces": { + "north": {"uv": [9, 3.5, 13, 4.5], "texture": "#relay"}, + "east": {"uv": [9, 3.5, 13, 4.5], "texture": "#relay"}, + "south": {"uv": [9, 3.5, 13, 4.5], "texture": "#relay"}, + "west": {"uv": [9, 3.5, 13, 4.5], "texture": "#relay"}, + "up": {"uv": [3, 6.5, 7, 10.5], "texture": "#relay"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#relay"} + } + }, + { + "from": [6, 4, 6], + "to": [7, 6, 7], + "faces": { + "north": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "east": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "west": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "up": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "down": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"} + } + }, + { + "from": [9, 4, 9], + "to": [10, 6, 10], + "faces": { + "north": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "east": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "south": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "west": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "up": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "down": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"} + } + }, + { + "from": [6, 4, 9], + "to": [7, 6, 10], + "faces": { + "north": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "south": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "up": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"} + } + }, + { + "from": [3, 1, 12], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [12, 1, 12], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [3, 4, 4], + "to": [4, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [3, 1, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 4, 4], + "to": [13, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [12, 1, 4], + "to": [13, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 270, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 4, 12], + "to": [12, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 4, 3], + "to": [12, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, -7]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, -7]}, + "faces": { + "north": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [9, 4, 6], + "to": [10, 6, 7], + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [8, 4, 7], + "to": [11, 4.5, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [9.5, 4.25, 8]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 8, 6, 9], "rotation": 90, "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 8, 6, 9], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [5, 4, 7], + "to": [8, 4.5, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [6.5, 4.25, 8]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "east": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "south": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "west": {"uv": [4, 8, 4.5, 9], "rotation": 270, "texture": "#relay"}, + "up": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "down": {"uv": [4, 8, 4.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 2.75, 6.25], + "to": [9, 5.75, 6.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 6.5]}, + "faces": { + "north": {"uv": [4.5, 7.5, 5.5, 8], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 8], + "to": [9, 4.5, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 9.5]}, + "faces": { + "north": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "east": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "south": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "west": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "up": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "down": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 6, 7], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "east": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "south": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "west": {"uv": [0, 6.5, 1, 8.5], "texture": "#relay"}, + "up": {"uv": [0, 6.5, 1, 7.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [1, 6.5, 2, 7.5], "texture": "#relay"} + } + }, + { + "from": [6.5, 5, 7], + "to": [7, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 7, 7], + "to": [7, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 9, 7], + "to": [7, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 5, 7], + "to": [9.5, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 7, 7], + "to": [9.5, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 9, 7], + "to": [9.5, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 6.5], + "to": [9, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 7, 6.5], + "to": [9, 7.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 9, 6.5], + "to": [9, 9.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 9], + "to": [9, 6, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 7, 9], + "to": [9, 7.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 9, 9], + "to": [9, 9.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + } + ], + "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/enervator_block.json b/src/main/resources/assets/actuallyadditions/models/block/enervator_block.json new file mode 100644 index 000000000..6692d00de --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/enervator_block.json @@ -0,0 +1,432 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "side": "actuallyadditions:block/enervator_side", + "top": "actuallyadditions:block/enervator_top", + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#top"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#top"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#top"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#side"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [9, 3, 0], + "to": [13, 4, 1], + "faces": { + "north": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "south": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "rotation": 180, "texture": "#side"}, + "down": {"uv": [0, 0, 4, 1], "texture": "#side"} + } + }, + { + "from": [3, 3, 15], + "to": [7, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 23]}, + "faces": { + "north": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "south": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "down": {"uv": [3, 12, 7, 13], "texture": "#side"} + } + }, + { + "from": [9, 12, 0], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, + "faces": { + "north": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "east": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "south": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "rotation": 180, "texture": "#side"} + } + }, + { + "from": [3, 12, 15], + "to": [7, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 17, 23]}, + "faces": { + "north": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "east": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "south": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "west": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "texture": "#side"} + } + }, + { + "from": [10, 4, 0], + "to": [12, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 8]}, + "faces": { + "north": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#side"}, + "west": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 2, 1], "texture": "#side"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#side"} + } + }, + { + "from": [4, 4, 15], + "to": [6, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 12, 23]}, + "faces": { + "north": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "east": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "south": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 2, 1], "texture": "#side"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#side"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 4, 7], + "faces": { + "north": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "south": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "west": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "rotation": 90, "texture": "#side"}, + "down": {"uv": [3, 12, 7, 13], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [15, 3, 9], + "to": [16, 4, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 14]}, + "faces": { + "north": {"uv": [6, 12, 7, 13], "texture": "#side"}, + "east": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "south": {"uv": [3, 12, 4, 13], "texture": "#side"}, + "west": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "up": {"uv": [3, 12, 7, 13], "rotation": 270, "texture": "#side"}, + "down": {"uv": [3, 12, 7, 13], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [0, 12, 3], + "to": [1, 13, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, + "faces": { + "north": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "east": {"uv": [3, 12, 7, 13], "texture": "#side"}, + "south": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "west": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "rotation": 90, "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [15, 12, 9], + "to": [16, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 17, 14]}, + "faces": { + "north": {"uv": [6, 3, 7, 4], "texture": "#side"}, + "east": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "south": {"uv": [3, 3, 4, 4], "texture": "#side"}, + "west": {"uv": [3, 3, 7, 4], "texture": "#side"}, + "up": {"uv": [3, 3, 7, 4], "rotation": 270, "texture": "#side"}, + "down": {"uv": [3, 3, 7, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [0, 4, 4], + "to": [1, 12, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, + "faces": { + "north": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#side"}, + "south": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "west": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#side"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#side"} + } + }, + { + "from": [15, 4, 10], + "to": [16, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 12, 18]}, + "faces": { + "north": {"uv": [5, 4, 6, 12], "texture": "#side"}, + "east": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#side"}, + "west": {"uv": [4, 4, 6, 12], "texture": "#side"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#side"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#side"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/farmer_block.json b/src/main/resources/assets/actuallyadditions/models/block/farmer_block.json new file mode 100644 index 000000000..78280e819 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/farmer_block.json @@ -0,0 +1,539 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/heat_collector_top", + "top_animation": "actuallyadditions:block/farmer_glow_animated", + "front_animation": "actuallyadditions:block/farmer_front", + "side": "actuallyadditions:block/farmer_side", + "back": "actuallyadditions:block/base_texture_side" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [4, 11, 4], + "to": [12, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#top_animation"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 12]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [3, 12, 5], + "to": [4, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [1, 5, 3, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [12, 12, 5], + "to": [13, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [13, 5, 15, 11], "rotation": 270, "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 3], + "to": [11, 14, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 11]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [5, 1, 11, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 12], + "to": [11, 14, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 20]}, + "faces": { + "north": {"uv": [5, 13, 11, 15], "rotation": 180, "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 11], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 4], + "to": [12, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 4], + "to": [5, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 11], + "to": [5, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 19]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 0]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 10]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [5, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 8, 9]}, + "faces": { + "north": {"uv": [11, 1, 15, 16], "texture": "#front_animation"}, + "east": {"uv": [11, 1, 12, 16], "texture": "#front_animation"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#missing"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "up": {"uv": [1, 1, 5, 2], "texture": "#top"}, + "down": {"uv": [11, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [5, 5, 2], + "to": [11, 11, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [5, -3, 10]}, + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#front_animation"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#missing"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "up": {"uv": [6, 1, 10, 2], "texture": "#top"}, + "down": {"uv": [6, 14, 10, 15], "texture": "#base"} + } + }, + { + "from": [5, 0, 1], + "to": [11, 5, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [5, -3, 9]}, + "faces": { + "north": {"uv": [5, 11, 11, 16], "texture": "#front_animation"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#missing"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "up": {"uv": [5, 11, 11, 12], "rotation": 180, "texture": "#front_animation"}, + "down": {"uv": [6, 14, 10, 15], "texture": "#base"} + } + }, + { + "from": [5, 11, 1], + "to": [11, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 9]}, + "faces": { + "north": {"uv": [5, 1, 11, 5], "texture": "#front_animation"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#missing"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "up": {"uv": [6, 1, 10, 2], "texture": "#top"}, + "down": {"uv": [5, 4, 11, 5], "rotation": 180, "texture": "#front_animation"} + } + }, + { + "from": [11, 0, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 1, 5, 16], "texture": "#front_animation"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#missing"}, + "west": {"uv": [4, 1, 5, 16], "texture": "#front_animation"}, + "up": {"uv": [1, 1, 5, 2], "texture": "#top"}, + "down": {"uv": [1, 14, 5, 15], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#missing"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#back"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/feeder_block.json b/src/main/resources/assets/actuallyadditions/models/block/feeder_block.json new file mode 100644 index 000000000..feed15a11 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/feeder_block.json @@ -0,0 +1,386 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/heat_collector_top", + "side_chicken": "actuallyadditions:block/animal_feeder_side_chicken", + "side_cow": "actuallyadditions:block/animal_feeder_side_cow", + "side_pig": "actuallyadditions:block/animal_feeder_side_pig", + "side_sheep": "actuallyadditions:block/animal_feeder_side_sheep", + "animation": "actuallyadditions:block/farmer_glow_animated" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 19]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 19]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 12]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [4, 13, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#animation"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#animation"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 21, 19]}, + "faces": { + "north": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [4, 1, 12, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [4, 12, 12, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [4, 14, 1], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 21, 8]}, + "faces": { + "north": {"uv": [4, 1, 12, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [4, 1, 12, 4], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [4, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-3, 21, 8]}, + "faces": { + "north": {"uv": [12, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#top"}, + "south": {"uv": [1, 1, 4, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 4, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [12, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 4, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [12, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [12, 1, 13, 15], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#side_chicken"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#side_chicken"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#side_chicken"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#side_chicken"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#side_cow"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side_chicken"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#side_cow"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#side_cow"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#side_cow"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side_pig"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#side_sheep"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side_cow"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json b/src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json new file mode 100644 index 000000000..c72836de6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json @@ -0,0 +1,463 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/misc_barrel_side", + "side": "actuallyadditions:block/misc_barrel_side", + "base": "actuallyadditions:block/misc_wood", + "top": "actuallyadditions:block/misc_barrel_top" + }, + "elements": [ + { + "from": [1, 0.5, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 16], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 16], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [0, 2, 15], + "to": [16, 4, 16], + "faces": { + "north": {"uv": [0, 12, 16, 14], "texture": "#side"}, + "east": {"uv": [15, 12, 16, 14], "texture": "#side"}, + "south": {"uv": [0, 12, 16, 14], "texture": "#side"}, + "west": {"uv": [0, 12, 1, 14], "texture": "#side"}, + "up": {"uv": [0, 12, 16, 13], "texture": "#side"}, + "down": {"uv": [0, 13, 16, 14], "texture": "#side"} + } + }, + { + "from": [0, 7, 15], + "to": [16, 9, 16], + "faces": { + "north": {"uv": [0, 7, 16, 9], "texture": "#side"}, + "east": {"uv": [15, 7, 16, 9], "texture": "#side"}, + "south": {"uv": [0, 7, 16, 9], "texture": "#side"}, + "west": {"uv": [0, 7, 1, 9], "texture": "#side"}, + "up": {"uv": [0, 7, 16, 8], "texture": "#side"}, + "down": {"uv": [0, 8, 16, 9], "texture": "#side"} + } + }, + { + "from": [0, 12, 15], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [0, 2, 16, 4], "texture": "#side"}, + "east": {"uv": [15, 2, 16, 4], "texture": "#side"}, + "south": {"uv": [0, 2, 16, 4], "texture": "#side"}, + "west": {"uv": [0, 2, 1, 4], "texture": "#side"}, + "up": {"uv": [0, 2, 16, 3], "texture": "#side"}, + "down": {"uv": [0, 3, 16, 4], "texture": "#side"} + } + }, + { + "from": [0, 12, 0], + "to": [16, 14, 1], + "faces": { + "north": {"uv": [0, 2, 16, 4], "texture": "#side"}, + "east": {"uv": [0, 2, 1, 4], "texture": "#side"}, + "south": {"uv": [0, 2, 16, 4], "texture": "#side"}, + "west": {"uv": [15, 2, 16, 4], "texture": "#side"}, + "up": {"uv": [0, 2, 16, 3], "texture": "#side"}, + "down": {"uv": [0, 3, 16, 4], "texture": "#side"} + } + }, + { + "from": [0, 2, 0], + "to": [16, 4, 1], + "faces": { + "north": {"uv": [0, 12, 16, 14], "texture": "#side"}, + "east": {"uv": [0, 12, 1, 14], "texture": "#side"}, + "south": {"uv": [0, 12, 16, 14], "texture": "#side"}, + "west": {"uv": [15, 12, 16, 14], "texture": "#side"}, + "up": {"uv": [0, 12, 16, 13], "texture": "#side"}, + "down": {"uv": [0, 13, 16, 14], "texture": "#side"} + } + }, + { + "from": [0, 7, 0], + "to": [16, 9, 1], + "faces": { + "north": {"uv": [0, 7, 16, 9], "texture": "#side"}, + "east": {"uv": [0, 7, 1, 9], "texture": "#side"}, + "south": {"uv": [0, 7, 16, 9], "texture": "#side"}, + "west": {"uv": [15, 7, 16, 9], "texture": "#side"}, + "up": {"uv": [0, 7, 16, 8], "texture": "#side"}, + "down": {"uv": [0, 8, 16, 9], "texture": "#side"} + } + }, + { + "from": [0, 2, 1], + "to": [1, 4, 15], + "faces": { + "north": {"uv": [1, 12, 2, 14], "texture": "#side"}, + "east": {"uv": [1, 12, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 12, 15, 14], "texture": "#side"}, + "west": {"uv": [1, 12, 15, 14], "texture": "#side"}, + "up": {"uv": [1, 12, 15, 13], "rotation": 90, "texture": "#side"}, + "down": {"uv": [1, 13, 15, 14], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [0, 7, 1], + "to": [1, 9, 15], + "faces": { + "north": {"uv": [1, 7, 2, 9], "texture": "#side"}, + "east": {"uv": [1, 7, 15, 9], "texture": "#side"}, + "south": {"uv": [14, 7, 15, 9], "texture": "#side"}, + "west": {"uv": [1, 7, 15, 9], "texture": "#side"}, + "up": {"uv": [1, 7, 15, 8], "rotation": 90, "texture": "#side"}, + "down": {"uv": [1, 8, 15, 9], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [0, 12, 1], + "to": [1, 14, 15], + "faces": { + "north": {"uv": [1, 2, 2, 4], "texture": "#side"}, + "east": {"uv": [1, 2, 15, 4], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 4], "texture": "#side"}, + "west": {"uv": [1, 2, 15, 4], "texture": "#side"}, + "up": {"uv": [1, 2, 15, 3], "rotation": 90, "texture": "#side"}, + "down": {"uv": [1, 3, 15, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [15, 12, 1], + "to": [16, 14, 15], + "faces": { + "north": {"uv": [1, 2, 2, 4], "texture": "#side"}, + "east": {"uv": [1, 2, 15, 4], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 4], "texture": "#side"}, + "west": {"uv": [1, 2, 15, 4], "texture": "#side"}, + "up": {"uv": [1, 2, 15, 3], "rotation": 270, "texture": "#side"}, + "down": {"uv": [1, 3, 15, 4], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [15, 7, 1], + "to": [16, 9, 15], + "faces": { + "north": {"uv": [1, 7, 2, 9], "texture": "#side"}, + "east": {"uv": [1, 7, 15, 9], "texture": "#side"}, + "south": {"uv": [14, 7, 15, 9], "texture": "#side"}, + "west": {"uv": [1, 7, 15, 9], "texture": "#side"}, + "up": {"uv": [1, 7, 15, 8], "rotation": 270, "texture": "#side"}, + "down": {"uv": [1, 8, 15, 9], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 4, 15], + "faces": { + "north": {"uv": [1, 12, 2, 14], "texture": "#side"}, + "east": {"uv": [1, 12, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 12, 15, 14], "texture": "#side"}, + "west": {"uv": [1, 12, 15, 14], "texture": "#side"}, + "up": {"uv": [1, 12, 15, 13], "rotation": 270, "texture": "#side"}, + "down": {"uv": [1, 13, 15, 14], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [7, 0, 0.5], + "to": [9, 16, 1.5], + "faces": { + "north": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 1, 16, 3], "rotation": 270, "texture": "#base"}, + "west": {"uv": [0, 1, 16, 2], "rotation": 90, "texture": "#base"}, + "up": {"uv": [7, 0, 9, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [7, 15, 9, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0.5, 0, 7], + "to": [1.5, 16, 9], + "faces": { + "north": {"uv": [0, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 1, 16, 3], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 1, 16, 2], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#base"}, + "up": {"uv": [7, 0, 9, 1], "rotation": 90, "texture": "#base"}, + "down": {"uv": [7, 15, 9, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [7, 0, 14.5], + "to": [9, 16, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 22]}, + "faces": { + "north": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 5, 16, 6], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 4, 16, 6], "rotation": 270, "texture": "#base"}, + "west": {"uv": [0, 4, 16, 5], "rotation": 270, "texture": "#base"}, + "up": {"uv": [7, 0, 9, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [7, 15, 9, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14.5, 0, 7], + "to": [15.5, 16, 9], + "faces": { + "north": {"uv": [0, 5, 16, 6], "rotation": 270, "texture": "#base"}, + "east": {"uv": [0, 4, 16, 6], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 4, 16, 5], "rotation": 270, "texture": "#base"}, + "west": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#base"}, + "up": {"uv": [7, 0, 9, 1], "rotation": 90, "texture": "#base"}, + "down": {"uv": [7, 15, 9, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 0, 0.5], + "to": [5, 16, 1.5], + "faces": { + "north": {"uv": [0, 10, 16, 13], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 10, 16, 13], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 10, 16, 11], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 9, 16, 12], "rotation": 90, "texture": "#base"}, + "down": {"uv": [0, 9, 1, 12], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [0.5, 0, 11], + "to": [1.5, 16, 14], + "faces": { + "north": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 10, 16, 13], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 10, 16, 11], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 10, 16, 13], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 9, 16, 12], "texture": "#base"}, + "down": {"uv": [0, 9, 1, 12], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [2, 0, 14.5], + "to": [5, 16, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 22]}, + "faces": { + "north": {"uv": [0, 8, 16, 11], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 8, 16, 9], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 8, 16, 11], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 10, 16, 11], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 9, 16, 12], "rotation": 90, "texture": "#base"}, + "down": {"uv": [0, 9, 1, 12], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [14.5, 0, 11], + "to": [15.5, 16, 14], + "faces": { + "north": {"uv": [0, 8, 16, 9], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 8, 16, 11], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 10, 16, 11], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 8, 16, 11], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 9, 16, 12], "texture": "#base"}, + "down": {"uv": [0, 9, 1, 12], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 0, 0.5], + "to": [14, 16, 1.5], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 8]}, + "faces": { + "north": {"uv": [0, 7, 16, 10], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 9, 16, 10], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 10, 16, 13], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 7, 16, 8], "rotation": 90, "texture": "#base"}, + "up": {"uv": [11, 0, 14, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [11, 15, 14, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0.5, 0, 2], + "to": [1.5, 16, 5], + "faces": { + "north": {"uv": [0, 9, 16, 10], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 10, 16, 13], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 7, 16, 8], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 7, 16, 10], "rotation": 90, "texture": "#base"}, + "up": {"uv": [11, 0, 14, 1], "rotation": 90, "texture": "#base"}, + "down": {"uv": [11, 15, 14, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [11, 0, 14.5], + "to": [14, 16, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 22]}, + "faces": { + "north": {"uv": [0, 12, 16, 15], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 12, 16, 15], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 14, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [11, 0, 14, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [11, 15, 14, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14.5, 0, 2], + "to": [15.5, 16, 5], + "faces": { + "north": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#base"}, + "east": {"uv": [0, 12, 16, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 14, 16, 15], "rotation": 90, "texture": "#base"}, + "west": {"uv": [0, 12, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [11, 0, 14, 1], "rotation": 90, "texture": "#base"}, + "down": {"uv": [11, 15, 14, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [4, 15, 7], + "to": [6, 15.3, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 15]}, + "faces": { + "north": {"uv": [4, 7, 6, 8], "rotation": 180, "texture": "#top"}, + "east": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#top"}, + "south": {"uv": [4, 8, 6, 9], "texture": "#top"}, + "west": {"uv": [4, 7, 6, 8], "texture": "#top"}, + "up": {"uv": [4, 7, 6, 9], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#top"} + } + }, + { + "from": [2, 15, 4], + "to": [3, 15.3, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 23, 15]}, + "faces": { + "north": {"uv": [2, 4, 3, 5], "texture": "#top"}, + "east": {"uv": [2, 4, 3, 12], "rotation": 90, "texture": "#top"}, + "south": {"uv": [2, 11, 3, 12], "texture": "#top"}, + "west": {"uv": [2, 4, 3, 12], "rotation": 270, "texture": "#top"}, + "up": {"uv": [2, 4, 3, 12], "texture": "#top"}, + "down": {"uv": [2, 4, 3, 12], "texture": "#top"} + } + }, + { + "from": [4, 15, 13], + "to": [12, 15.3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15.15, 8]}, + "faces": { + "north": {"uv": [4, 13, 12, 14], "rotation": 180, "texture": "#top"}, + "east": {"uv": [11, 13, 12, 14], "texture": "#top"}, + "south": {"uv": [4, 13, 12, 14], "texture": "#top"}, + "west": {"uv": [4, 13, 5, 14], "texture": "#top"}, + "up": {"uv": [4, 13, 12, 14], "texture": "#top"}, + "down": {"uv": [4, 13, 12, 14], "texture": "#top"} + } + }, + { + "from": [4, 15, 2], + "to": [12, 15.3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15.15, -3]}, + "faces": { + "north": {"uv": [4, 2, 12, 3], "rotation": 180, "texture": "#top"}, + "east": {"uv": [11, 2, 12, 3], "texture": "#top"}, + "south": {"uv": [4, 2, 12, 3], "texture": "#top"}, + "west": {"uv": [4, 2, 5, 3], "texture": "#top"}, + "up": {"uv": [4, 2, 12, 3], "texture": "#top"}, + "down": {"uv": [4, 2, 12, 3], "texture": "#top"} + } + }, + { + "from": [13, 15, 4], + "to": [14, 15.3, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 23, 15]}, + "faces": { + "north": {"uv": [13, 4, 14, 5], "texture": "#top"}, + "east": {"uv": [13, 4, 14, 12], "rotation": 90, "texture": "#top"}, + "south": {"uv": [13, 11, 14, 12], "texture": "#top"}, + "west": {"uv": [13, 4, 14, 12], "rotation": 270, "texture": "#top"}, + "up": {"uv": [13, 4, 14, 12], "texture": "#top"}, + "down": {"uv": [13, 4, 14, 12], "texture": "#top"} + } + }, + { + "from": [3, 15, 3], + "to": [4, 15.3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 23, 11]}, + "faces": { + "north": {"uv": [3, 3, 4, 4], "texture": "#top"}, + "east": {"uv": [3, 3, 4, 4], "texture": "#top"}, + "south": {"uv": [3, 3, 4, 4], "texture": "#top"}, + "west": {"uv": [3, 3, 4, 4], "texture": "#top"}, + "up": {"uv": [3, 3, 4, 4], "texture": "#top"}, + "down": {"uv": [3, 3, 4, 4], "texture": "#top"} + } + }, + { + "from": [3, 15, 12], + "to": [4, 15.3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 23, 20]}, + "faces": { + "north": {"uv": [3, 12, 4, 13], "texture": "#top"}, + "east": {"uv": [3, 12, 4, 13], "texture": "#top"}, + "south": {"uv": [3, 12, 4, 13], "texture": "#top"}, + "west": {"uv": [3, 12, 4, 13], "texture": "#top"}, + "up": {"uv": [3, 12, 4, 13], "texture": "#top"}, + "down": {"uv": [3, 12, 4, 13], "texture": "#top"} + } + }, + { + "from": [12, 15, 3], + "to": [13, 15.3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 23, 11]}, + "faces": { + "north": {"uv": [12, 3, 13, 4], "texture": "#top"}, + "east": {"uv": [12, 3, 13, 4], "texture": "#top"}, + "south": {"uv": [12, 3, 13, 4], "texture": "#top"}, + "west": {"uv": [12, 3, 13, 4], "texture": "#top"}, + "up": {"uv": [12, 3, 13, 4], "texture": "#top"}, + "down": {"uv": [12, 3, 13, 4], "texture": "#top"} + } + }, + { + "from": [12, 15, 12], + "to": [13, 15.3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 23, 20]}, + "faces": { + "north": {"uv": [12, 12, 13, 13], "texture": "#top"}, + "east": {"uv": [12, 12, 13, 13], "texture": "#top"}, + "south": {"uv": [12, 12, 13, 13], "texture": "#top"}, + "west": {"uv": [12, 12, 13, 13], "texture": "#top"}, + "up": {"uv": [12, 12, 13, 13], "texture": "#top"}, + "down": {"uv": [12, 12, 13, 13], "texture": "#top"} + } + } + ], + "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/firework_box_block.json b/src/main/resources/assets/actuallyadditions/models/block/firework_box_block.json new file mode 100644 index 000000000..6449be982 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/firework_box_block.json @@ -0,0 +1,433 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "back": "actuallyadditions:block/farmer_side", + "side": "actuallyadditions:block/firework_box_side", + "top": "actuallyadditions:block/firework_box_top" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [10, 14, 9], + "to": [12, 15, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 22, 17]}, + "faces": { + "north": {"uv": [10, 9, 12, 10], "rotation": 180, "texture": "#top"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "south": {"uv": [10, 9, 12, 10], "texture": "#top"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "up": {"uv": [10, 9, 12, 10], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#top"} + } + }, + { + "from": [7, 14, 9], + "to": [9, 15, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 22, 17]}, + "faces": { + "north": {"uv": [7, 9, 9, 10], "rotation": 180, "texture": "#top"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "south": {"uv": [7, 9, 9, 10], "texture": "#top"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "up": {"uv": [7, 9, 9, 10], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#top"} + } + }, + { + "from": [4, 14, 9], + "to": [6, 15, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 17]}, + "faces": { + "north": {"uv": [4, 9, 6, 10], "rotation": 180, "texture": "#top"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "south": {"uv": [4, 9, 6, 10], "texture": "#top"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "up": {"uv": [4, 9, 6, 10], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#top"} + } + }, + { + "from": [10, 14, 6], + "to": [12, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 22, 14]}, + "faces": { + "north": {"uv": [10, 6, 12, 7], "rotation": 180, "texture": "#top"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "south": {"uv": [10, 6, 12, 7], "texture": "#top"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "up": {"uv": [10, 6, 12, 7], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#top"} + } + }, + { + "from": [7, 14, 6], + "to": [9, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 22, 14]}, + "faces": { + "north": {"uv": [7, 6, 9, 7], "rotation": 180, "texture": "#top"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "south": {"uv": [7, 6, 9, 7], "texture": "#top"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "up": {"uv": [7, 6, 9, 7], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#top"} + } + }, + { + "from": [4, 14, 6], + "to": [6, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 14]}, + "faces": { + "north": {"uv": [4, 6, 6, 7], "texture": "#top"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "south": {"uv": [4, 6, 6, 7], "texture": "#top"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "up": {"uv": [4, 6, 6, 7], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#top"} + } + }, + { + "from": [6, 14, 4], + "to": [7, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 22, 12]}, + "faces": { + "north": {"uv": [6, 4, 7, 5], "texture": "#top"}, + "east": {"uv": [6, 4, 7, 12], "rotation": 90, "texture": "#top"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "west": {"uv": [6, 4, 7, 12], "rotation": 270, "texture": "#top"}, + "up": {"uv": [6, 4, 7, 12], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 8], "texture": "#top"} + } + }, + { + "from": [9, 14, 4], + "to": [10, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 22, 12]}, + "faces": { + "north": {"uv": [6, 4, 7, 5], "texture": "#top"}, + "east": {"uv": [9, 4, 10, 12], "rotation": 90, "texture": "#top"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#top"}, + "west": {"uv": [9, 4, 10, 12], "rotation": 270, "texture": "#top"}, + "up": {"uv": [9, 4, 10, 12], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 8], "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 20]}, + "faces": { + "north": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "west": {"uv": [4, 2, 12, 4], "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "west": {"uv": [4, 2, 12, 4], "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#top"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#top"}, + "west": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#top"}, + "east": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#top"} + } + }, + { + "from": [2, 13, 2], + "to": [14, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [1, 2, 2, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [14, 2, 15, 14], "rotation": 270, "texture": "#top"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#side"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#top"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#back"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/fluid_collector_block.json b/src/main/resources/assets/actuallyadditions/models/block/fluid_collector_block.json new file mode 100644 index 000000000..8874bf6d9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/fluid_collector_block.json @@ -0,0 +1,289 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "back": "actuallyadditions:block/base_texture_back", + "top": "actuallyadditions:block/base_texture_arrow", + "front": "actuallyadditions:block/fluid_collector_front", + "side": "actuallyadditions:block/fluid_collector_side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "east": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#front"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#back"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 15, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 15, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 3, 6], + "to": [16, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 270, "texture": "#side"}, + "east": {"uv": [3, 6, 13, 10], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 270, "texture": "#side"}, + "west": {"uv": [0, 0, 10, 4], "rotation": 90, "texture": "#side"}, + "up": {"uv": [12, 6, 13, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 6, 4, 10], "texture": "#side"} + } + }, + { + "from": [0, 3, 6], + "to": [1, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 90, "texture": "#side"}, + "east": {"uv": [0, 0, 10, 4], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 90, "texture": "#side"}, + "west": {"uv": [3, 6, 13, 10], "rotation": 90, "texture": "#side"}, + "up": {"uv": [3, 6, 4, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [12, 6, 13, 10], "texture": "#side"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 10, 11, 11], "texture": "#front"}, + "east": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "west": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#front"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [11, 9, 13, 10], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#front"}, + "south": {"uv": [11, 6, 13, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [3, 9, 5, 10], "texture": "#front"}, + "east": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#front"}, + "south": {"uv": [3, 6, 5, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [6, 15, 3], + "to": [10, 16, 5], + "faces": { + "north": {"uv": [6, 12, 10, 13], "texture": "#front"}, + "east": {"uv": [6, 11, 7, 13], "rotation": 270, "texture": "#front"}, + "south": {"uv": [0, 0, 4, 1], "texture": "#missing"}, + "west": {"uv": [9, 11, 10, 13], "rotation": 90, "texture": "#front"}, + "up": {"uv": [6, 11, 10, 13], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 4, 2], "texture": "#missing"} + } + }, + { + "from": [6, 15, 11], + "to": [10, 16, 13], + "faces": { + "north": {"uv": [0, 0, 4, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [6, 3, 7, 5], "rotation": 270, "texture": "#front"}, + "south": {"uv": [6, 3, 10, 4], "rotation": 180, "texture": "#front"}, + "west": {"uv": [9, 3, 10, 5], "rotation": 90, "texture": "#front"}, + "up": {"uv": [6, 3, 10, 5], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 4, 2], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [-90, 0, 45], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [-90, 0, -45], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [-90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [-60, 0, -135], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, 0, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/fluid_placer_block.json b/src/main/resources/assets/actuallyadditions/models/block/fluid_placer_block.json new file mode 100644 index 000000000..9e631920b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/fluid_placer_block.json @@ -0,0 +1,289 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "back": "actuallyadditions:block/base_texture_back", + "side": "actuallyadditions:block/fluid_placer_side", + "top": "actuallyadditions:block/base_texture_arrow", + "front": "actuallyadditions:block/fluid_placer_front" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "east": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#front"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#back"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 15, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 15, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 3, 6], + "to": [16, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 270, "texture": "#side"}, + "east": {"uv": [3, 6, 13, 10], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 270, "texture": "#side"}, + "west": {"uv": [0, 0, 10, 4], "rotation": 90, "texture": "#side"}, + "up": {"uv": [12, 6, 13, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 6, 4, 10], "texture": "#side"} + } + }, + { + "from": [0, 3, 6], + "to": [1, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 90, "texture": "#side"}, + "east": {"uv": [0, 0, 10, 4], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 90, "texture": "#side"}, + "west": {"uv": [3, 6, 13, 10], "rotation": 90, "texture": "#side"}, + "up": {"uv": [3, 6, 4, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [12, 6, 13, 10], "texture": "#side"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 10, 11, 11], "texture": "#front"}, + "east": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "west": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#front"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [11, 9, 13, 10], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#front"}, + "south": {"uv": [11, 6, 13, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [3, 9, 5, 10], "texture": "#front"}, + "east": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#front"}, + "south": {"uv": [3, 6, 5, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [6, 15, 11], + "to": [10, 16, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "east": {"uv": [3, 9, 5, 10], "texture": "#front"}, + "south": {"uv": [6, 3, 10, 4], "rotation": 180, "texture": "#front"}, + "west": {"uv": [3, 6, 5, 7], "texture": "#front"}, + "up": {"uv": [6, 3, 10, 5], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "rotation": 270, "texture": "#front"} + } + }, + { + "from": [6, 15, 3], + "to": [10, 16, 5], + "faces": { + "north": {"uv": [6, 12, 10, 13], "texture": "#front"}, + "east": {"uv": [6, 11, 7, 13], "texture": "#front"}, + "south": {"uv": [6, 3, 10, 4], "rotation": 180, "texture": "#front"}, + "west": {"uv": [9, 11, 10, 13], "texture": "#front"}, + "up": {"uv": [6, 11, 10, 13], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "rotation": 270, "texture": "#front"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [-90, 0, 45], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [-90, 0, -45], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [-90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [-60, 0, -135], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, 0, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json new file mode 100644 index 000000000..e99a414c2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json @@ -0,0 +1,502 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "relay": "actuallyadditions:block/models/laser_relay" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 4, 12], + "faces": { + "north": {"uv": [0.5, 0.5, 4.5, 1.5], "texture": "#relay"}, + "east": {"uv": [0.5, 0.5, 4.5, 1.5], "texture": "#relay"}, + "south": {"uv": [0.5, 0.5, 4.5, 1.5], "texture": "#relay"}, + "west": {"uv": [0.5, 0.5, 4.5, 1.5], "texture": "#relay"}, + "up": {"uv": [3, 6.5, 7, 10.5], "texture": "#relay"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#relay"} + } + }, + { + "from": [6, 4, 6], + "to": [7, 6, 7], + "faces": { + "north": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "east": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "west": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "up": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "down": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"} + } + }, + { + "from": [9, 4, 9], + "to": [10, 6, 10], + "faces": { + "north": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "east": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "south": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "west": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "up": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "down": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"} + } + }, + { + "from": [6, 4, 9], + "to": [7, 6, 10], + "faces": { + "north": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "south": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "up": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"} + } + }, + { + "from": [3, 1, 12], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [12, 1, 12], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [3, 4, 4], + "to": [4, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [3, 1, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 4, 4], + "to": [13, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [12, 1, 4], + "to": [13, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 270, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 4, 12], + "to": [12, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 4, 3], + "to": [12, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, -7]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, -7]}, + "faces": { + "north": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [9, 4, 6], + "to": [10, 6, 7], + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [8, 4, 7], + "to": [11, 4.5, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [9.5, 4.25, 8]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 8, 6, 9], "rotation": 90, "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 8, 6, 9], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [5, 4, 7], + "to": [8, 4.5, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [6.5, 4.25, 8]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "east": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "south": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "west": {"uv": [4, 8, 4.5, 9], "rotation": 270, "texture": "#relay"}, + "up": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "down": {"uv": [4, 8, 4.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 2.75, 6.25], + "to": [9, 5.75, 6.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 6.5]}, + "faces": { + "north": {"uv": [4.5, 7.5, 5.5, 8], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 8], + "to": [9, 4.5, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 9.5]}, + "faces": { + "north": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "east": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "south": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "west": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "up": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "down": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 6, 7], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [2, 6.5, 3, 8.5], "texture": "#relay"}, + "east": {"uv": [2, 6.5, 3, 8.5], "texture": "#relay"}, + "south": {"uv": [2, 6.5, 3, 8.5], "texture": "#relay"}, + "west": {"uv": [2, 6.5, 3, 8.5], "texture": "#relay"}, + "up": {"uv": [2, 6.5, 3, 7.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [1, 6.5, 2, 7.5], "texture": "#relay"} + } + }, + { + "from": [6.5, 5, 7], + "to": [7, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 7, 7], + "to": [7, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 9, 7], + "to": [7, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 5, 7], + "to": [9.5, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 7, 7], + "to": [9.5, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 9, 7], + "to": [9.5, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 6.5], + "to": [9, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 7, 6.5], + "to": [9, 7.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 9, 6.5], + "to": [9, 9.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 9], + "to": [9, 6, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 7, 9], + "to": [9, 7.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 9, 9], + "to": [9, 9.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + } + ], + "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/green_block.json b/src/main/resources/assets/actuallyadditions/models/block/green_block.json new file mode 100644 index 000000000..b66f7b05b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/green_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/green_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json b/src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json new file mode 100644 index 000000000..05ae62697 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json @@ -0,0 +1,207 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/block_greenhouse_glass", + "base": "actuallyadditions:block/block_greenhouse_glass" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 23]}, + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 23]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 90, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 90, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 90, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 270, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + } + ], + "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/heat_collector_block.json b/src/main/resources/assets/actuallyadditions/models/block/heat_collector_block.json new file mode 100644 index 000000000..db3a17044 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/heat_collector_block.json @@ -0,0 +1,589 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/heat_collector_side", + "top": "actuallyadditions:block/heat_collector_top", + "animation": "actuallyadditions:block/heat_collector_glow_animated" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [4, 13, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#animation"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 12]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 19]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [15, 11, 4], + "to": [16, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#side"}, + "east": {"uv": [4, 4, 12, 5], "texture": "#side"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "up": {"uv": [4, 4, 12, 5], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [15, 5, 4], + "to": [16, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 12]}, + "faces": { + "north": {"uv": [11, 10, 12, 11], "texture": "#side"}, + "east": {"uv": [4, 10, 12, 11], "texture": "#side"}, + "south": {"uv": [4, 10, 5, 11], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "up": {"uv": [4, 10, 12, 11], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 10, 12, 11], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [15, 7, 4], + "to": [16, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 12]}, + "faces": { + "north": {"uv": [11, 8, 12, 9], "texture": "#side"}, + "east": {"uv": [4, 8, 12, 9], "texture": "#side"}, + "south": {"uv": [4, 8, 5, 9], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "up": {"uv": [4, 8, 12, 9], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 8, 12, 9], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [15, 9, 4], + "to": [16, 10, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 12]}, + "faces": { + "north": {"uv": [11, 6, 12, 7], "texture": "#side"}, + "east": {"uv": [4, 6, 12, 7], "texture": "#side"}, + "south": {"uv": [4, 6, 5, 7], "texture": "#side"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "up": {"uv": [4, 6, 12, 7], "rotation": 270, "texture": "#side"}, + "down": {"uv": [4, 6, 12, 7], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [4, 11, 15], + "to": [12, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 19, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#side"}, + "south": {"uv": [4, 4, 12, 5], "texture": "#side"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#side"}, + "up": {"uv": [4, 4, 12, 5], "texture": "#side"}, + "down": {"uv": [4, 4, 12, 5], "texture": "#side"} + } + }, + { + "from": [4, 9, 15], + "to": [12, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "east": {"uv": [11, 6, 12, 7], "texture": "#side"}, + "south": {"uv": [4, 6, 12, 7], "texture": "#side"}, + "west": {"uv": [4, 6, 5, 7], "texture": "#side"}, + "up": {"uv": [4, 6, 12, 7], "texture": "#side"}, + "down": {"uv": [4, 6, 12, 7], "texture": "#side"} + } + }, + { + "from": [4, 7, 15], + "to": [12, 8, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 15, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "east": {"uv": [11, 8, 12, 9], "texture": "#side"}, + "south": {"uv": [4, 8, 12, 9], "texture": "#side"}, + "west": {"uv": [4, 8, 5, 9], "texture": "#side"}, + "up": {"uv": [4, 8, 12, 9], "texture": "#side"}, + "down": {"uv": [4, 8, 12, 9], "texture": "#side"} + } + }, + { + "from": [4, 5, 15], + "to": [12, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 13, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "east": {"uv": [11, 10, 12, 11], "texture": "#side"}, + "south": {"uv": [4, 10, 12, 11], "texture": "#side"}, + "west": {"uv": [4, 10, 5, 11], "texture": "#side"}, + "up": {"uv": [4, 10, 12, 11], "texture": "#side"}, + "down": {"uv": [4, 10, 12, 11], "texture": "#side"} + } + }, + { + "from": [0, 11, 4], + "to": [1, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 4]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#side"}, + "west": {"uv": [4, 4, 12, 5], "texture": "#side"}, + "up": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 4, 12, 5], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [0, 5, 4], + "to": [1, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 4]}, + "faces": { + "north": {"uv": [4, 10, 5, 11], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "south": {"uv": [11, 10, 12, 11], "texture": "#side"}, + "west": {"uv": [4, 10, 12, 11], "texture": "#side"}, + "up": {"uv": [4, 10, 12, 11], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 10, 12, 11], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [0, 7, 4], + "to": [1, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 4]}, + "faces": { + "north": {"uv": [4, 8, 5, 9], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "south": {"uv": [11, 8, 12, 9], "texture": "#side"}, + "west": {"uv": [4, 8, 12, 9], "texture": "#side"}, + "up": {"uv": [4, 8, 12, 9], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 8, 12, 9], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [0, 9, 4], + "to": [1, 10, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 4]}, + "faces": { + "north": {"uv": [4, 6, 5, 7], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "south": {"uv": [11, 6, 12, 7], "texture": "#side"}, + "west": {"uv": [4, 6, 12, 7], "texture": "#side"}, + "up": {"uv": [4, 6, 12, 7], "rotation": 90, "texture": "#side"}, + "down": {"uv": [4, 6, 12, 7], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [4, 11, 0], + "to": [12, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 19, 8]}, + "faces": { + "north": {"uv": [4, 4, 12, 5], "texture": "#side"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#side"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#side"}, + "up": {"uv": [4, 4, 12, 5], "rotation": 180, "texture": "#side"}, + "down": {"uv": [4, 4, 12, 5], "rotation": 180, "texture": "#side"} + } + }, + { + "from": [4, 9, 0], + "to": [12, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 17, 8]}, + "faces": { + "north": {"uv": [4, 6, 12, 7], "texture": "#side"}, + "east": {"uv": [4, 6, 5, 7], "texture": "#side"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "west": {"uv": [11, 6, 12, 7], "texture": "#side"}, + "up": {"uv": [4, 6, 12, 7], "rotation": 180, "texture": "#side"}, + "down": {"uv": [4, 6, 12, 7], "rotation": 180, "texture": "#side"} + } + }, + { + "from": [4, 7, 0], + "to": [12, 8, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 15, 8]}, + "faces": { + "north": {"uv": [4, 8, 12, 9], "texture": "#side"}, + "east": {"uv": [4, 8, 5, 9], "texture": "#side"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "west": {"uv": [11, 8, 12, 9], "texture": "#side"}, + "up": {"uv": [4, 8, 12, 9], "rotation": 180, "texture": "#side"}, + "down": {"uv": [4, 8, 12, 9], "rotation": 180, "texture": "#side"} + } + }, + { + "from": [4, 5, 0], + "to": [12, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 13, 8]}, + "faces": { + "north": {"uv": [4, 10, 12, 11], "texture": "#side"}, + "east": {"uv": [4, 10, 5, 11], "texture": "#side"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#side"}, + "west": {"uv": [11, 10, 12, 11], "texture": "#side"}, + "up": {"uv": [4, 10, 12, 11], "rotation": 180, "texture": "#side"}, + "down": {"uv": [4, 10, 12, 11], "rotation": 180, "texture": "#side"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 0]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 10]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#side"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#side"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#side"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#side"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json b/src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json new file mode 100644 index 000000000..06a549523 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json @@ -0,0 +1,221 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "inside": "actuallyadditions:block/item_interface_hopper_top", + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/item_interface_hopper_side" + }, + "elements": [ + { + "from": [0, 10, 0], + "to": [16, 11, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#inside"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#inside"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 11, 1], + "to": [2, 15, 15], + "faces": { + "north": {"uv": [14, 6, 15, 10], "texture": "#side", "cullface": "east"}, + "east": {"uv": [1, 6, 15, 10], "texture": "#side", "cullface": "east"}, + "south": {"uv": [1, 6, 2, 10], "texture": "#side", "cullface": "east"}, + "west": {"uv": [1, 6, 15, 10], "texture": "#side", "cullface": "east"}, + "up": {"uv": [1, 1, 2, 15], "texture": "#inside", "cullface": "up"} + } + }, + { + "from": [14, 11, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 6, 2, 10], "texture": "#side", "cullface": "east"}, + "east": {"uv": [1, 6, 15, 10], "texture": "#side", "cullface": "east"}, + "south": {"uv": [14, 6, 15, 10], "texture": "#side", "cullface": "east"}, + "west": {"uv": [1, 6, 15, 10], "texture": "#side", "cullface": "east"}, + "up": {"uv": [14, 1, 15, 15], "texture": "#inside", "cullface": "up"} + } + }, + { + "from": [2, 11, 1], + "to": [14, 15, 2], + "faces": { + "north": {"uv": [2, 6, 14, 10], "texture": "#side", "cullface": "east"}, + "south": {"uv": [2, 6, 14, 10], "texture": "#side", "cullface": "east"}, + "up": {"uv": [2, 1, 14, 2], "texture": "#inside", "cullface": "up"} + } + }, + { + "from": [2, 11, 14], + "to": [14, 15, 15], + "faces": { + "north": {"uv": [2, 6, 14, 10], "texture": "#side", "cullface": "east"}, + "south": {"uv": [2, 6, 14, 10], "texture": "#side", "cullface": "east"}, + "up": {"uv": [2, 14, 14, 15], "texture": "#inside", "cullface": "up"} + } + }, + { + "from": [4, 4, 4], + "to": [12, 10, 12], + "faces": { + "north": {"uv": [1, 9, 9, 15], "texture": "#side"}, + "east": {"uv": [1, 9, 9, 15], "texture": "#side"}, + "south": {"uv": [1, 9, 9, 15], "texture": "#side"}, + "west": {"uv": [1, 9, 9, 15], "texture": "#side"}, + "down": {"uv": [1, 9, 9, 15], "texture": "#side"} + } + }, + { + "from": [6, 0, 6], + "to": [10, 4, 10], + "faces": { + "north": {"uv": [11, 11, 15, 15], "texture": "#side"}, + "east": {"uv": [11, 11, 15, 15], "texture": "#side"}, + "south": {"uv": [11, 11, 15, 15], "texture": "#side"}, + "west": {"uv": [11, 11, 15, 15], "texture": "#side"}, + "down": {"uv": [11, 11, 15, 15], "texture": "#side"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#inside"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#inside"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#inside"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#inside"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#inside"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 23]}, + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [15, 15, 16, 16], "texture": "#inside"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#inside"}, + "west": {"uv": [0, 15, 1, 16], "texture": "#inside"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#inside"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#inside"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 23]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#inside"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#inside"}, + "down": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#inside"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 23, 23]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#inside"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#inside"}, + "down": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#inside"} + } + }, + { + "from": [0, 11, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 11, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 23]}, + "faces": { + "north": {"uv": [0, 12, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 12, 1, 16], "texture": "#base"}, + "south": {"uv": [0, 12, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 12, 1, 16], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 11, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 19, 23]}, + "faces": { + "north": {"uv": [15, 12, 16, 16], "texture": "#base"}, + "east": {"uv": [15, 12, 16, 16], "texture": "#base"}, + "south": {"uv": [15, 12, 16, 16], "texture": "#base"}, + "west": {"uv": [15, 12, 16, 16], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 11, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 19, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 4], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 4], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 4], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 4], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + } + ], + "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/iron_casing_block.json b/src/main/resources/assets/actuallyadditions/models/block/iron_casing_block.json new file mode 100644 index 000000000..673f31063 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/iron_casing_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/iron_casing_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/item_interface_block.json b/src/main/resources/assets/actuallyadditions/models/block/item_interface_block.json new file mode 100644 index 000000000..b0bbcdc12 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/item_interface_block.json @@ -0,0 +1,278 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/item_interface_side", + "top": "actuallyadditions:block/item_interface_top" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json new file mode 100644 index 000000000..443503269 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json @@ -0,0 +1,502 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "relay": "actuallyadditions:block/models/laser_relay" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 4, 12], + "faces": { + "north": {"uv": [0.5, 2, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [0.5, 2, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [0.5, 2, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [0.5, 2, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [3, 6.5, 7, 10.5], "texture": "#relay"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#relay"} + } + }, + { + "from": [6, 4, 6], + "to": [7, 6, 7], + "faces": { + "north": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "east": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "west": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "up": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"}, + "down": {"uv": [4, 7.5, 4.5, 8], "texture": "#relay"} + } + }, + { + "from": [9, 4, 9], + "to": [10, 6, 10], + "faces": { + "north": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "east": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "south": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "west": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "up": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"}, + "down": {"uv": [5.5, 9, 6, 9.5], "texture": "#relay"} + } + }, + { + "from": [6, 4, 9], + "to": [7, 6, 10], + "faces": { + "north": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "south": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "up": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4, 9, 4.5, 9.5], "texture": "#relay"} + } + }, + { + "from": [3, 1, 12], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [12, 1, 12], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 11]}, + "faces": { + "north": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 4.5, 5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 4.5, 5, 5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [0, 4.5, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [0, 6, 0.5, 6.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [3, 4, 4], + "to": [4, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [3, 1, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [12, 4, 4], + "to": [13, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 270, "texture": "#relay"} + } + }, + { + "from": [12, 1, 4], + "to": [13, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [0.5, 6, 4.5, 6.5], "texture": "#relay"}, + "south": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 6, 4.5, 6.5], "rotation": 270, "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 4, 12], + "to": [12, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 2]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 4, 3], + "to": [12, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, -7]}, + "faces": { + "north": {"uv": [0.5, 3, 4.5, 3.5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "south": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#missing"}, + "up": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"}, + "down": {"uv": [0.5, 3, 4.5, 3.5], "texture": "#relay"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "north": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, -7]}, + "faces": { + "north": {"uv": [0.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "south": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#relay"}, + "up": {"uv": [0.5, 4.5, 4.5, 5], "texture": "#relay"}, + "down": {"uv": [6, 6, 7, 7], "texture": "#relay"} + } + }, + { + "from": [9, 4, 6], + "to": [10, 6, 7], + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [8, 4, 7], + "to": [11, 4.5, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [9.5, 4.25, 8]}, + "faces": { + "north": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "east": {"uv": [5.5, 8, 6, 9], "rotation": 90, "texture": "#relay"}, + "south": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"}, + "up": {"uv": [5.5, 8, 6, 9], "texture": "#relay"}, + "down": {"uv": [5.5, 7.5, 6, 8], "texture": "#relay"} + } + }, + { + "from": [5, 4, 7], + "to": [8, 4.5, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [6.5, 4.25, 8]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "east": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "south": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "west": {"uv": [4, 8, 4.5, 9], "rotation": 270, "texture": "#relay"}, + "up": {"uv": [4, 8, 4.5, 9], "texture": "#relay"}, + "down": {"uv": [4, 8, 4.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 2.75, 6.25], + "to": [9, 5.75, 6.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 6.5]}, + "faces": { + "north": {"uv": [4.5, 7.5, 5.5, 8], "rotation": 180, "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 8], + "to": [9, 4.5, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.25, 9.5]}, + "faces": { + "north": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "east": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "south": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "west": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"}, + "up": {"uv": [4.5, 9, 5.5, 9.5], "texture": "#relay"}, + "down": {"uv": [4.5, 9, 5.5, 9.5], "rotation": 180, "texture": "#relay"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "east": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "south": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "west": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "up": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"}, + "down": {"uv": [4.5, 8, 5.5, 9], "texture": "#relay"} + } + }, + { + "from": [7, 6, 7], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "east": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "south": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "west": {"uv": [1, 6.5, 2, 8.5], "texture": "#relay"}, + "up": {"uv": [1, 6.5, 2, 7.5], "rotation": 90, "texture": "#relay"}, + "down": {"uv": [1, 6.5, 2, 7.5], "texture": "#relay"} + } + }, + { + "from": [6.5, 5, 7], + "to": [7, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 7, 7], + "to": [7, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [6.5, 9, 7], + "to": [7, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 5, 7], + "to": [9.5, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 7, 7], + "to": [9.5, 7.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [9, 9, 7], + "to": [9.5, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 15]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 3], "rotation": 270, "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 3], "rotation": 90, "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 3], "rotation": 180, "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 6.5], + "to": [9, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 7, 6.5], + "to": [9, 7.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 9, 6.5], + "to": [9, 9.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 14]}, + "faces": { + "north": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "east": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "south": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "west": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "up": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"}, + "down": {"uv": [4, 2.5, 4.5, 3], "texture": "#relay"} + } + }, + { + "from": [7, 5, 9], + "to": [9, 6, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 7, 9], + "to": [9, 7.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 15, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + }, + { + "from": [7, 9, 9], + "to": [9, 9.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 17, 17]}, + "faces": { + "north": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "east": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "south": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "west": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "up": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"}, + "down": {"uv": [4, 2, 4.5, 2.5], "texture": "#relay"} + } + } + ], + "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/lamp_black_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_black_block.json new file mode 100644 index 000000000..44527d0d1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_black_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_black_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_blue_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_blue_block.json new file mode 100644 index 000000000..9cbeea4ef --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_blue_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_blue_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_brown_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_brown_block.json new file mode 100644 index 000000000..626db0d7a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_brown_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_brown_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_controller_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_controller_block.json new file mode 100644 index 000000000..f81e89f59 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_controller_block.json @@ -0,0 +1,317 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "front": "actuallyadditions:block/lamp_controller_front", + "side": "actuallyadditions:block/lamp_controller_side", + "back": "actuallyadditions:block/vertical_digger_side_a", + "top": "actuallyadditions:block/base_texture_arrow" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [3, 3, 15], + "to": [13, 13, 16], + "faces": { + "north": {"uv": [0, 0, 10, 10], "texture": "#back"}, + "east": {"uv": [12, 3, 13, 13], "texture": "#back"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#back"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#back"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#back"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#back"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#front"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#back"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#front"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#back"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#back"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#back"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#back"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#front"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 7, 7], + "to": [1, 9, 10], + "faces": { + "north": {"uv": [7, 7, 8, 9], "texture": "#side"}, + "east": {"uv": [7, 7, 10, 9], "texture": "#side"}, + "south": {"uv": [9, 7, 10, 9], "texture": "#side"}, + "west": {"uv": [7, 7, 10, 9], "texture": "#side"}, + "up": {"uv": [7, 7, 10, 8], "rotation": 90, "texture": "#side"}, + "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#side"} + } + }, + { + "from": [15, 7, 6], + "to": [16, 9, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 7]}, + "faces": { + "north": {"uv": [9, 7, 10, 9], "rotation": 270, "texture": "#side"}, + "east": {"uv": [7, 7, 10, 9], "texture": "#side"}, + "south": {"uv": [7, 7, 8, 9], "texture": "#side"}, + "west": {"uv": [7, 7, 10, 9], "texture": "#side"}, + "up": {"uv": [7, 7, 10, 8], "rotation": 270, "texture": "#side"}, + "down": {"uv": [7, 8, 10, 9], "rotation": 90, "texture": "#side"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json new file mode 100644 index 000000000..688d70e65 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_cyan_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_gray_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_gray_block.json new file mode 100644 index 000000000..4bf8865ad --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_gray_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_gray_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_green_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_green_block.json new file mode 100644 index 000000000..6d9efa6db --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_green_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_green_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json new file mode 100644 index 000000000..0b470891c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_light_blue_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json new file mode 100644 index 000000000..6cf1055f3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_light_gray_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_lime_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_lime_block.json new file mode 100644 index 000000000..4963e7182 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_lime_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_lime_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json new file mode 100644 index 000000000..bb44f0f45 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_magenta_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_orange_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_orange_block.json new file mode 100644 index 000000000..9e48bae8f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_orange_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_orange_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_pink_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_pink_block.json new file mode 100644 index 000000000..6dcf9fabe --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_pink_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_pink_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_purple_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_purple_block.json new file mode 100644 index 000000000..49752de04 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_purple_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_purple_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_red_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_red_block.json new file mode 100644 index 000000000..c2cb786d6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_red_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_red_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_white_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_white_block.json new file mode 100644 index 000000000..0f2589124 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_white_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_white_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json new file mode 100644 index 000000000..47cebabcc --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/lamp_yellow_on_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json b/src/main/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json new file mode 100644 index 000000000..33990082a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json @@ -0,0 +1,277 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/base_texture_side" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#side"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json b/src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json new file mode 100644 index 000000000..edaf34c5f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json @@ -0,0 +1,436 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "base_side": "actuallyadditions:block/base_texture_side", + "animation": "actuallyadditions:block/heat_collector_glow_animated", + "top": "actuallyadditions:block/heat_collector_top", + "side": "actuallyadditions:block/item_repairer_side_b" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [12, 15, 5], + "to": [13, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 23, 13]}, + "faces": { + "north": {"uv": [12, 5, 13, 6], "texture": "#top"}, + "east": {"uv": [12, 5, 13, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [12, 10, 13, 11], "texture": "#top"}, + "west": {"uv": [12, 5, 13, 11], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 5, 13, 11], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 6], "texture": "#top"} + } + }, + { + "from": [3, 15, 5], + "to": [4, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 23, 13]}, + "faces": { + "north": {"uv": [3, 5, 4, 6], "texture": "#top"}, + "east": {"uv": [3, 5, 4, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [3, 10, 4, 11], "texture": "#top"}, + "west": {"uv": [3, 5, 4, 11], "rotation": 270, "texture": "#top"}, + "up": {"uv": [3, 5, 4, 11], "texture": "#top"}, + "down": {"uv": [0, 0, 1, 6], "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 16, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 19]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 16, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 8, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 16, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 19]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 16, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 12]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [4, 13, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#animation"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#animation"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#animation"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 21, 19]}, + "faces": { + "north": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [4, 1, 12, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [4, 12, 12, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [4, 14, 1], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 21, 8]}, + "faces": { + "north": {"uv": [4, 1, 12, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [4, 1, 12, 4], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [4, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-3, 21, 8]}, + "faces": { + "north": {"uv": [12, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#top"}, + "south": {"uv": [1, 1, 4, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 4, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [12, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 4, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [12, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [12, 1, 13, 15], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#base_side"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#base_side"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base_side"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base_side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base_side"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#base_side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base_side"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base_side"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base_side"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#base_side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base_side"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [5, 15, 3], + "to": [11, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 23, 11]}, + "faces": { + "north": {"uv": [5, 3, 11, 4], "rotation": 180, "texture": "#top"}, + "east": {"uv": [10, 3, 11, 4], "texture": "#top"}, + "south": {"uv": [5, 3, 11, 4], "texture": "#top"}, + "west": {"uv": [5, 3, 6, 4], "texture": "#top"}, + "up": {"uv": [5, 3, 11, 4], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#top"} + } + }, + { + "from": [5, 15, 12], + "to": [11, 16, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 23, 20]}, + "faces": { + "north": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#top"}, + "east": {"uv": [10, 12, 11, 13], "texture": "#top"}, + "south": {"uv": [5, 12, 11, 13], "texture": "#top"}, + "west": {"uv": [5, 12, 6, 13], "texture": "#top"}, + "up": {"uv": [5, 12, 11, 13], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#top"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/leaf_generator_block.json b/src/main/resources/assets/actuallyadditions/models/block/leaf_generator_block.json new file mode 100644 index 000000000..df598bf90 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/leaf_generator_block.json @@ -0,0 +1,601 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/heat_collector_top", + "base_side": "actuallyadditions:block/base_texture_side", + "front": "actuallyadditions:block/bioreactor_front", + "side_animation": "actuallyadditions:block/farmer_front", + "top_animation": "actuallyadditions:block/leaf_gen_animated" + }, + "elements": [ + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#front"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#front"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#front"}, + "up": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [5, 4, 0], + "to": [11, 5, 1], + "faces": { + "north": {"uv": [5, 11, 11, 12], "texture": "#side_animation"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [5, 11, 11, 12], "rotation": 180, "texture": "#side_animation"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "up": {"uv": [5, 11, 11, 12], "texture": "#side_animation"}, + "down": {"uv": [5, 11, 11, 12], "rotation": 180, "texture": "#side_animation"} + } + }, + { + "from": [15, 11, 5], + "to": [16, 12, 11], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side_animation"}, + "east": {"uv": [5, 4, 11, 5], "rotation": 180, "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side_animation"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#side_animation"}, + "up": {"uv": [5, 4, 11, 5], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [5, 4, 11, 5], "rotation": 270, "texture": "#side_animation"} + } + }, + { + "from": [0, 11, 5], + "to": [1, 12, 11], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#side_animation"}, + "east": {"uv": [5, 4, 11, 5], "rotation": 180, "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#side_animation"}, + "west": {"uv": [5, 4, 11, 5], "texture": "#side_animation"}, + "up": {"uv": [5, 4, 11, 5], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [5, 4, 11, 5], "rotation": 270, "texture": "#side_animation"} + } + }, + { + "from": [5, 11, 0], + "to": [11, 12, 1], + "faces": { + "north": {"uv": [5, 4, 11, 5], "texture": "#side_animation"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#side_animation"}, + "south": {"uv": [5, 4, 11, 5], "rotation": 180, "texture": "#side_animation"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#side_animation"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#side_animation"}, + "down": {"uv": [5, 4, 11, 5], "rotation": 180, "texture": "#side_animation"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [13, 1, 2], + "to": [14, 14, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#top_animation"}, + "east": {"uv": [2, 1, 14, 15], "texture": "#top_animation"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#top_animation"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#top_animation"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top_animation"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#top_animation"} + } + }, + { + "from": [2, 1, 2], + "to": [3, 14, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#top_animation"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#top_animation"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#top_animation"}, + "west": {"uv": [2, 1, 14, 15], "texture": "#top_animation"}, + "up": {"uv": [14, 2, 15, 14], "rotation": 180, "texture": "#top_animation"}, + "down": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#top_animation"} + } + }, + { + "from": [14, 5, 2], + "to": [15, 11, 5], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [11, 5, 14, 11], "texture": "#side_animation"}, + "south": {"uv": [11, 5, 12, 11], "texture": "#side_animation"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 5, 11], + "to": [2, 11, 14], + "faces": { + "north": {"uv": [4, 5, 5, 11], "texture": "#side_animation"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [11, 5, 14, 11], "texture": "#side_animation"}, + "up": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 5, 11], + "to": [15, 11, 14], + "faces": { + "north": {"uv": [4, 5, 5, 11], "texture": "#side_animation"}, + "east": {"uv": [2, 5, 5, 11], "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side_animation"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side_animation"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 5, 2], + "to": [2, 11, 5], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side_animation"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#side_animation"}, + "south": {"uv": [11, 5, 12, 11], "texture": "#side_animation"}, + "west": {"uv": [2, 5, 5, 11], "texture": "#side_animation"}, + "up": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 11, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [2, 1, 14, 5], "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [2, 4, 14, 5], "rotation": 270, "texture": "#side_animation"} + } + }, + { + "from": [1, 11, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [2, 1, 14, 5], "texture": "#side_animation"}, + "up": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [2, 4, 14, 5], "rotation": 270, "texture": "#side_animation"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 5, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [2, 11, 14, 16], "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "up": {"uv": [2, 11, 14, 12], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 5, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [2, 11, 14, 16], "texture": "#side_animation"}, + "up": {"uv": [2, 11, 14, 12], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [1, 2, 2, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 15, 2], + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#side_animation"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#base_side"}, + "south": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#base_side"}, + "up": {"uv": [14, 2, 15, 14], "rotation": 270, "texture": "#top"}, + "down": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "faces": { + "north": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "east": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "rotation": 180, "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "rotation": 180, "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "rotation": 180, "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [4, 13, 4], + "to": [12, 14, 12], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#top_animation"}, + "down": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#top"} + } + }, + { + "from": [15, 4, 11], + "to": [16, 12, 12], + "faces": { + "north": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#side_animation"}, + "up": {"uv": [4, 4, 5, 5], "rotation": 180, "texture": "#side_animation"}, + "down": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#side_animation"} + } + }, + { + "from": [0, 4, 11], + "to": [1, 12, 12], + "faces": { + "north": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "up": {"uv": [4, 4, 5, 5], "rotation": 180, "texture": "#side_animation"}, + "down": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#side_animation"} + } + }, + { + "from": [11, 4, 0], + "to": [12, 12, 1], + "faces": { + "north": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "west": {"uv": [4, 4, 5, 12], "texture": "#side_animation"}, + "up": {"uv": [4, 4, 5, 5], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [4, 11, 5, 12], "rotation": 90, "texture": "#side_animation"} + } + }, + { + "from": [15, 4, 4], + "to": [16, 12, 5], + "faces": { + "north": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "east": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "south": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "west": {"uv": [12, 3, 13, 13], "texture": "#side_animation"}, + "up": {"uv": [11, 4, 12, 5], "rotation": 180, "texture": "#side_animation"}, + "down": {"uv": [11, 11, 12, 12], "rotation": 180, "texture": "#side_animation"} + } + }, + { + "from": [0, 4, 4], + "to": [1, 12, 5], + "faces": { + "north": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "east": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "south": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "west": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "up": {"uv": [11, 4, 12, 5], "rotation": 180, "texture": "#side_animation"}, + "down": {"uv": [11, 11, 12, 12], "rotation": 180, "texture": "#side_animation"} + } + }, + { + "from": [4, 4, 0], + "to": [5, 12, 1], + "faces": { + "north": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "east": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "south": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "west": {"uv": [11, 4, 12, 12], "texture": "#side_animation"}, + "up": {"uv": [11, 4, 12, 5], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [11, 11, 12, 12], "rotation": 90, "texture": "#side_animation"} + } + }, + { + "from": [15, 4, 5], + "to": [16, 5, 11], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [5, 11, 11, 12], "rotation": 180, "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "up": {"uv": [5, 11, 11, 12], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [5, 11, 11, 12], "rotation": 270, "texture": "#side_animation"} + } + }, + { + "from": [0, 4, 5], + "to": [1, 5, 11], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [5, 11, 11, 12], "rotation": 180, "texture": "#side_animation"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [5, 11, 11, 12], "texture": "#side_animation"}, + "up": {"uv": [5, 11, 11, 12], "rotation": 270, "texture": "#side_animation"}, + "down": {"uv": [5, 11, 11, 12], "rotation": 270, "texture": "#side_animation"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/miner_block.json b/src/main/resources/assets/actuallyadditions/models/block/miner_block.json new file mode 100644 index 000000000..ae3d6d106 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/miner_block.json @@ -0,0 +1,513 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/heat_collector_top", + "back": "actuallyadditions:block/farmer_side", + "side_a": "actuallyadditions:block/vertical_digger_side_a", + "front": "actuallyadditions:block/vertical_digger_side_b", + "animation": "actuallyadditions:block/vertical_digger_rotation_animation" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 3, 3], + "to": [16, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 11, 11]}, + "faces": { + "north": {"uv": [12, 3, 13, 13], "texture": "#side_a"}, + "east": {"uv": [3, 3, 13, 13], "texture": "#side_a"}, + "south": {"uv": [3, 3, 4, 13], "texture": "#side_a"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#side_a"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#side_a"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#side_a"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 11]}, + "faces": { + "north": {"uv": [3, 3, 4, 13], "texture": "#side_a"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#side_a"}, + "south": {"uv": [12, 3, 13, 13], "texture": "#side_a"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#side_a"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 90, "texture": "#side_a"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 270, "texture": "#side_a"} + } + }, + { + "from": [4, 11, 4], + "to": [12, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#top"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#animation"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#top"} + } + }, + { + "from": [11, 14, 4], + "to": [12, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 12]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "east": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "south": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "west": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "up": {"uv": [4, 11, 5, 12], "texture": "#top"}, + "down": {"uv": [4, 11, 5, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 4], + "to": [5, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "up": {"uv": [11, 11, 12, 12], "texture": "#top"}, + "down": {"uv": [11, 11, 12, 12], "texture": "#top"} + } + }, + { + "from": [3, 12, 5], + "to": [4, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [1, 5, 3, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [12, 12, 5], + "to": [13, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 21, 13]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [13, 5, 15, 11], "rotation": 270, "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 3], + "to": [11, 14, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 11]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [5, 1, 11, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [5, 12, 12], + "to": [11, 14, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 21, 20]}, + "faces": { + "north": {"uv": [5, 13, 11, 15], "rotation": 180, "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 11], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 12, 4], + "to": [12, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 4], + "to": [5, 14, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 12]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 12, 11], + "to": [5, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 21, 19]}, + "faces": { + "north": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "east": {"uv": [12, 1, 13, 3], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [4, 14, 11], + "to": [5, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 19]}, + "faces": { + "north": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "south": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "west": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#top"}, + "down": {"uv": [11, 4, 12, 5], "texture": "#top"} + } + }, + { + "from": [11, 14, 11], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 19]}, + "faces": { + "north": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#top"}, + "down": {"uv": [4, 4, 5, 5], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [12, 2, 14, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 0]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 12, 12, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 22, 10]}, + "faces": { + "north": {"uv": [4, 3, 12, 4], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [4, 2, 12, 4], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#top"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 180, "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#side_a"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#side_a"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#missing"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, + "faces": { + "north": {"uv": [1, 1, 15, 16], "texture": "#front"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#missing"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#missing"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#back"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#back"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#back"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/oil_generator_block.json b/src/main/resources/assets/actuallyadditions/models/block/oil_generator_block.json new file mode 100644 index 000000000..d1ddf922b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/oil_generator_block.json @@ -0,0 +1,626 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "front": "actuallyadditions:block/oil_generator_front", + "animation": "actuallyadditions:block/oil_generator_oil_animated", + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/generator_side", + "top": "actuallyadditions:block/generator_top" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [12, 3, 1], + "to": [13, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, + "faces": { + "north": {"uv": [3, 12, 4, 13], "texture": "#front"}, + "east": {"uv": [3, 12, 4, 13], "texture": "#front"}, + "south": {"uv": [3, 12, 4, 13], "texture": "#front"}, + "west": {"uv": [3, 12, 4, 13], "texture": "#front"}, + "up": {"uv": [3, 12, 4, 13], "texture": "#front"}, + "down": {"uv": [3, 12, 4, 13], "texture": "#front"} + } + }, + { + "from": [3, 3, 1], + "to": [4, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 4, 8]}, + "faces": { + "north": {"uv": [12, 12, 13, 13], "texture": "#front"}, + "east": {"uv": [12, 12, 13, 13], "texture": "#front"}, + "south": {"uv": [12, 12, 13, 13], "texture": "#front"}, + "west": {"uv": [12, 12, 13, 13], "texture": "#front"}, + "up": {"uv": [12, 12, 13, 13], "texture": "#front"}, + "down": {"uv": [12, 12, 13, 13], "texture": "#front"} + } + }, + { + "from": [3, 7, 1], + "to": [4, 8, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 8, 8]}, + "faces": { + "north": {"uv": [12, 8, 13, 9], "texture": "#front"}, + "east": {"uv": [12, 8, 13, 9], "texture": "#front"}, + "south": {"uv": [12, 8, 13, 9], "texture": "#front"}, + "west": {"uv": [12, 8, 13, 9], "texture": "#front"}, + "up": {"uv": [12, 8, 13, 9], "texture": "#front"}, + "down": {"uv": [12, 8, 13, 9], "texture": "#front"} + } + }, + { + "from": [12, 7, 1], + "to": [13, 8, 2], + "faces": { + "north": {"uv": [3, 8, 4, 9], "texture": "#front"}, + "east": {"uv": [3, 8, 4, 9], "texture": "#front"}, + "south": {"uv": [3, 8, 4, 9], "texture": "#front"}, + "west": {"uv": [3, 8, 4, 9], "texture": "#front"}, + "up": {"uv": [3, 8, 4, 9], "texture": "#front"}, + "down": {"uv": [3, 8, 4, 9], "texture": "#front"} + } + }, + { + "from": [4, 10, 0.5], + "to": [6, 11, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 10, 1]}, + "faces": { + "north": {"uv": [10, 5, 12, 6], "texture": "#front"}, + "east": {"uv": [10, 5, 11, 6], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#front"}, + "west": {"uv": [11, 5, 12, 6], "texture": "#front"}, + "up": {"uv": [10, 2, 12, 3], "rotation": 180, "texture": "#front"}, + "down": {"uv": [10, 5, 12, 6], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [4, 13, 0.5], + "to": [6, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 13, 1]}, + "faces": { + "north": {"uv": [10, 2, 12, 3], "texture": "#front"}, + "east": {"uv": [10, 2, 11, 3], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#front"}, + "west": {"uv": [11, 2, 12, 3], "texture": "#front"}, + "up": {"uv": [10, 2, 12, 3], "rotation": 180, "texture": "#front"}, + "down": {"uv": [9, 4, 10, 5], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [3, 11, 0.5], + "to": [4, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 12, 1]}, + "faces": { + "north": {"uv": [12, 3, 13, 5], "texture": "#front"}, + "east": {"uv": [9, 3, 10, 5], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#front"}, + "west": {"uv": [12, 3, 13, 5], "texture": "#front"}, + "up": {"uv": [12, 3, 13, 4], "rotation": 180, "texture": "#front"}, + "down": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [6, 11, 0.5], + "to": [7, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 12, 1]}, + "faces": { + "north": {"uv": [9, 3, 10, 5], "texture": "#front"}, + "east": {"uv": [9, 3, 10, 5], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#front"}, + "west": {"uv": [0, 0, 0.5, 2], "texture": "#front"}, + "up": {"uv": [9, 3, 10, 4], "rotation": 180, "texture": "#front"}, + "down": {"uv": [9, 4, 10, 5], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [4, 11, 0], + "to": [6, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 19, 8]}, + "faces": { + "north": {"uv": [10, 3, 12, 5], "texture": "#front"}, + "east": {"uv": [10, 3, 11, 5], "texture": "#front"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#front"}, + "west": {"uv": [11, 3, 12, 5], "texture": "#front"}, + "up": {"uv": [10, 3, 12, 4], "texture": "#front"}, + "down": {"uv": [10, 4, 12, 5], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [5, 5, 1.5], + "to": [6, 6, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 13, 9]}, + "faces": { + "north": {"uv": [10, 10, 11, 11], "texture": "#front"}, + "east": {"uv": [10, 10, 11, 11], "texture": "#front"}, + "south": {"uv": [10, 10, 11, 11], "texture": "#front"}, + "west": {"uv": [10, 10, 11, 11], "texture": "#front"}, + "up": {"uv": [10, 10, 11, 11], "texture": "#front"}, + "down": {"uv": [10, 10, 11, 11], "texture": "#front"} + } + }, + { + "from": [6, 4, 1.5], + "to": [7, 5, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 9]}, + "faces": { + "north": {"uv": [9, 11, 10, 12], "texture": "#front"}, + "east": {"uv": [9, 11, 10, 12], "texture": "#front"}, + "south": {"uv": [9, 11, 10, 12], "texture": "#front"}, + "west": {"uv": [9, 11, 10, 12], "texture": "#front"}, + "up": {"uv": [9, 11, 10, 12], "texture": "#front"}, + "down": {"uv": [9, 11, 10, 12], "texture": "#front"} + } + }, + { + "from": [10, 5, 1.5], + "to": [11, 6, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 13, 9]}, + "faces": { + "north": {"uv": [5, 10, 6, 11], "texture": "#front"}, + "east": {"uv": [5, 10, 6, 11], "texture": "#front"}, + "south": {"uv": [5, 10, 6, 11], "texture": "#front"}, + "west": {"uv": [5, 10, 6, 11], "texture": "#front"}, + "up": {"uv": [5, 10, 6, 11], "texture": "#front"}, + "down": {"uv": [5, 10, 6, 11], "texture": "#front"} + } + }, + { + "from": [9, 6, 1.5], + "to": [10, 7, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 14, 9]}, + "faces": { + "north": {"uv": [6, 9, 7, 10], "texture": "#front"}, + "east": {"uv": [6, 9, 7, 10], "texture": "#front"}, + "south": {"uv": [6, 9, 7, 10], "texture": "#front"}, + "west": {"uv": [6, 9, 7, 10], "texture": "#front"}, + "up": {"uv": [6, 9, 7, 10], "texture": "#front"}, + "down": {"uv": [6, 9, 7, 10], "texture": "#front"} + } + }, + { + "from": [4, 3, 1.5], + "to": [12, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 11, 9]}, + "faces": { + "north": {"uv": [4, 12, 12, 13], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#front"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#front"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#front"}, + "down": {"uv": [4, 8, 12, 9], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [4, 7, 1.5], + "to": [12, 8, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 15, 9]}, + "faces": { + "north": {"uv": [4, 8, 12, 9], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#front"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#front"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#front"}, + "down": {"uv": [4, 8, 12, 9], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [3, 4, 1.5], + "to": [4, 7, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 9]}, + "faces": { + "north": {"uv": [12, 9, 13, 12], "texture": "#front"}, + "east": {"uv": [12, 9, 13, 12], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#front"}, + "west": {"uv": [3, 8, 4, 13], "texture": "#front"}, + "up": {"uv": [3, 9, 4, 10], "texture": "#front"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#front"} + } + }, + { + "from": [12, 4, 1.5], + "to": [13, 7, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 11, 9]}, + "faces": { + "north": {"uv": [3, 9, 4, 12], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 5], "texture": "#front"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#front"}, + "west": {"uv": [3, 9, 4, 12], "texture": "#front"}, + "up": {"uv": [3, 9, 4, 10], "texture": "#front"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#front"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [5, 14, 6], + "to": [11, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 15]}, + "faces": { + "north": {"uv": [5, 6, 11, 7], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "south": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "west": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "up": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "down": {"uv": [5, 6, 11, 7], "texture": "#top"} + } + }, + { + "from": [5, 14, 8], + "to": [11, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 17]}, + "faces": { + "north": {"uv": [5, 8, 11, 9], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "south": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "west": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "up": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "down": {"uv": [5, 8, 11, 9], "texture": "#top"} + } + }, + { + "from": [5, 14, 10], + "to": [11, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 19]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 10, 11, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [5, 14, 2], + "to": [11, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 10]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 2, 11, 5], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [11, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [5, 15, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [2, 2, 5, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 0, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#side"}, + "east": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#side"}, + "west": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [3, 8, 1], + "to": [13, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 20, 9]}, + "faces": { + "north": {"uv": [3, 1, 13, 8], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [3, 1, 13, 2], "texture": "#top"}, + "down": {"uv": [3, 7, 13, 8], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [3, 0, 1], + "to": [13, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 9]}, + "faces": { + "north": {"uv": [3, 13, 13, 16], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [3, 13, 13, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [3, 1, 13, 2], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [3, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-4, 8, 8]}, + "faces": { + "north": {"uv": [13, 1, 15, 16], "texture": "#front"}, + "east": {"uv": [13, 1, 14, 16], "texture": "#front"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [1, 1, 2, 16], "texture": "#side"}, + "up": {"uv": [1, 1, 3, 2], "texture": "#top"}, + "down": {"uv": [13, 1, 15, 2], "texture": "#base"} + } + }, + { + "from": [13, 0, 1], + "to": [15, 15, 2], + "faces": { + "north": {"uv": [1, 1, 3, 16], "texture": "#front"}, + "east": {"uv": [14, 1, 15, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [2, 1, 3, 16], "texture": "#front"}, + "up": {"uv": [13, 1, 15, 2], "texture": "#top"}, + "down": {"uv": [1, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [5, 13, 5], + "to": [11, 14, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, 15]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [2, 2, 8, 7], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + }, + { + "from": [2, 3, 2], + "to": [14, 8, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [4, 4, 16, 16], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + }, + { + "from": [0, 0, 15], + "to": [1, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 23]}, + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [15, 0, 15], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 23]}, + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 1], + "faces": { + "north": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "east": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "south": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "west": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "up": {"uv": [2, 1, 3, 2], "texture": "#base"}, + "down": {"uv": [2, 1, 3, 2], "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json new file mode 100644 index 000000000..29c89c43f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/ore_black_quartz_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_booster_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_booster_block.json new file mode 100644 index 000000000..8df6a7603 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/phantom_booster_block.json @@ -0,0 +1,595 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "actuallyadditions:block/models/model_phantom_booster", + "base": "actuallyadditions:block/models/model_phantom_booster" + }, + "elements": [ + { + "from": [6, 0, 6], + "to": [10, 16, 10], + "faces": { + "north": {"uv": [0, 0, 4, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#base"}, + "south": {"uv": [0, 0, 4, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 4, 16], "texture": "#base"}, + "up": {"uv": [4, 12, 8, 16], "texture": "#base"}, + "down": {"uv": [4, 12, 8, 16], "texture": "#base"} + } + }, + { + "from": [5, 2, 5], + "to": [11, 3, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [10, 0, 16, 6], "texture": "#base"}, + "down": {"uv": [10, 0, 16, 6], "texture": "#base"} + } + }, + { + "from": [5, 4, 12], + "to": [11, 5, 13], + "faces": { + "north": {"uv": [14, 10, 15, 16], "rotation": 270, "texture": "#base"}, + "east": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "south": {"uv": [14, 10, 15, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "up": {"uv": [14, 10, 15, 16], "rotation": 90, "texture": "#base"}, + "down": {"uv": [14, 10, 15, 16], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [5, 6, 12], + "to": [11, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [13, 10, 14, 16], "rotation": 270, "texture": "#base"}, + "east": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "south": {"uv": [13, 10, 14, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "up": {"uv": [13, 10, 14, 16], "rotation": 90, "texture": "#base"}, + "down": {"uv": [13, 10, 14, 16], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [5, 8, 12], + "to": [11, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [12, 10, 13, 16], "rotation": 270, "texture": "#base"}, + "east": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "south": {"uv": [12, 10, 13, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "up": {"uv": [12, 10, 13, 16], "rotation": 90, "texture": "#base"}, + "down": {"uv": [12, 10, 13, 16], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [5, 10, 12], + "to": [11, 11, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [11, 10, 12, 16], "rotation": 270, "texture": "#base"}, + "east": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "south": {"uv": [11, 10, 12, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "up": {"uv": [11, 10, 12, 16], "rotation": 90, "texture": "#base"}, + "down": {"uv": [11, 10, 12, 16], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [5, 12, 12], + "to": [11, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [10, 10, 11, 16], "rotation": 270, "texture": "#base"}, + "east": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "south": {"uv": [10, 10, 11, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "up": {"uv": [10, 10, 11, 16], "rotation": 90, "texture": "#base"}, + "down": {"uv": [10, 10, 11, 16], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [5, 4, 3], + "to": [11, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 4.5, 5.66667]}, + "faces": { + "north": {"uv": [14, 10, 15, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "south": {"uv": [14, 10, 15, 16], "rotation": 270, "texture": "#base"}, + "west": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "up": {"uv": [14, 10, 15, 16], "rotation": 270, "texture": "#base"}, + "down": {"uv": [14, 10, 15, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [5, 6, 3], + "to": [11, 7, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 6.5, 5.66667]}, + "faces": { + "north": {"uv": [13, 10, 14, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "south": {"uv": [13, 10, 14, 16], "rotation": 270, "texture": "#base"}, + "west": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "up": {"uv": [13, 10, 14, 16], "rotation": 270, "texture": "#base"}, + "down": {"uv": [13, 10, 14, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [5, 8, 3], + "to": [11, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 8.5, 5.66667]}, + "faces": { + "north": {"uv": [12, 10, 13, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "south": {"uv": [12, 10, 13, 16], "rotation": 270, "texture": "#base"}, + "west": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "up": {"uv": [12, 10, 13, 16], "rotation": 270, "texture": "#base"}, + "down": {"uv": [12, 10, 13, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [5, 10, 3], + "to": [11, 11, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 10.5, 5.66667]}, + "faces": { + "north": {"uv": [11, 10, 12, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "south": {"uv": [11, 10, 12, 16], "rotation": 270, "texture": "#base"}, + "west": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "up": {"uv": [11, 10, 12, 16], "rotation": 270, "texture": "#base"}, + "down": {"uv": [11, 10, 12, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [5, 12, 3], + "to": [11, 13, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 12.5, 5.66667]}, + "faces": { + "north": {"uv": [10, 10, 11, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "south": {"uv": [10, 10, 11, 16], "rotation": 270, "texture": "#base"}, + "west": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "up": {"uv": [10, 10, 11, 16], "rotation": 270, "texture": "#base"}, + "down": {"uv": [10, 10, 11, 16], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [3, 4, 5], + "to": [4, 5, 11], + "faces": { + "north": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [14, 10, 15, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "west": {"uv": [14, 10, 15, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [14, 10, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [14, 10, 15, 16], "texture": "#base"} + } + }, + { + "from": [3, 6, 5], + "to": [4, 7, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [13, 10, 14, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "west": {"uv": [13, 10, 14, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [13, 10, 14, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [13, 10, 14, 16], "texture": "#base"} + } + }, + { + "from": [3, 8, 5], + "to": [4, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [12, 10, 13, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "west": {"uv": [12, 10, 13, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [12, 10, 13, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [12, 10, 13, 16], "texture": "#base"} + } + }, + { + "from": [3, 10, 5], + "to": [4, 11, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [11, 10, 12, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "west": {"uv": [11, 10, 12, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [11, 10, 12, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [11, 10, 12, 16], "texture": "#base"} + } + }, + { + "from": [3, 12, 5], + "to": [4, 13, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [10, 10, 11, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "west": {"uv": [10, 10, 11, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [10, 10, 11, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [10, 10, 11, 16], "texture": "#base"} + } + }, + { + "from": [12, 4, 5], + "to": [13, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 4.5, 8]}, + "faces": { + "north": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "east": {"uv": [14, 10, 15, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [14, 10, 15, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [14, 10, 15, 16], "texture": "#base"}, + "down": {"uv": [14, 10, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [12, 6, 5], + "to": [13, 7, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 6.5, 8]}, + "faces": { + "north": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "east": {"uv": [13, 10, 14, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [13, 10, 14, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [13, 10, 14, 16], "texture": "#base"}, + "down": {"uv": [13, 10, 14, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [12, 8, 5], + "to": [13, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8.5, 8]}, + "faces": { + "north": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "east": {"uv": [12, 10, 13, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [12, 10, 13, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [12, 10, 13, 16], "texture": "#base"}, + "down": {"uv": [12, 10, 13, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [12, 10, 5], + "to": [13, 11, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10.5, 8]}, + "faces": { + "north": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "east": {"uv": [11, 10, 12, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [11, 10, 12, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [11, 10, 12, 16], "texture": "#base"}, + "down": {"uv": [11, 10, 12, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [12, 12, 5], + "to": [13, 13, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 12.5, 8]}, + "faces": { + "north": {"uv": [14, 10, 15, 11], "texture": "#base"}, + "east": {"uv": [10, 10, 11, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [14, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [10, 10, 11, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [10, 10, 11, 16], "texture": "#base"}, + "down": {"uv": [10, 10, 11, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [5, 14, 5], + "to": [11, 15, 11], + "faces": { + "north": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [10, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [10, 0, 16, 6], "texture": "#base"}, + "down": {"uv": [10, 0, 16, 6], "texture": "#base"} + } + }, + { + "from": [4, 4, 11], + "to": [5, 5, 12], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 6, 11], + "to": [5, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 8, 11], + "to": [5, 9, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 10, 11], + "to": [5, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 12, 11], + "to": [5, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 4, 4], + "to": [5, 5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 6, 4], + "to": [5, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 1]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 8, 4], + "to": [5, 9, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 1]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 10, 4], + "to": [5, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 1]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [4, 12, 4], + "to": [5, 13, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 1]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [11, 4, 4], + "to": [12, 5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 4.5, 5.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 6, 4], + "to": [12, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 6.5, 5.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 8, 4], + "to": [12, 9, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 8.5, 5.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 10, 4], + "to": [12, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 10.5, 5.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 12, 4], + "to": [12, 13, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 12.5, 5.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 4, 11], + "to": [12, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 4.5, 12.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 6, 11], + "to": [12, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 6.5, 12.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 8, 11], + "to": [12, 9, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 8.5, 12.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 10, 11], + "to": [12, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 10.5, 12.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [11, 12, 11], + "to": [12, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10.33333, 12.5, 12.66667]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "up": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + } + ], + "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/phantom_breaker_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json new file mode 100644 index 000000000..19a98eeea --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json @@ -0,0 +1,648 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/enderpearl_block", + "base": "actuallyadditions:block/enderpearl_block", + "frame": "actuallyadditions:block/crystal_diamatine_block", + "breaker": "actuallyadditions:block/phantomface_breaker" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#frame"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#frame"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#frame"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#frame"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#frame"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [5, 5, 0], + "to": [11, 11, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 13, 8]}, + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "east": {"uv": [5, 5, 6, 11], "texture": "#breaker"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "west": {"uv": [10, 5, 11, 11], "texture": "#breaker"}, + "up": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#breaker"}, + "down": {"uv": [5, 10, 11, 11], "rotation": 180, "texture": "#breaker"} + } + }, + { + "from": [15, 5, 5], + "to": [16, 11, 11], + "faces": { + "north": {"uv": [10, 5, 11, 11], "texture": "#breaker"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "south": {"uv": [5, 5, 6, 11], "texture": "#breaker"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "up": {"uv": [5, 5, 11, 6], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [5, 10, 11, 11], "rotation": 90, "texture": "#breaker"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [5, 10, 11, 11], "texture": "#breaker"}, + "south": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#breaker"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [5, 5, 15], + "to": [11, 11, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 13, 23]}, + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "east": {"uv": [10, 5, 11, 11], "texture": "#breaker"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "west": {"uv": [5, 5, 6, 11], "texture": "#breaker"}, + "up": {"uv": [5, 5, 11, 6], "texture": "#breaker"}, + "down": {"uv": [5, 10, 11, 11], "texture": "#breaker"} + } + }, + { + "from": [0, 5, 5], + "to": [1, 11, 11], + "faces": { + "north": {"uv": [5, 5, 6, 11], "texture": "#breaker"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "south": {"uv": [10, 5, 11, 11], "texture": "#breaker"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#breaker"}, + "up": {"uv": [5, 5, 11, 6], "rotation": 90, "texture": "#breaker"}, + "down": {"uv": [5, 10, 11, 11], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 1, 11], + "faces": { + "north": {"uv": [5, 5, 6, 11], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [5, 10, 11, 11], "rotation": 180, "texture": "#breaker"}, + "south": {"uv": [10, 5, 11, 11], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [5, 5, 11, 6], "texture": "#breaker"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [6, 3, 0], + "to": [10, 5, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 12, 8]}, + "faces": { + "north": {"uv": [6, 11, 10, 13], "texture": "#breaker"}, + "east": {"uv": [6, 11, 7, 13], "texture": "#breaker"}, + "south": {"uv": [0, 0, 4, 2], "texture": "#breaker"}, + "west": {"uv": [9, 11, 10, 13], "texture": "#breaker"}, + "up": {"uv": [0, 0, 4, 1], "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#breaker"} + } + }, + { + "from": [15, 3, 6], + "to": [16, 5, 10], + "faces": { + "north": {"uv": [9, 11, 10, 13], "texture": "#breaker"}, + "east": {"uv": [6, 11, 10, 13], "texture": "#breaker"}, + "south": {"uv": [6, 11, 7, 13], "texture": "#breaker"}, + "west": {"uv": [0, 0, 4, 2], "texture": "#breaker"}, + "up": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 90, "texture": "#breaker"} + } + }, + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [9, 11, 10, 13], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [6, 12, 10, 13], "texture": "#breaker"}, + "south": {"uv": [6, 11, 7, 13], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [0, 0, 4, 1], "texture": "#breaker"}, + "up": {"uv": [6, 11, 10, 13], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [6, 3, 15], + "to": [10, 5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 12, 23]}, + "faces": { + "north": {"uv": [6, 11, 10, 13], "texture": "#breaker"}, + "east": {"uv": [9, 11, 10, 13], "texture": "#breaker"}, + "south": {"uv": [6, 11, 10, 13], "texture": "#breaker"}, + "west": {"uv": [6, 11, 7, 13], "texture": "#breaker"}, + "up": {"uv": [0, 0, 4, 1], "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "texture": "#breaker"} + } + }, + { + "from": [0, 3, 6], + "to": [1, 5, 10], + "faces": { + "north": {"uv": [6, 11, 7, 13], "texture": "#breaker"}, + "east": {"uv": [6, 11, 10, 13], "texture": "#breaker"}, + "south": {"uv": [9, 11, 10, 13], "texture": "#breaker"}, + "west": {"uv": [6, 11, 10, 13], "texture": "#breaker"}, + "up": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [11, 0, 6], + "to": [13, 1, 10], + "faces": { + "north": {"uv": [6, 11, 7, 13], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#breaker"}, + "south": {"uv": [9, 11, 10, 13], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [0, 0, 4, 1], "texture": "#breaker"}, + "up": {"uv": [6, 11, 10, 13], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [6, 11, 10, 13], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [6, 11, 0], + "to": [10, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 20, 8]}, + "faces": { + "north": {"uv": [6, 3, 10, 5], "texture": "#breaker"}, + "east": {"uv": [6, 3, 7, 5], "texture": "#breaker"}, + "south": {"uv": [0, 0, 4, 2], "texture": "#breaker"}, + "west": {"uv": [9, 3, 10, 5], "texture": "#breaker"}, + "up": {"uv": [6, 3, 10, 4], "rotation": 180, "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#breaker"} + } + }, + { + "from": [15, 11, 6], + "to": [16, 13, 10], + "faces": { + "north": {"uv": [9, 3, 10, 5], "texture": "#breaker"}, + "east": {"uv": [6, 3, 10, 5], "texture": "#breaker"}, + "south": {"uv": [6, 3, 7, 5], "texture": "#breaker"}, + "west": {"uv": [0, 0, 4, 2], "texture": "#breaker"}, + "up": {"uv": [6, 3, 10, 4], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 90, "texture": "#breaker"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [9, 3, 10, 5], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [6, 12, 10, 13], "texture": "#breaker"}, + "south": {"uv": [6, 3, 7, 5], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [6, 3, 10, 4], "rotation": 180, "texture": "#breaker"}, + "up": {"uv": [6, 3, 10, 5], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [6, 11, 15], + "to": [10, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 20, 23]}, + "faces": { + "north": {"uv": [6, 3, 10, 5], "texture": "#breaker"}, + "east": {"uv": [9, 3, 10, 5], "texture": "#breaker"}, + "south": {"uv": [6, 3, 10, 5], "texture": "#breaker"}, + "west": {"uv": [6, 3, 7, 5], "texture": "#breaker"}, + "up": {"uv": [6, 3, 10, 4], "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#breaker"} + } + }, + { + "from": [0, 11, 6], + "to": [1, 13, 10], + "faces": { + "north": {"uv": [6, 3, 7, 5], "texture": "#breaker"}, + "east": {"uv": [6, 3, 10, 5], "texture": "#breaker"}, + "south": {"uv": [9, 3, 10, 5], "texture": "#breaker"}, + "west": {"uv": [6, 3, 10, 5], "texture": "#breaker"}, + "up": {"uv": [6, 3, 10, 4], "rotation": 90, "texture": "#breaker"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 90, "texture": "#breaker"} + } + }, + { + "from": [3, 0, 6], + "to": [5, 1, 10], + "faces": { + "north": {"uv": [6, 3, 7, 5], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [6, 12, 10, 13], "texture": "#breaker"}, + "south": {"uv": [9, 3, 10, 5], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [6, 3, 10, 4], "texture": "#breaker"}, + "up": {"uv": [6, 3, 10, 5], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [6, 3, 10, 5], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [3, 6, 0], + "to": [5, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 8]}, + "faces": { + "north": {"uv": [11, 6, 13, 10], "texture": "#breaker"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#breaker"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#breaker"}, + "west": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "up": {"uv": [11, 6, 13, 7], "rotation": 180, "texture": "#breaker"}, + "down": {"uv": [11, 9, 13, 10], "rotation": 180, "texture": "#breaker"} + } + }, + { + "from": [15, 6, 3], + "to": [16, 10, 5], + "faces": { + "north": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "east": {"uv": [11, 6, 13, 10], "texture": "#breaker"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#breaker"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#breaker"}, + "up": {"uv": [11, 6, 13, 7], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [11, 9, 13, 10], "rotation": 90, "texture": "#breaker"} + } + }, + { + "from": [6, 15, 3], + "to": [10, 16, 5], + "faces": { + "north": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [11, 9, 13, 10], "texture": "#breaker"}, + "south": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [11, 6, 13, 7], "rotation": 180, "texture": "#breaker"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [0, 0, 2, 4], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [3, 6, 15], + "to": [5, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 23]}, + "faces": { + "north": {"uv": [11, 6, 13, 10], "texture": "#breaker"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#breaker"}, + "south": {"uv": [3, 6, 5, 10], "texture": "#breaker"}, + "west": {"uv": [3, 6, 4, 10], "texture": "#breaker"}, + "up": {"uv": [3, 6, 5, 7], "texture": "#breaker"}, + "down": {"uv": [3, 9, 5, 10], "texture": "#breaker"} + } + }, + { + "from": [0, 6, 3], + "to": [1, 10, 5], + "faces": { + "north": {"uv": [3, 6, 4, 10], "texture": "#breaker"}, + "east": {"uv": [11, 6, 13, 10], "texture": "#breaker"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#breaker"}, + "west": {"uv": [3, 6, 5, 10], "texture": "#breaker"}, + "up": {"uv": [3, 6, 5, 7], "rotation": 90, "texture": "#breaker"}, + "down": {"uv": [3, 9, 5, 10], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [6, 0, 3], + "to": [10, 1, 5], + "faces": { + "north": {"uv": [3, 6, 4, 10], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [3, 9, 5, 10], "rotation": 180, "texture": "#breaker"}, + "south": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [3, 6, 5, 7], "texture": "#breaker"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [3, 6, 5, 10], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [11, 6, 0], + "to": [13, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, 8]}, + "faces": { + "north": {"uv": [3, 6, 5, 10], "texture": "#breaker"}, + "east": {"uv": [3, 6, 4, 10], "texture": "#breaker"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#breaker"}, + "west": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "up": {"uv": [3, 6, 5, 7], "rotation": 180, "texture": "#breaker"}, + "down": {"uv": [3, 9, 5, 10], "rotation": 180, "texture": "#breaker"} + } + }, + { + "from": [15, 6, 11], + "to": [16, 10, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "east": {"uv": [3, 6, 5, 10], "texture": "#breaker"}, + "south": {"uv": [3, 6, 4, 10], "texture": "#breaker"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#breaker"}, + "up": {"uv": [3, 6, 5, 7], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [3, 9, 5, 10], "rotation": 90, "texture": "#breaker"} + } + }, + { + "from": [6, 15, 11], + "to": [10, 16, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [3, 9, 5, 10], "texture": "#breaker"}, + "south": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [3, 6, 5, 7], "rotation": 180, "texture": "#breaker"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [0, 0, 2, 4], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [11, 6, 15], + "to": [13, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, 23]}, + "faces": { + "north": {"uv": [3, 6, 5, 10], "texture": "#breaker"}, + "east": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "south": {"uv": [11, 6, 13, 10], "texture": "#breaker"}, + "west": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "up": {"uv": [11, 6, 13, 7], "texture": "#breaker"}, + "down": {"uv": [11, 9, 13, 10], "texture": "#breaker"} + } + }, + { + "from": [0, 6, 11], + "to": [1, 10, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "east": {"uv": [3, 6, 5, 10], "texture": "#breaker"}, + "south": {"uv": [12, 6, 13, 10], "texture": "#breaker"}, + "west": {"uv": [11, 6, 13, 10], "texture": "#breaker"}, + "up": {"uv": [11, 6, 13, 7], "rotation": 90, "texture": "#breaker"}, + "down": {"uv": [11, 9, 13, 10], "rotation": 270, "texture": "#breaker"} + } + }, + { + "from": [6, 0, 11], + "to": [10, 1, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#breaker"}, + "east": {"uv": [11, 9, 13, 10], "rotation": 180, "texture": "#breaker"}, + "south": {"uv": [12, 6, 13, 10], "rotation": 270, "texture": "#breaker"}, + "west": {"uv": [11, 6, 13, 7], "texture": "#breaker"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 270, "texture": "#breaker"}, + "down": {"uv": [11, 6, 13, 10], "rotation": 270, "texture": "#breaker"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json new file mode 100644 index 000000000..0fe11a221 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json @@ -0,0 +1,352 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "frame": "actuallyadditions:block/crystal_diamatine_block", + "particle": "actuallyadditions:block/enderpearl_block", + "base": "actuallyadditions:block/enderpearl_block", + "energy": "actuallyadditions:block/phantomface_energy" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#frame"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#frame"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#frame"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#frame"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#frame"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [3, 3, 0], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#energy"}, + "east": {"uv": [3, 3, 4, 13], "texture": "#energy"}, + "south": {"uv": [0, 0, 10, 10], "texture": "#energy"}, + "west": {"uv": [12, 3, 13, 13], "texture": "#energy"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#energy"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#energy"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 13, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "texture": "#energy"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#energy"}, + "south": {"uv": [12, 3, 13, 13], "texture": "#energy"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#energy"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#energy"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#energy"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 1, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "rotation": 90, "texture": "#energy"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#energy"}, + "south": {"uv": [12, 3, 13, 13], "rotation": 270, "texture": "#energy"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#energy"}, + "up": {"uv": [0, 0, 10, 10], "rotation": 270, "texture": "#energy"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#energy"} + } + }, + { + "from": [3, 3, 15], + "to": [13, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 23]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#energy"}, + "east": {"uv": [12, 3, 13, 13], "texture": "#energy"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#energy"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#energy"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#energy"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#energy"} + } + }, + { + "from": [15, 3, 3], + "to": [16, 13, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "texture": "#energy"}, + "east": {"uv": [3, 3, 13, 13], "texture": "#energy"}, + "south": {"uv": [3, 3, 4, 13], "texture": "#energy"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#energy"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#energy"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#energy"} + } + }, + { + "from": [3, 15, 3], + "to": [13, 16, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "rotation": 90, "texture": "#energy"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#energy"}, + "south": {"uv": [3, 3, 4, 13], "rotation": 270, "texture": "#energy"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#energy"}, + "up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#energy"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#energy"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json new file mode 100644 index 000000000..80ec6aae6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json @@ -0,0 +1,352 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "frame": "actuallyadditions:block/crystal_diamatine_block", + "particle": "actuallyadditions:block/enderpearl_block", + "base": "actuallyadditions:block/enderpearl_block", + "liquid": "actuallyadditions:block/phantomface_liquid" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#frame"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#frame"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#frame"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#frame"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#frame"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [3, 3, 0], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#liquid"}, + "east": {"uv": [3, 3, 4, 13], "texture": "#liquid"}, + "south": {"uv": [0, 0, 10, 10], "texture": "#liquid"}, + "west": {"uv": [12, 3, 13, 13], "texture": "#liquid"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#liquid"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#liquid"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 13, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "texture": "#liquid"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#liquid"}, + "south": {"uv": [12, 3, 13, 13], "texture": "#liquid"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#liquid"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#liquid"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#liquid"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 1, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "rotation": 90, "texture": "#liquid"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#liquid"}, + "south": {"uv": [12, 3, 13, 13], "rotation": 270, "texture": "#liquid"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#liquid"}, + "up": {"uv": [0, 0, 10, 10], "rotation": 270, "texture": "#liquid"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#liquid"} + } + }, + { + "from": [3, 3, 15], + "to": [13, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 23]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#liquid"}, + "east": {"uv": [12, 3, 13, 13], "texture": "#liquid"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#liquid"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#liquid"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#liquid"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#liquid"} + } + }, + { + "from": [15, 3, 3], + "to": [16, 13, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "texture": "#liquid"}, + "east": {"uv": [3, 3, 13, 13], "texture": "#liquid"}, + "south": {"uv": [3, 3, 4, 13], "texture": "#liquid"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#liquid"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#liquid"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#liquid"} + } + }, + { + "from": [3, 15, 3], + "to": [13, 16, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "rotation": 90, "texture": "#liquid"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#liquid"}, + "south": {"uv": [3, 3, 4, 13], "rotation": 270, "texture": "#liquid"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#liquid"}, + "up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#liquid"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#liquid"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_placer_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_placer_block.json new file mode 100644 index 000000000..408766cdb --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/phantom_placer_block.json @@ -0,0 +1,648 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/enderpearl_block", + "base": "actuallyadditions:block/enderpearl_block", + "frame": "actuallyadditions:block/crystal_diamatine_block", + "placer": "actuallyadditions:block/phantomface_placer" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#frame"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#frame"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#frame"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#frame"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#frame"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [5, 5, 0], + "to": [11, 11, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 13, 8]}, + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "east": {"uv": [5, 5, 6, 11], "texture": "#placer"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "west": {"uv": [10, 5, 11, 11], "texture": "#placer"}, + "up": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#placer"}, + "down": {"uv": [5, 10, 11, 11], "rotation": 180, "texture": "#placer"} + } + }, + { + "from": [15, 5, 5], + "to": [16, 11, 11], + "faces": { + "north": {"uv": [10, 5, 11, 11], "texture": "#placer"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "south": {"uv": [5, 5, 6, 11], "texture": "#placer"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "up": {"uv": [5, 5, 11, 6], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [5, 10, 11, 11], "rotation": 90, "texture": "#placer"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [5, 10, 11, 11], "texture": "#placer"}, + "south": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#placer"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [5, 5, 15], + "to": [11, 11, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 13, 23]}, + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "east": {"uv": [10, 5, 11, 11], "texture": "#placer"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "west": {"uv": [5, 5, 6, 11], "texture": "#placer"}, + "up": {"uv": [5, 5, 11, 6], "texture": "#placer"}, + "down": {"uv": [5, 10, 11, 11], "texture": "#placer"} + } + }, + { + "from": [0, 5, 5], + "to": [1, 11, 11], + "faces": { + "north": {"uv": [5, 5, 6, 11], "texture": "#placer"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "south": {"uv": [10, 5, 11, 11], "texture": "#placer"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#placer"}, + "up": {"uv": [5, 5, 11, 6], "rotation": 90, "texture": "#placer"}, + "down": {"uv": [5, 10, 11, 11], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 1, 11], + "faces": { + "north": {"uv": [5, 5, 6, 11], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [5, 10, 11, 11], "rotation": 180, "texture": "#placer"}, + "south": {"uv": [10, 5, 11, 11], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [5, 5, 11, 6], "texture": "#placer"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [5, 5, 11, 11], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [6, 3, 0], + "to": [10, 5, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 12, 8]}, + "faces": { + "north": {"uv": [6, 11, 10, 13], "texture": "#placer"}, + "east": {"uv": [6, 11, 7, 13], "texture": "#placer"}, + "south": {"uv": [0, 0, 4, 2], "texture": "#placer"}, + "west": {"uv": [9, 11, 10, 13], "texture": "#placer"}, + "up": {"uv": [0, 0, 4, 1], "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#placer"} + } + }, + { + "from": [15, 3, 6], + "to": [16, 5, 10], + "faces": { + "north": {"uv": [9, 11, 10, 13], "texture": "#placer"}, + "east": {"uv": [6, 11, 10, 13], "texture": "#placer"}, + "south": {"uv": [6, 11, 7, 13], "texture": "#placer"}, + "west": {"uv": [0, 0, 4, 2], "texture": "#placer"}, + "up": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 90, "texture": "#placer"} + } + }, + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [9, 11, 10, 13], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [6, 12, 10, 13], "texture": "#placer"}, + "south": {"uv": [6, 11, 7, 13], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [0, 0, 4, 1], "texture": "#placer"}, + "up": {"uv": [6, 11, 10, 13], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [6, 3, 15], + "to": [10, 5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 12, 23]}, + "faces": { + "north": {"uv": [6, 11, 10, 13], "texture": "#placer"}, + "east": {"uv": [9, 11, 10, 13], "texture": "#placer"}, + "south": {"uv": [6, 11, 10, 13], "texture": "#placer"}, + "west": {"uv": [6, 11, 7, 13], "texture": "#placer"}, + "up": {"uv": [0, 0, 4, 1], "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "texture": "#placer"} + } + }, + { + "from": [0, 3, 6], + "to": [1, 5, 10], + "faces": { + "north": {"uv": [6, 11, 7, 13], "texture": "#placer"}, + "east": {"uv": [6, 11, 10, 13], "texture": "#placer"}, + "south": {"uv": [9, 11, 10, 13], "texture": "#placer"}, + "west": {"uv": [6, 11, 10, 13], "texture": "#placer"}, + "up": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [11, 0, 6], + "to": [13, 1, 10], + "faces": { + "north": {"uv": [6, 11, 7, 13], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#placer"}, + "south": {"uv": [9, 11, 10, 13], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [0, 0, 4, 1], "texture": "#placer"}, + "up": {"uv": [6, 11, 10, 13], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [6, 11, 10, 13], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [6, 11, 0], + "to": [10, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 20, 8]}, + "faces": { + "north": {"uv": [6, 3, 10, 5], "texture": "#placer"}, + "east": {"uv": [6, 3, 7, 5], "texture": "#placer"}, + "south": {"uv": [0, 0, 4, 2], "texture": "#placer"}, + "west": {"uv": [9, 3, 10, 5], "texture": "#placer"}, + "up": {"uv": [6, 3, 10, 4], "rotation": 180, "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#placer"} + } + }, + { + "from": [15, 11, 6], + "to": [16, 13, 10], + "faces": { + "north": {"uv": [9, 3, 10, 5], "texture": "#placer"}, + "east": {"uv": [6, 3, 10, 5], "texture": "#placer"}, + "south": {"uv": [6, 3, 7, 5], "texture": "#placer"}, + "west": {"uv": [0, 0, 4, 2], "texture": "#placer"}, + "up": {"uv": [6, 3, 10, 4], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 90, "texture": "#placer"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [9, 3, 10, 5], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [6, 12, 10, 13], "texture": "#placer"}, + "south": {"uv": [6, 3, 7, 5], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [6, 3, 10, 4], "rotation": 180, "texture": "#placer"}, + "up": {"uv": [6, 3, 10, 5], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [6, 11, 15], + "to": [10, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 20, 23]}, + "faces": { + "north": {"uv": [6, 3, 10, 5], "texture": "#placer"}, + "east": {"uv": [9, 3, 10, 5], "texture": "#placer"}, + "south": {"uv": [6, 3, 10, 5], "texture": "#placer"}, + "west": {"uv": [6, 3, 7, 5], "texture": "#placer"}, + "up": {"uv": [6, 3, 10, 4], "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 180, "texture": "#placer"} + } + }, + { + "from": [0, 11, 6], + "to": [1, 13, 10], + "faces": { + "north": {"uv": [6, 3, 7, 5], "texture": "#placer"}, + "east": {"uv": [6, 3, 10, 5], "texture": "#placer"}, + "south": {"uv": [9, 3, 10, 5], "texture": "#placer"}, + "west": {"uv": [6, 3, 10, 5], "texture": "#placer"}, + "up": {"uv": [6, 3, 10, 4], "rotation": 90, "texture": "#placer"}, + "down": {"uv": [6, 12, 10, 13], "rotation": 90, "texture": "#placer"} + } + }, + { + "from": [3, 0, 6], + "to": [5, 1, 10], + "faces": { + "north": {"uv": [6, 3, 7, 5], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [6, 12, 10, 13], "texture": "#placer"}, + "south": {"uv": [9, 3, 10, 5], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [6, 3, 10, 4], "texture": "#placer"}, + "up": {"uv": [6, 3, 10, 5], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [6, 3, 10, 5], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [3, 6, 0], + "to": [5, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 8]}, + "faces": { + "north": {"uv": [11, 6, 13, 10], "texture": "#placer"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#placer"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#placer"}, + "west": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "up": {"uv": [11, 6, 13, 7], "rotation": 180, "texture": "#placer"}, + "down": {"uv": [11, 9, 13, 10], "rotation": 180, "texture": "#placer"} + } + }, + { + "from": [15, 6, 3], + "to": [16, 10, 5], + "faces": { + "north": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "east": {"uv": [11, 6, 13, 10], "texture": "#placer"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#placer"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#placer"}, + "up": {"uv": [11, 6, 13, 7], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [11, 9, 13, 10], "rotation": 90, "texture": "#placer"} + } + }, + { + "from": [6, 15, 3], + "to": [10, 16, 5], + "faces": { + "north": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [11, 9, 13, 10], "texture": "#placer"}, + "south": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [11, 6, 13, 7], "rotation": 180, "texture": "#placer"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [0, 0, 2, 4], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [3, 6, 15], + "to": [5, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 23]}, + "faces": { + "north": {"uv": [11, 6, 13, 10], "texture": "#placer"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#placer"}, + "south": {"uv": [3, 6, 5, 10], "texture": "#placer"}, + "west": {"uv": [3, 6, 4, 10], "texture": "#placer"}, + "up": {"uv": [3, 6, 5, 7], "texture": "#placer"}, + "down": {"uv": [3, 9, 5, 10], "texture": "#placer"} + } + }, + { + "from": [0, 6, 3], + "to": [1, 10, 5], + "faces": { + "north": {"uv": [3, 6, 4, 10], "texture": "#placer"}, + "east": {"uv": [11, 6, 13, 10], "texture": "#placer"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#placer"}, + "west": {"uv": [3, 6, 5, 10], "texture": "#placer"}, + "up": {"uv": [3, 6, 5, 7], "rotation": 90, "texture": "#placer"}, + "down": {"uv": [3, 9, 5, 10], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [6, 0, 3], + "to": [10, 1, 5], + "faces": { + "north": {"uv": [3, 6, 4, 10], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [3, 9, 5, 10], "rotation": 180, "texture": "#placer"}, + "south": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [3, 6, 5, 7], "texture": "#placer"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [3, 6, 5, 10], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [11, 6, 0], + "to": [13, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, 8]}, + "faces": { + "north": {"uv": [3, 6, 5, 10], "texture": "#placer"}, + "east": {"uv": [3, 6, 4, 10], "texture": "#placer"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#placer"}, + "west": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "up": {"uv": [3, 6, 5, 7], "rotation": 180, "texture": "#placer"}, + "down": {"uv": [3, 9, 5, 10], "rotation": 180, "texture": "#placer"} + } + }, + { + "from": [15, 6, 11], + "to": [16, 10, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "east": {"uv": [3, 6, 5, 10], "texture": "#placer"}, + "south": {"uv": [3, 6, 4, 10], "texture": "#placer"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#placer"}, + "up": {"uv": [3, 6, 5, 7], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [3, 9, 5, 10], "rotation": 90, "texture": "#placer"} + } + }, + { + "from": [6, 15, 11], + "to": [10, 16, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [3, 9, 5, 10], "texture": "#placer"}, + "south": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [3, 6, 5, 7], "rotation": 180, "texture": "#placer"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [0, 0, 2, 4], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [11, 6, 15], + "to": [13, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, 23]}, + "faces": { + "north": {"uv": [3, 6, 5, 10], "texture": "#placer"}, + "east": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "south": {"uv": [11, 6, 13, 10], "texture": "#placer"}, + "west": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "up": {"uv": [11, 6, 13, 7], "texture": "#placer"}, + "down": {"uv": [11, 9, 13, 10], "texture": "#placer"} + } + }, + { + "from": [0, 6, 11], + "to": [1, 10, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "east": {"uv": [3, 6, 5, 10], "texture": "#placer"}, + "south": {"uv": [12, 6, 13, 10], "texture": "#placer"}, + "west": {"uv": [11, 6, 13, 10], "texture": "#placer"}, + "up": {"uv": [11, 6, 13, 7], "rotation": 90, "texture": "#placer"}, + "down": {"uv": [11, 9, 13, 10], "rotation": 270, "texture": "#placer"} + } + }, + { + "from": [6, 0, 11], + "to": [10, 1, 13], + "faces": { + "north": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#placer"}, + "east": {"uv": [11, 9, 13, 10], "rotation": 180, "texture": "#placer"}, + "south": {"uv": [12, 6, 13, 10], "rotation": 270, "texture": "#placer"}, + "west": {"uv": [11, 6, 13, 7], "texture": "#placer"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 270, "texture": "#placer"}, + "down": {"uv": [11, 6, 13, 10], "rotation": 270, "texture": "#placer"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json new file mode 100644 index 000000000..38286d9d7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json @@ -0,0 +1,352 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/enderpearl_block", + "base": "actuallyadditions:block/enderpearl_block", + "frame": "actuallyadditions:block/crystal_diamatine_block", + "redstone": "actuallyadditions:block/phantomface_redstone" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#frame"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#frame"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#frame"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#frame"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#frame"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [3, 3, 0], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#redstone"}, + "east": {"uv": [3, 3, 4, 13], "texture": "#redstone"}, + "south": {"uv": [0, 0, 10, 10], "texture": "#redstone"}, + "west": {"uv": [12, 3, 13, 13], "texture": "#redstone"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#redstone"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#redstone"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 13, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "texture": "#redstone"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#redstone"}, + "south": {"uv": [12, 3, 13, 13], "texture": "#redstone"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#redstone"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#redstone"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 1, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "rotation": 90, "texture": "#redstone"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#redstone"}, + "south": {"uv": [12, 3, 13, 13], "rotation": 270, "texture": "#redstone"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [0, 0, 10, 10], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#redstone"} + } + }, + { + "from": [3, 3, 15], + "to": [13, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 23]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#redstone"}, + "east": {"uv": [12, 3, 13, 13], "texture": "#redstone"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#redstone"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#redstone"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#redstone"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#redstone"} + } + }, + { + "from": [15, 3, 3], + "to": [16, 13, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "texture": "#redstone"}, + "east": {"uv": [3, 3, 13, 13], "texture": "#redstone"}, + "south": {"uv": [3, 3, 4, 13], "texture": "#redstone"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#redstone"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#redstone"} + } + }, + { + "from": [3, 15, 3], + "to": [13, 16, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "rotation": 90, "texture": "#redstone"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#redstone"}, + "south": {"uv": [3, 3, 4, 13], "rotation": 270, "texture": "#redstone"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#redstone"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantomface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantomface_block.json new file mode 100644 index 000000000..cca8ab160 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/phantomface_block.json @@ -0,0 +1,352 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "frame": "actuallyadditions:block/crystal_diamatine_block", + "particle": "actuallyadditions:block/enderpearl_block", + "base": "actuallyadditions:block/enderpearl_block", + "standard": "actuallyadditions:block/phantomface_standard" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#frame"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#frame"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#frame"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 12]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#frame"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#frame"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#frame"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#frame"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#frame"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#frame"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#frame"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#frame"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#frame"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#frame"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#frame"} + } + }, + { + "from": [3, 3, 0], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#standard"}, + "east": {"uv": [3, 3, 4, 13], "texture": "#standard"}, + "south": {"uv": [0, 0, 10, 10], "texture": "#standard"}, + "west": {"uv": [12, 3, 13, 13], "texture": "#standard"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#standard"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#standard"} + } + }, + { + "from": [0, 3, 3], + "to": [1, 13, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "texture": "#standard"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#standard"}, + "south": {"uv": [12, 3, 13, 13], "texture": "#standard"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#standard"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#standard"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#standard"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 1, 13], + "faces": { + "north": {"uv": [3, 3, 4, 13], "rotation": 90, "texture": "#standard"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#standard"}, + "south": {"uv": [12, 3, 13, 13], "rotation": 270, "texture": "#standard"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#standard"}, + "up": {"uv": [0, 0, 10, 10], "rotation": 270, "texture": "#standard"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#standard"} + } + }, + { + "from": [3, 3, 15], + "to": [13, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 23]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#standard"}, + "east": {"uv": [12, 3, 13, 13], "texture": "#standard"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#standard"}, + "west": {"uv": [3, 3, 4, 13], "texture": "#standard"}, + "up": {"uv": [3, 3, 13, 4], "texture": "#standard"}, + "down": {"uv": [3, 12, 13, 13], "texture": "#standard"} + } + }, + { + "from": [15, 3, 3], + "to": [16, 13, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "texture": "#standard"}, + "east": {"uv": [3, 3, 13, 13], "texture": "#standard"}, + "south": {"uv": [3, 3, 4, 13], "texture": "#standard"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#standard"}, + "up": {"uv": [3, 3, 13, 4], "rotation": 270, "texture": "#standard"}, + "down": {"uv": [3, 12, 13, 13], "rotation": 90, "texture": "#standard"} + } + }, + { + "from": [3, 15, 3], + "to": [13, 16, 13], + "faces": { + "north": {"uv": [12, 3, 13, 13], "rotation": 90, "texture": "#standard"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#standard"}, + "south": {"uv": [3, 3, 4, 13], "rotation": 270, "texture": "#standard"}, + "west": {"uv": [3, 3, 13, 4], "rotation": 180, "texture": "#standard"}, + "up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#standard"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#standard"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/placer_block.json b/src/main/resources/assets/actuallyadditions/models/block/placer_block.json new file mode 100644 index 000000000..be60d138e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/placer_block.json @@ -0,0 +1,265 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "back": "actuallyadditions:block/base_texture_back", + "side": "actuallyadditions:block/block_placer_side", + "top": "actuallyadditions:block/base_texture_arrow", + "front": "actuallyadditions:block/block_placer_front" + }, + "elements": [ + { + "from": [11, 15, 6], + "to": [13, 16, 10], + "faces": { + "north": {"uv": [3, 9, 5, 10], "texture": "#front"}, + "east": {"uv": [3, 6, 4, 10], "rotation": 270, "texture": "#front"}, + "south": {"uv": [3, 6, 5, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [3, 6, 5, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [3, 15, 6], + "to": [5, 16, 10], + "faces": { + "north": {"uv": [11, 9, 13, 10], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "rotation": 270, "texture": "#front"}, + "south": {"uv": [11, 6, 13, 7], "texture": "#front"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 90, "texture": "#front"}, + "up": {"uv": [11, 6, 13, 10], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 2, 4], "texture": "#front"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 10, 11, 11], "texture": "#front"}, + "east": {"uv": [5, 5, 6, 11], "rotation": 270, "texture": "#front"}, + "south": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#front"}, + "west": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#front"}, + "up": {"uv": [5, 5, 11, 11], "rotation": 180, "texture": "#front"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#front"} + } + }, + { + "from": [0, 3, 6], + "to": [1, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 90, "texture": "#side"}, + "east": {"uv": [0, 0, 10, 4], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 90, "texture": "#side"}, + "west": {"uv": [3, 6, 13, 10], "rotation": 90, "texture": "#side"}, + "up": {"uv": [3, 6, 4, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [12, 6, 13, 10], "texture": "#side"} + } + }, + { + "from": [15, 3, 6], + "to": [16, 13, 10], + "faces": { + "north": {"uv": [3, 9, 13, 10], "rotation": 270, "texture": "#side"}, + "east": {"uv": [3, 6, 13, 10], "rotation": 270, "texture": "#side"}, + "south": {"uv": [3, 6, 13, 7], "rotation": 270, "texture": "#side"}, + "west": {"uv": [0, 0, 10, 4], "rotation": 90, "texture": "#side"}, + "up": {"uv": [12, 6, 13, 10], "rotation": 180, "texture": "#side"}, + "down": {"uv": [3, 6, 4, 10], "texture": "#side"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 1, 1, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [0, 1, 1, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [15, 1, 16, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [15, 1, 16, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#base"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 15, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 15, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 15, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 15, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [15, 0, 16, 1], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "east": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#front"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#back"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-15, 0, 45], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [-90, 0, 45], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [-90, 0, -45], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [-90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [-60, 0, -135], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, 0, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/player_interface_block.json b/src/main/resources/assets/actuallyadditions/models/block/player_interface_block.json new file mode 100644 index 000000000..09e82c486 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/player_interface_block.json @@ -0,0 +1,278 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/player_interface_side", + "top": "actuallyadditions:block/player_interface_top" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#base"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#base"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/powered_furnace_block.json b/src/main/resources/assets/actuallyadditions/models/block/powered_furnace_block.json new file mode 100644 index 000000000..c8d40b530 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/powered_furnace_block.json @@ -0,0 +1,356 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "base": "actuallyadditions:block/base_texture", + "top": "actuallyadditions:block/generator_top", + "animation": "actuallyadditions:block/coal_generator_fire_animated", + "particle": "actuallyadditions:block/base_texture_side", + "side": "actuallyadditions:block/base_texture_side", + "front": "actuallyadditions:block/single_furnace_front" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [5, 14, 6], + "to": [11, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 15]}, + "faces": { + "north": {"uv": [5, 6, 11, 7], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "south": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "west": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "up": {"uv": [5, 6, 11, 7], "texture": "#top"}, + "down": {"uv": [5, 6, 11, 7], "texture": "#top"} + } + }, + { + "from": [5, 14, 8], + "to": [11, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 17]}, + "faces": { + "north": {"uv": [5, 8, 11, 9], "rotation": 180, "texture": "#top"}, + "east": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "south": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "west": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "up": {"uv": [5, 8, 11, 9], "texture": "#top"}, + "down": {"uv": [5, 8, 11, 9], "texture": "#top"} + } + }, + { + "from": [5, 14, 10], + "to": [11, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 19]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 10, 11, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [5, 14, 2], + "to": [11, 15, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 22, 10]}, + "faces": { + "north": {"uv": [5, 2, 11, 3], "texture": "#top"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 6, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#top"}, + "up": {"uv": [5, 2, 11, 5], "texture": "#top"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#top"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [11, 2, 14, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [2, 14, 2], + "to": [5, 15, 14], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#top"}, + "up": {"uv": [2, 2, 5, 14], "texture": "#top"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#top"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 15], "texture": "#side"}, + "up": {"uv": [1, 2, 2, 14], "texture": "#top"}, + "down": {"uv": [14, 2, 15, 14], "texture": "#base"} + } + }, + { + "from": [14, 1, 2], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "east": {"uv": [2, 1, 14, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#side"}, + "west": {"uv": [0, 0, 12, 15], "texture": "#side"}, + "up": {"uv": [14, 2, 15, 14], "texture": "#top"}, + "down": {"uv": [1, 2, 2, 14], "texture": "#base"} + } + }, + { + "from": [1, 1, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 22]}, + "faces": { + "north": {"uv": [0, 0, 14, 15], "texture": "#side"}, + "east": {"uv": [1, 1, 2, 15], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#side"}, + "west": {"uv": [14, 1, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 14, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#base"} + } + }, + { + "from": [3, 7, 1], + "to": [13, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 20, 9]}, + "faces": { + "north": {"uv": [3, 1, 13, 9], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [3, 1, 13, 2], "texture": "#top"}, + "down": {"uv": [3, 8, 13, 9], "rotation": 180, "texture": "#front"} + } + }, + { + "from": [3, 1, 1], + "to": [13, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 9]}, + "faces": { + "north": {"uv": [3, 13, 13, 15], "texture": "#front"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#front"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#front"}, + "up": {"uv": [3, 13, 13, 14], "rotation": 180, "texture": "#front"}, + "down": {"uv": [3, 1, 13, 2], "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [3, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-4, 8, 8]}, + "faces": { + "north": {"uv": [13, 1, 15, 15], "texture": "#front"}, + "east": {"uv": [13, 1, 14, 15], "texture": "#front"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [1, 1, 2, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 3, 2], "texture": "#top"}, + "down": {"uv": [13, 1, 15, 2], "texture": "#base"} + } + }, + { + "from": [13, 1, 1], + "to": [15, 15, 2], + "faces": { + "north": {"uv": [1, 1, 3, 15], "texture": "#front"}, + "east": {"uv": [14, 1, 15, 15], "texture": "#side"}, + "south": {"uv": [0, 0, 14, 15], "texture": "#front"}, + "west": {"uv": [2, 1, 3, 15], "texture": "#front"}, + "up": {"uv": [13, 1, 15, 2], "texture": "#top"}, + "down": {"uv": [1, 1, 3, 2], "texture": "#base"} + } + }, + { + "from": [5, 13, 5], + "to": [11, 14, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, 15]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [2, 2, 8, 7], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + }, + { + "from": [2, 3, 2], + "to": [14, 8, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "faces": { + "north": {"uv": [2, 8, 14, 13], "texture": "#animation"}, + "east": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "south": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "west": {"uv": [0, 0, 12, 14], "texture": "#animation"}, + "up": {"uv": [4, 4, 16, 16], "texture": "#animation"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#animation"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/quartz_pillar_horizontal.json b/src/main/resources/assets/actuallyadditions/models/block/quartz_pillar_horizontal.json new file mode 100644 index 000000000..38b07ba17 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/quartz_pillar_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "minecraft:block/quartz_pillar_top", + "side": "minecraft:block/quartz_pillar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/ranged_collector_block.json b/src/main/resources/assets/actuallyadditions/models/block/ranged_collector_block.json new file mode 100644 index 000000000..2c017586e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/ranged_collector_block.json @@ -0,0 +1,486 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "main": "actuallyadditions:block/firework_box_top", + "animation": "actuallyadditions:block/ranged_collector_glow" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 1, 4], + "to": [2, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 8, 8]}, + "faces": { + "north": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "east": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "south": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "west": {"uv": [4, 12, 12, 15], "texture": "#main"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 90, "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 270, "texture": "#main"} + } + }, + { + "from": [14, 1, 4], + "to": [15, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 0.5]}, + "faces": { + "north": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "east": {"uv": [4, 12, 12, 15], "texture": "#main"}, + "south": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "west": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 270, "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 90, "texture": "#main"} + } + }, + { + "from": [4, 1, 1], + "to": [12, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1.5]}, + "faces": { + "north": {"uv": [4, 12, 12, 15], "texture": "#main"}, + "east": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "south": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "west": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "up": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 180, "texture": "#main"} + } + }, + { + "from": [4, 1, 14], + "to": [12, 4, 15], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 7.5, 14]}, + "faces": { + "north": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "east": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "south": {"uv": [4, 12, 12, 15], "texture": "#main"}, + "west": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "up": {"uv": [4, 12, 12, 13], "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "texture": "#main"} + } + }, + { + "from": [4, 14, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 20]}, + "faces": { + "north": {"uv": [4, 12, 12, 13], "rotation": 180, "texture": "#main"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 90, "texture": "#main"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#main"}, + "west": {"uv": [4, 2, 12, 4], "texture": "#main"}, + "up": {"uv": [4, 12, 12, 14], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#main"} + } + }, + { + "from": [1, 12, 4], + "to": [2, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 8, 8]}, + "faces": { + "north": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "east": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "south": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "west": {"uv": [4, 1, 12, 4], "texture": "#main"}, + "up": {"uv": [1, 4, 2, 12], "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 270, "texture": "#main"} + } + }, + { + "from": [14, 12, 4], + "to": [15, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 0.5]}, + "faces": { + "north": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "east": {"uv": [4, 1, 12, 4], "texture": "#main"}, + "south": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "west": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "up": {"uv": [14, 4, 15, 12], "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 90, "texture": "#main"} + } + }, + { + "from": [4, 12, 1], + "to": [12, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1.5]}, + "faces": { + "north": {"uv": [4, 1, 12, 4], "texture": "#main"}, + "east": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "south": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "west": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "up": {"uv": [4, 1, 12, 2], "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "rotation": 180, "texture": "#main"} + } + }, + { + "from": [4, 12, 14], + "to": [12, 15, 15], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 7.5, 15]}, + "faces": { + "north": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "east": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "south": {"uv": [4, 1, 12, 4], "texture": "#main"}, + "west": {"uv": [4, 2, 12, 4], "rotation": 90, "texture": "#main"}, + "up": {"uv": [4, 14, 12, 15], "texture": "#main"}, + "down": {"uv": [4, 3, 12, 4], "texture": "#main"} + } + }, + { + "from": [4, 14, 2], + "to": [12, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#main"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 90, "texture": "#main"}, + "south": {"uv": [4, 3, 12, 4], "texture": "#main"}, + "west": {"uv": [4, 2, 12, 4], "texture": "#main"}, + "up": {"uv": [4, 2, 12, 4], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#main"} + } + }, + { + "from": [1, 1, 12], + "to": [2, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 8, 8]}, + "faces": { + "north": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "east": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "south": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "west": {"uv": [12, 1, 14, 15], "texture": "#main"}, + "up": {"uv": [1, 12, 2, 14], "rotation": 90, "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#main"} + } + }, + { + "from": [14, 1, 2], + "to": [15, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, -1.5]}, + "faces": { + "north": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "east": {"uv": [12, 1, 14, 15], "texture": "#main"}, + "south": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "west": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "up": {"uv": [14, 2, 15, 4], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#main"} + } + }, + { + "from": [1, 1, 1], + "to": [4, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1.5]}, + "faces": { + "north": {"uv": [12, 1, 15, 15], "texture": "#main"}, + "east": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "south": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "west": {"uv": [1, 1, 2, 15], "texture": "#main"}, + "up": {"uv": [1, 1, 4, 2], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#main"} + } + }, + { + "from": [12, 1, 14], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 7.5, 14]}, + "faces": { + "north": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "east": {"uv": [1, 1, 2, 15], "texture": "#main"}, + "south": {"uv": [12, 1, 15, 15], "texture": "#main"}, + "west": {"uv": [12, 2, 13, 14], "texture": "#main"}, + "up": {"uv": [12, 14, 15, 15], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#main"} + } + }, + { + "from": [12, 14, 2], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#main"}, + "east": {"uv": [12, 2, 13, 14], "rotation": 90, "texture": "#main"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#main"}, + "west": {"uv": [12, 2, 13, 14], "rotation": 270, "texture": "#main"}, + "up": {"uv": [12, 2, 14, 14], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#main"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#main"}, + "east": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "south": {"uv": [3, 2, 4, 14], "texture": "#main"}, + "west": {"uv": [2, 1, 4, 15], "texture": "#main"}, + "up": {"uv": [1, 2, 2, 4], "rotation": 90, "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#main"} + } + }, + { + "from": [14, 1, 12], + "to": [15, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 8.5]}, + "faces": { + "north": {"uv": [3, 2, 4, 14], "texture": "#main"}, + "east": {"uv": [2, 1, 4, 15], "texture": "#main"}, + "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#main"}, + "west": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "up": {"uv": [14, 12, 15, 14], "rotation": 90, "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#main"} + } + }, + { + "from": [12, 1, 1], + "to": [15, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1.5]}, + "faces": { + "north": {"uv": [1, 1, 4, 15], "texture": "#main"}, + "east": {"uv": [14, 1, 15, 15], "texture": "#main"}, + "south": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "west": {"uv": [3, 2, 4, 14], "texture": "#main"}, + "up": {"uv": [12, 1, 15, 2], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#main"} + } + }, + { + "from": [1, 1, 14], + "to": [4, 15, 15], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 7.5, 14]}, + "faces": { + "north": {"uv": [0, 0, 2, 12], "rotation": 180, "texture": "#main"}, + "east": {"uv": [3, 2, 4, 14], "texture": "#main"}, + "south": {"uv": [1, 1, 4, 15], "texture": "#main"}, + "west": {"uv": [14, 1, 15, 15], "rotation": 180, "texture": "#main"}, + "up": {"uv": [1, 14, 4, 15], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#main"} + } + }, + { + "from": [2, 14, 2], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 22, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#main"}, + "east": {"uv": [3, 2, 4, 14], "rotation": 90, "texture": "#main"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#main"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#main"}, + "up": {"uv": [2, 2, 4, 14], "texture": "#main"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#main"} + } + }, + { + "from": [2, 2, 2], + "to": [14, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#animation"}, + "east": {"uv": [2, 2, 14, 14], "texture": "#animation"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#animation"}, + "west": {"uv": [2, 2, 14, 14], "texture": "#animation"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#animation"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json b/src/main/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json new file mode 100644 index 000000000..44bd32312 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json @@ -0,0 +1,381 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "inside": "actuallyadditions:block/shock_absorber_springs" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [14, 1, 15, 15], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#base"}, + "west": {"uv": [1, 1, 2, 15], "rotation": 270, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#base"} + } + }, + { + "from": [9, 13, 9], + "to": [13, 16, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 19, 14]}, + "faces": { + "north": {"uv": [3, 0, 7, 3], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [7, 3, 10, 7], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 7, 7, 10], "texture": "#inside"}, + "west": {"uv": [0, 3, 3, 7], "rotation": 270, "texture": "#inside"}, + "up": {"uv": [3, 3, 7, 7], "texture": "#inside"}, + "down": {"uv": [10, 3, 14, 7], "rotation": 180, "texture": "#inside"} + } + }, + { + "from": [9, 2, 9], + "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 14]}, + "faces": { + "north": {"uv": [3, 6, 7, 7], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [6, 6, 7, 10], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 9, 7, 10], "texture": "#inside"}, + "west": {"uv": [3, 8, 7, 9], "texture": "#inside"}, + "up": {"uv": [3, 6, 7, 10], "texture": "#inside"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} + } + }, + { + "from": [3, 13, 9], + "to": [7, 16, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 14]}, + "faces": { + "north": {"uv": [3, 0, 7, 3], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [7, 3, 10, 7], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 7, 7, 10], "texture": "#inside"}, + "west": {"uv": [0, 3, 3, 7], "rotation": 270, "texture": "#inside"}, + "up": {"uv": [3, 3, 7, 7], "texture": "#inside"}, + "down": {"uv": [10, 3, 14, 7], "rotation": 180, "texture": "#inside"} + } + }, + { + "from": [3, 2, 9], + "to": [7, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14]}, + "faces": { + "north": {"uv": [3, 6, 7, 7], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [6, 6, 7, 10], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 9, 7, 10], "texture": "#inside"}, + "west": {"uv": [3, 8, 7, 9], "texture": "#inside"}, + "up": {"uv": [3, 6, 7, 10], "texture": "#inside"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} + } + }, + { + "from": [9, 13, 3], + "to": [13, 16, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 19, 8]}, + "faces": { + "north": {"uv": [3, 0, 7, 3], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [7, 3, 10, 7], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 7, 7, 10], "texture": "#inside"}, + "west": {"uv": [0, 3, 3, 7], "rotation": 270, "texture": "#inside"}, + "up": {"uv": [3, 3, 7, 7], "texture": "#inside"}, + "down": {"uv": [10, 3, 14, 7], "rotation": 180, "texture": "#inside"} + } + }, + { + "from": [9, 2, 3], + "to": [13, 3, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 8]}, + "faces": { + "north": {"uv": [3, 6, 7, 7], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [6, 6, 7, 10], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 9, 7, 10], "texture": "#inside"}, + "west": {"uv": [3, 8, 7, 9], "texture": "#inside"}, + "up": {"uv": [3, 6, 7, 10], "texture": "#inside"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} + } + }, + { + "from": [3, 13, 3], + "to": [7, 16, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 8]}, + "faces": { + "north": {"uv": [3, 0, 7, 3], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [7, 3, 10, 7], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 7, 7, 10], "texture": "#inside"}, + "west": {"uv": [0, 3, 3, 7], "rotation": 270, "texture": "#inside"}, + "up": {"uv": [3, 3, 7, 7], "texture": "#inside"}, + "down": {"uv": [10, 3, 14, 7], "rotation": 180, "texture": "#inside"} + } + }, + { + "from": [3, 2, 3], + "to": [7, 3, 7], + "faces": { + "north": {"uv": [3, 6, 7, 7], "rotation": 180, "texture": "#inside"}, + "east": {"uv": [6, 6, 7, 10], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [3, 9, 7, 10], "texture": "#inside"}, + "west": {"uv": [3, 8, 7, 9], "texture": "#inside"}, + "up": {"uv": [3, 6, 7, 10], "texture": "#inside"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} + } + }, + { + "from": [4, 3, 10], + "to": [6, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 10, 18]}, + "faces": { + "north": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "east": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "west": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#missing"} + } + }, + { + "from": [10, 3, 10], + "to": [12, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 10, 18]}, + "faces": { + "north": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "east": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "west": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#missing"} + } + }, + { + "from": [10, 3, 4], + "to": [12, 13, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 10, 12]}, + "faces": { + "north": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "east": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "west": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#missing"} + } + }, + { + "from": [4, 3, 4], + "to": [6, 13, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 10, 12]}, + "faces": { + "north": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "east": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "south": {"uv": [4, 14, 16, 16], "rotation": 90, "texture": "#inside"}, + "west": {"uv": [4, 12, 16, 14], "rotation": 90, "texture": "#inside"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#missing"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/white_block.json b/src/main/resources/assets/actuallyadditions/models/block/white_block.json new file mode 100644 index 000000000..30a27414b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/white_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/white_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/wood_casing_block.json b/src/main/resources/assets/actuallyadditions/models/block/wood_casing_block.json new file mode 100644 index 000000000..eccc2e0af --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/wood_casing_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/wood_casing_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json b/src/main/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json new file mode 100644 index 000000000..cc6731849 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json @@ -0,0 +1,278 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "actuallyadditions:block/base_texture", + "base": "actuallyadditions:block/base_texture", + "side": "actuallyadditions:block/exp_solidifier_side", + "top": "actuallyadditions:block/exp_solidifier_top" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#base"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 0], + "to": [15, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 15, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]}, + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} + } + }, + { + "from": [1, 0, 15], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 1, 16], + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#base"}, + "east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "east": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "south": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#base"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#base"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#side"}, + "east": {"uv": [1, 1, 15, 2], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#side"}, + "west": {"uv": [1, 1, 15, 2], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#side"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "east": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "south": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 270, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "north": {"uv": [14, 2, 15, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 16, 14], "texture": "#base"}, + "south": {"uv": [1, 2, 2, 14], "texture": "#side"}, + "west": {"uv": [1, 2, 15, 14], "texture": "#side"}, + "up": {"uv": [2, 2, 16, 3], "rotation": 90, "texture": "#base"}, + "down": {"uv": [2, 13, 16, 14], "rotation": 270, "texture": "#base"} + } + }, + { + "from": [2, 2, 14], + "to": [14, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "east": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "west": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "texture": "#base"} + } + }, + { + "from": [2, 2, 1], + "to": [14, 14, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#side"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#base"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#base"}, + "west": {"uv": [13, 2, 14, 14], "texture": "#base"}, + "up": {"uv": [2, 2, 14, 3], "rotation": 180, "texture": "#base"}, + "down": {"uv": [2, 13, 14, 14], "rotation": 180, "texture": "#base"} + } + } + ], + "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] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/advanced_esd_side.png b/src/main/resources/assets/actuallyadditions/textures/block/advanced_esd_side.png new file mode 100644 index 0000000000000000000000000000000000000000..a2f88e78eebc57068301201c518d213b13fdd9d6 GIT binary patch literal 3555 zcmcgv32YQq7+#tfDMwPp6H$l3qr|?QH^V!ZbFge~7YbC!`-gkTjx!*p}DUzScY}0%v5STc{`;H5&zV{6B zu-8boyX}d~6xGTEk!GcEFqg>^=|G@%RxXRwF6>e%++mmz`ui8R(3GJ?=y{<8Ok|_D z(`f3qaa(_LQtj_jWsROyN7d#Oq9B7^MCCGR(@}B}I4VR0ugLEC*Rp5G1LF;vfeZ7-m=qI8K4065^@iMH6ebrYo(nIYnFKEkbv? zZdPHK-rn9|FCVn*4u+LwnSmU`aeznwr_Xdz4w%l2l7<*|RNKh9hGkNoMwGI;-3U!Q zErgKC`f5$52onK}$)PO62B8;HUQkngxoo$c&KuWM2B&cbo32A-Szk8WX}OluX^o)T zpFYL_fi{uwZ4B#6CgYoM+{PXfMiG!I7v_~XBSj595D=3g9pNqUZEQls7&CvVGMOnb|Ne(IktFZDhqJ+g7a?z;5nyToQ zok1iAMh10YCTn)kl%H88YNaik7$)BF<>T>aw8ge`BTXip){7gccwv;tsHQ}Y zlVuhlEQbKk3Lzk?tPU`On8R2`NF#bYS|~&faS3^a7@1ZH9@Kh|R8aJoHa5M-Q!6Jq(y{9|WG13C&_t7D5ME|nXbInf{V=YW6Ad(rOEJO>nnQEhOhJe zq4MoUL24mUs#mO7ql?4FFmxRoF$!vXJ29ceaf-Mg=2*Jhi)>uqL3lK3lVC=4-ZFcz zUFLok*@*03*mfecZd)13FKEiOD3r~n4K+_&rpMHZJA@A>J)#{4^&B4}j+ca#gjt|t zl>@9MXh4!V48n*NG*Xw6CZQ6+e8ROrP3`%nnTUe&(M9BZgo| zmn5L-Aq+TGKtPtlJRmI~q=hw2z#6H|zvg?`PW&GSqmIgeQIhWQ!Y9edplR4P$~aKY zGv5U&&$xfb-l&Wl+aB`2Cn?{j3hjpZb0;di#|lW!@v1X_bWw)uIoudINX{|}*$_wB zBFECWJw|)ltbe*idR-(BL)me)G(^t8-lKo`CNKW+9h;DD*d+u#>mTq5C z9iJJ$W5YA2HN5rp{`JPX!N=bI>7ftKta$y>XAT`SPh4wE4NRK7V0X_aD|T*6U3;Jd zZaVeO*2iADYx>&3)y!?YePu z&7*T)oE~`mz(BO?@OSF6NB6z(@wd<3aCp)EpWM7{+~TSSYc5S~4SdnJaq!lm_E}Xs ze@u%Lmjq_7UjN(SMZG)wU#h!**Wk9=T@R(!e0}zoAAZ?);o_}bPY<15y>j`Xb+Mtd z)Vd?T^E=iV$~h};V^5htjbF0wz^|9BePY9gFYQ%$)xH<*bvS+gSHIPv&kjCSbA6j~ zU$gjHaGf!A^OTzoK78TITi6RGMXztJc=e6_wG#(hKU=fv;L_R2cdNa>Ve!W1*v5uy Gmiz&})U)vb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/advanced_esd_top.png b/src/main/resources/assets/actuallyadditions/textures/block/advanced_esd_top.png new file mode 100644 index 0000000000000000000000000000000000000000..40720e1e4a25286d764d0061e73a3a42e4e626b7 GIT binary patch literal 3511 zcmcgv4Q$j@96!+LL=gxolPIZ0aq4<)Uq9|zc1+j}cErOuwrm58zP7Jh!(Ch3-gZMo zVoVfJ!k5$GXJ&#rr;{o8IUyP}MlcfMW(19&L^H`^j4?(@e7!FY+}Pq*bJuI%`@jFk z@BQBIz1vW`Y{}Fqv!?_CfvK^YXdV8Y?te=r@5FshZiaZ|i49$dSmZ1QU8BrEEB6pEEnxpA*U376S7JiG6 zt)6GgG~M3b9&G1=meWGBk|fa#paGz;1?6^_9!yiFJ2&qkid@w(Y|pSv!uJRjE9FH< zoN2a%q+M`px;dCIV00SVG#h06k}`&xTClTIP9hUrQ)!eyNo0C1wq*;pcB|!CZmTth z>q7Tw0Wh@jcp=89xg?W?5Uy9 zaBN-}>>2tPWBs1fib82)3{$_SU~0=%4uYQL)LT{}&z;&liUa^bhA3+^OwDR{uk&lj z4M0)op$O>{iNY-6n0l6%85VzT@b664G;V2z-cfAIQY=>w7@5aL;51XrVhwt5Tw_g@ zb<0UYJO@S+wjkOzTS%fXvvQS{upAs1XU7${$EvDo9ZNS7xWlbmvWSRPSBb17iWCU4 znRMfEIcB;ZG*uLfMo3(1&@ePvL%P6odWcdGt5YK6bxPqvfD%~1vLXSR-Jf*sGtF zhCQl^2!JH96hx9haV#%Tl8W;~kU;<;2|^85<=7|2VM#$bf-+yM$h99BXq2NVP&C4=?k#}$7w*JfG#kU6v7;U3KS?&W%&@xK|$lWB3~J=*%axs*OJj5xyJBo>&RuX z9NkgKhsel{4AtyJss3U`8kuW0MxpD(h>>;M-ik0K&a#NJX0D}s?a)CBTQHBt6$yIG z!c~(e)$T05Ti8n6eCbozC?~|0#sjS@4XDU(lJ(@*wvA;SqM;CcC&6y|%@mWU3 z8{#-yVrFzXhsZ~Pw z!2bT~Xx}5BzZO2gbaj0@(6Rlag!uB{=OVn)}_8vXayJut9Xz|mxG&HOjo;7WMX;pN^@Vj4qIndbgg!Ssm7k*hYaM{wq6+byw zlj=cbckR;V)eVn+_tufi1MeR%{buCkoEzh%HeYwt`jwP# z{>tEq6@5e7om(#H?ydQwXWOUF>j(SG+uoe7P3w<7wCji8)^@fWyR!1OCj$$19zHhk z-i&*9Zd-LtcV+uk-Q8vLwr{X!ZYlrpiCJHN{QM_NpV~9nz3a!O*$=Qo!+Ul`qwh>v zuN_!a^30J74$aze^7_ELUv267x#HospDpLksX4-*_r>pbd#U5E4?okl*Z*r3t6mm; JanbGf{0S#gr4#@F literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/animal_feeder_side_chicken.png b/src/main/resources/assets/actuallyadditions/textures/block/animal_feeder_side_chicken.png new file mode 100644 index 0000000000000000000000000000000000000000..514ef876d80b48f6905b65320593334cbd76cd5b GIT binary patch literal 3553 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 Q3LHm^nROE}^ zu(~iS^1RNe6laJGC5ItvkSvjsG*$?+JQ8(*AEYa%HSZ#Q`dD(cN2xLW*t!Z{%*TsL z{t&rxqaZDxD9vB2SSJhJ<`8rp9WnB1J6kbO;xvmmFXq~Y*NGfFy9IbOVv(SSb>6l* zurtX03~~_cUf6M?q~X|UqO_n1&n8eNlQOj&ZRrk6FYFK{ILTq{xTxdw5OI7&P$QV7 z46Jb!tHVN!$Q-7^h!u26#}Pe(iV*(=A~wkg3JV)1Q!HNp1foLvv{q!bVA%WVe-TWW zVOU1e3@R)FA!T0RfuAZ5B^la=$|F_^4;9RimH2-SMjMdKIEm*e>9L|?){0cq<%C^?V zXD6qv!M8-Meaxh#D}(h5=WID=`K4zpoONjJ>kGzIUUK~W=Xcz=CpONyKl|RrujoG< z9UGr@*4P*B2_-5gbyuwDruMA;VuEK*?b^M(zyH`D*RR^N!kw_IY4W&}yQfXuzV`vQ z?&Zn^(iR$E;c@0oMwy?+9$#Qis&DT35ku5s92#&f*7?aY84|OzU~ztxz_kZ@pWcjEZWjWy?3%Z zJ9Ex=zQ^zTecw5IYfJNrSu^L%q$p}uq$wODzt!Hiat68oYg3m@eyXgdPKTn-I?wx7 zQ1@(`O&&hh+dABi=#{EwrhO2ZaqP>cEh0@(^-HoA)Vi@t$8l0OLd^KH&oQ))LQK0q z%0;b4+@&`S*m&hYbDK8Mttp6EvY4*VszgB=yO7SNQ--5vLrhMuN}j!8mZ5VZZg+@T z>KUXvqAhfzX=7UUaX{lZfet7>UY4X_u#Ofufn&J<%X2^wR8Cg?B3-x`V$DVgH5R_C zV2iwkm@e0~RF>`Q>+|)AKGROJyrL*9C$NG5hy-x@4HssC;mj*)2xCXHb<5RFgZ4DS zxS4T74DmD{LfR^+HJk!W1TZ!WEtdCjUPw7Xq?P2XjGf9EM;eP$IE@Y0A+mf)*6K1{ z)9ErNQC*ro#Q=de8ZFtF(3f<&WWsTm_mVIQfJ`XuwDntk*cx8mOWd4SjK*IM}6Ys?G@knE1i)|+K6q#^hE0)ob<&840 z$TARoe9qlyRE-#p3k?lN!Xbvl>eF?kCNSb85lVoQG>Mdwgh5b-evrU&Jc#1huSr^Q zec0489xJ`|`2t0zMs%EXPeM{a3kGF^gQx+r76TZNMIa)mh+M!gVKH9Rc9pG@9syJ3 zT0O52(Wu2`K~NMPK&<$I$V+~pXnX=-$YB9v1wurk@@SzFHN++86=H}f4t99-Ol9(e z0f8eIX$RygEb5$M{^ay3LnpZq7}_IN9{!c2#}Sx`t=w3Pp2ew-uuhP1@=nO*Go7c- zkOp)Tu43p*Nm3j_Q>W0LmceA0WI81us_Oo{~RwuHC3m%O^_niWMWKFsx5N*Xa=>uePrX6H1(>i1T8OnQ;4{jh7|~ zkEU!A?4-_{MlZI@+_#_&$?k=1C&VOdGfkHYns!YZT2@NealRQ{#eqn8XFKk&6 zan3!rhQ4&|HACHcWb48s9hw Dom$P9+n!9U{w%cw? zjMESaY%;)QQF#nWz_5hjf`~{QK@v1Vg3&l|7?2E|gun%ACn;^o?YZGYeI z|NFnbuNx}L7fu@g!gvHhCi%)d0eCGikNh$4ym?E+4lmCn%Bpn)nJ~pX@{murPeYKW zTjgMtQRQFE32NNJi)sj1lJNvYBS`W5WP%r>z(7MFEGsT-@aQoNl|>g;Y4el*gd0TU zvPKOoYb*~6jZuLWvHA1R;v@$N;=th1WIU$mT+)T5csV#W9}^gwf*4U3R%#kVtNazH zTh#z+w~)9%k~HdIEtH*MoX*!#nxsjBbPyDY(=52pc|QhJP@r18xnvB09~!s1mLZMGH03IBsjMQcth2K zsv65Csv;{HrD+R^7FEiMsMhOqMoj=7-T*Gl%o+|;W+j6Z!;uvHzh<7vG}Nz(vea-t zl;s$fqiuIVVabTR!9Nx(3Y?^BaUMD>$N4ZI5=t0Db7AD%YE0FjVW`eJ`nk{TuFzCT zj=>jtVBrGP=XKjD)^5jX3zd@V_j5i)H+V$=K9387!Li7)$Vou3heDKyhe$Sr+W_Ol zS<)H81t75u&yZ3Gu-W+@Rj4&fz?`4%22m9t#~pcqWJy{Q?6^ZBop^|07@VgVfIDoA z;B-197TCos+Y(KN4avtwvzn?z$VgkQPLj5gI72&FoOUn*&e}v4cL0H+X^OH54y#%A zcPwXFN}+!`%($Lus|9>GGm6Rc9wM5uS*;=+!fDAy;;e&_a6ZJ_aJxV;4$8{gM8;Z7 zm>mTv(DW!xOFY_ss?NDG+0@gJQLzlH&FMi?rOokz*|IK7Fl!aS_@p1p56IRN#U(Sp zJ^~==BWgHpMpq@Hp4UKW7-sgdJwiN8yw2A>TKba}T3XZn((mc1|06vU79qkbVF1^E z0yCXSWrNN>ttCx0f zJYQ1qPIqDN$*PslP8gUtX3A&5lP_KB$X|6}T~O{?9CqgK8=6~p75k&+z2>i*OJ@FH zziCMxYM)qn8Z5ay_0;Jb(qGrMRr@K=7IoN&fT3u-YIpJtyi|4Z65BJ zae^$~QQk8c-G8XJXK+~`<1ZL@TDf)0i?p7&RFOY(-LA>8!*3zqu9;l&3xiB+`lc&y z9iLy4zh&>f9dyT;;SrZ@^XwO+&Ar^Fe#Spk*nSF3|K3y6lK1yHer5Fht?MJLhcB+E z>+J3O`C~BBqkdRGbY7SU^w(Y>#Xy@&J8!yg#ySn|$%fHRu(>7ITxiUP` z9&f4Mzhb-IH@4|WS94+UnQi5tgX*n9b^G(eKkGZRwZqtko+U%hf$H|9jn3)Lf$c-b znvW`n-&{Xf^=eaRXAv4)?mZr1ZWa$VjP-FdTH89#gwOxPO#0RL-Kjm{gP*j~8?k8d kQ-MWD*VVpVMH^q~SaJQUFIM&aXnr;Lyyc#*1vT&g2k9^Og#Z8m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_side.png b/src/main/resources/assets/actuallyadditions/textures/block/atomic_reconstructor_side.png new file mode 100644 index 0000000000000000000000000000000000000000..74a5e90c75899f01b2ebc16e2d0373fb67eb2c16 GIT binary patch literal 2199 zcmbVOeQXnD9KKCNm@a{U5eR=AMQh(0hG0nxI~gPYUeE!%P<`G8cLHiNsxAeB5|4)NLH{}(bNxv)->5Kl)DzCY{5GR z7Bq~gKoIry^_F_8Mb!cX#q&Ht(gaQ85P|FQh#|)Ch(3FS!3A_lQ=*2VMo^Pc^r^Lm z1A|JFE`+0L+K8SC6ATy;6QcxWAx)POKv_!TqP1EmVO*975CUNkF?5Kf(%5KFHB>#Q zK88B|`T+wlv>s2|#+X{d;j{_eD6E5SqyjP~TCa#l0Z|TgwN{frVI7n?+w>+XI5i*| zs#c+@p^-$Djz~sn+CrjpE0u_>*6TT=CIFXc00(Af4TmYSk`)vqkQDsSH_v1e>QQCI zAAc0e30AwnJP3s)Ba4RkRIn@wepL&L&|xJk1^^L_1TZumM!~6uR1F%2>a3%myPeKb zP4z1w_(CsVT!6X@oh-$(EKXafgj|nDa7T1Qj7Y%ka$qnx7DbT-j%P_5CvrF-84maH z48TRnN8>EueG)_Z>=eU|%y+3$tyu!*{A4%CssuUi%j4~U@yU!I=VhymQxZerKGM$O zoZoMwNt;B{96!SLhNi%V6hos~O;s{vwAuX}$H_7-`g{z|a0yj*KMtvBz*t$C_laiN z-?u!%k`MjUVaD}TTNQ|b)F`AZ7+W-;Y*wpG`*7NCBXQmi<%>SihO-jI*eR=MlNoC+ zVRjUxK$D{+E%9Xgi8>dG6jM(;rD7>qk=BDIN?Q;mvt=EaWY#K>vD9N_jBGtqTvGGv zg8-5~p@x&zb=7awiyFuez|20iM~KIX*TuRgOMkXPOKN&l`a?bSf260vA_c`r0KoO1 zz)WWnc}*sTcsO5)ccWI-5jb3`&0%_vfH&z~21FpW2KSKuyh%d{lF{vUqZ^rR2!1UqO^!Qz8n)Titn_3QCh;rW6T45{V zZ3RVtHdeK|HF+*$HQx5Z`Jr9E z6nu2q$l9KZ0odJw4wXS%wrH z*cYF-rn-6S%U7Q7m_N(26uHoHoV-@@^#}L9n)~ryuBCkWckYG-+gk24UD`8n`^ZjX zX5f2o^P<^Zyqa@N-|Wh1-*n=w{VU7vzJ2b!e-7vDsO%E=4d&gf?)$56XwUCQ_uQLv zdCIZY;K~`jwf(}OHN~B))^?09&NFF>3>D*v;XV<*LEgyDuAtW+z s%Ue9XaPqCAmBl$3fA3Q*RjvKctvY}9cH6qD1LmiLyRgL7T~Pi0f7$#6Bme*a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/base_texture.png b/src/main/resources/assets/actuallyadditions/textures/block/base_texture.png new file mode 100644 index 0000000000000000000000000000000000000000..f98290a28bdf34f6a244788a0bb7d954c7e586f1 GIT binary patch literal 3316 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/base_texture_back.png b/src/main/resources/assets/actuallyadditions/textures/block/base_texture_back.png new file mode 100644 index 0000000000000000000000000000000000000000..7568cf5c74c37d1b361f79b845a3caed652e8507 GIT binary patch literal 3463 zcmcgvZEO@p7(R+0P=glH2#B~YC~a_WcW3u@Z#TVG+AFk#tF>IEO+=lWoo(0N-JZMK z_F64LASNP-A_#sVf`%UuRFuX9LyAEf(H|rbA%+ME!5}fVmZ%M4h_m_U&nGp(jNSWmu--1n3M^7-n<7KwaKO;k789?xwv-1j8U zTkp&y4?h~=MyD~fOhsnQ3pF!>y~$XDSbIFB<;es@t=OR=xY>vY=z-6BY0A(7^a@{y z3neOXi&5QW;pJVmVbs-%6pbz~qe_!1aS+1}q>`~{+*XqTI^|a-&+afwQz;XtH9#+N z15%BlI;zsNFeQ0825}sqWW~!%qUiTOOaTsXEGM%(#{i&mlIjzv%!?+`EKOJIgNrk< z$gcq1;y4MFWji`Lyd8qqw3=C7Q52Q~EC39#VC>Gg1CvbLo|p9y#5S^wgkzX-%Jm2% zW}6eBNv7!%Vu_sFxSfHC0LCU^g5|xOTT;qULpi%dn-xt3*AR=NIELenO>Fs`ZKB0= zOuNM#!*y=L(z%mN&Q4i3;Rkr=`vfeZ7Z%JJlHq5H|DO+%(;=$-kdJj01$z^go`3epHu!eR|N za9m>zsk&*!AnAb-gUy&t#G7d<*IBjFjG7h+OtKU5$7?Dp>nu|@qGZCZUs6HUR8>m6 zB1sJJ@~Lz~A+;uMJ1~xLO)x-{TD^v$k-fqDc%;dU2>gfmp_%JTEblCi*p>?AI}pv)&%H45AS* zn(x)kN+TXoL;^rjcm`s{#|XUWV-&>e42B#A7%LEJq$-ydDse+ng6>8P(AmL8m!8qK z^q>ql@*;9TUYSKr5W42(b@BOzXtc>($~QONU^@|sSOy?!kz?NO@@ zx3iZwbjY>YzJi4i01wxb0TN?d0Xr_F3rcRHYj7c~FbnZD5ba#`{EClF=Yhgx8~ z8I!Z0y^&%xAc_8n$nb)nD3d@01?s@h02%rt2>4_L6G8cVzeiQ#|F{@5E(6ACy330k zNyY|E!~6r`-?k_*{zJH>%yE>8)ohMxxIC7!xBbguei z=hYu#4Gj$&_`a46-wh1)y|MYVp2v^AJh1(hL+g{$+tZglG-I&jK~Lc$XNNqycNY{P z?M}H}l-- z*DI!ca&$0xe!>3Oo}Mjrzcw{(dB3V@?yT}b>CRL4>m{hV`&3)+7Jcte2X-v3_Ut-Q z^1`|5*lAEU=k|)FCH%4J{pAOr@E#m$Te)e$t-qX^T>MS_YPp-A!dEP>DFLtR6?$L}GJ#zdMO=(JuULQ)r zq}776+NwbtcMi6v<-uNAROsc)sK&fR9O&3ZR9?>+j+BqlMZXex_L>=*Dw?>xF}leM zNOdJsREue2DjbABhLEEoVvr3BLNvOR;vfeZ7-3ilI8K6LDa2Fdizd-*MU^_@E6TCR zTa3=St|c+dz`#IofDf8>55tP0$Uu(aI6y3bQ!reV2Zpnt;vtS5+14yqGY!h~h%#oM z8>304r4n?@cWXFhm=dsco zUs|AwDH9)K>G6UBSw%r0#LEJRB7p5CIy4t5SLs znG}c6)G5nTGwLZn<+NoJBb^Zul=+AXAQD8NKyTgzl>7$b=Q5aUWISaeE=r;| zsV~ficwXT$fKx*dh!H^rD1$;EEVE?#c@$CvzRFk8YbizM-nA69M_Q$MwH3-)bmEPE zK2%X|BqWz6O7<2jR_JoGHUV9yM~sr&fh;DJxW^(cnK`EF4j>yh^$;FSDH6=2$(u$$ zwyV;&kd4Uhg>5HBtG20A{(`1llR}o2)8ry;nSMhl?+`wm^rUed)PHY?I6f+5qL>9L zmN~#Gf&!uNl3{}U~N)tH)dyoF%o4okPcWjV#Ym>t{UwGozK%nONM7$}z zXjor+e8)EU*xm)hAI;q|x8dwdOMbkuels(F{|j|*#4og?p=82vM*RH#$rv^{Xn?L&6_A}?ddhX!PKQAA^c1GGtB8tk01DS@x$l7HvecoyZG>; S=6dhHP@=Uxex&);t^WXF+H(&8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/battery_box_side.png b/src/main/resources/assets/actuallyadditions/textures/block/battery_box_side.png new file mode 100644 index 0000000000000000000000000000000000000000..8b05543a0969b5ee71f4c38f7ebc0b0e37d21fd8 GIT binary patch literal 3569 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/bioreactor_front.png b/src/main/resources/assets/actuallyadditions/textures/block/bioreactor_front.png new file mode 100644 index 0000000000000000000000000000000000000000..586fbb6d0e1ba9e2b402c1b73ce7713577c4abb1 GIT binary patch literal 3512 zcmcgvdyLdX9Nt4?@H`9&C>tfQ7XARC+jh3w-8Q=-+#Ybs!ny3pK}>Kuo!(V;+uC+- z_c%pGG~uOpibe#*fW}AS10(o21^>EWj9d)nh#JpmVh)1}3O*7vI^9QE^p3lT+U$1Q zncw^#-+c4U?8cU*izd}yRUZfhCN(ckrpfPQ?>lhj_H{;w=K0qMrJMqRa3#CV$LGgfk1p-(Sm3Vb}0q7>qde;(RYxhbTvV*h@`lb z)rdRv#cOT6eC^TrUIDKW$`h~oeil|sBI2(j2)3UGj9xhTtX3;;4G%8@Wtxo8s2Ry8@DTv&-k z-V$_&>sm6)77B$>AsjO8c9xeUiRAzb07EPor^|3*kujVZRS!w*AX~Rw-83lABUH@1 zo1jUi zM{(_UpA&#Un@agHM$9Fb^FugpQzt2-0?3HgPNvJkY#KXe-bT2olcYJLT8-nT@mV~_ zF`StDgI!%4Wvth8PEok1k7DZe_@E zWdKe>7bj?sNDN_7n9J~j%<<$i$GdZ7)0C;|T34+pPpmV1R0fh92IrU(7OT*OV;ZYS z)=WDG$sFi8*p6AtXs0QEX5~gRYuY3*$u3;m-rU&OVw;+tB^^$B(E_TusZr!5QDi`f zFQuDG$<2o2LIdIEWP&EOhICz(HGo9GYZ9YK05KdA1O|#oVKk&+hnX6r;FV7At)mz7F9 zB1Hs1l6VGUDZ+$#A;L(A*BA^r3^0};R7q7HEo9<`qy)W%n4qhTZ5}6ttw@kV;i$%NkRYvc1R*GBfDs}%rbJN~C>X?9Pnn2| zvgnQK3-gh1SOp3Lv^DN@BnPX~h0or(eJK@ooBEgQD zylHe|yC!`L+K}vC*me@MW}7+6U(l3mQqZ!pIx5kY?KITN4&lQ|j~d5;o#%%Lgkypd z!#ty51Q=cwR3;_?%tRqCsG^EvY7AB({tHBWh7)9-Y?xeCy#5J9mFYtr&}heG?`JQd z7(oIMM!jOf8qdU3A;u^gQDvYBID%nB(-g9%|32R%D)E0@3>uRGV@$fo3!fyTgQj9z zui-!~&-@gq665}zcw;hde0#|MK1n5=D$5P~S0yUHC(B4K^j2r-=pv7#IpgIZIm^go zLmXp^9FK5&jP|^l7rI4yDpG=>=D1pIB4=Rl(La2X7ytN<4YF=+ayZ}Dy6Ndapsuqy zIX^S2H-Gb9<1=pZUHgJP)92Q`_*RfpZrJ|r>1A&h>V+!~MQ5VHC7<_2ou9uSis$!y z*|6c_o=ob4-S=KT{OXJM4Ow@_4|EsaIn#1>owx%~p!-L0vT6b{Z zwQpUy?$B#?a%DpF!|)+ z{_D2vb?(1o0^k4Rv{jEx{c73OFa31l%&t|(kG{gLI)3`}vh|J;yks`+?oRCZ@X+eS zovY?vxpC2yi>#*}{$(gQW5cnxmrndh*g9G1``kX<_wt@6pXqOVYIx?UuTQaoYc}_7 zzI)!f?n`dCDgH+Ci$8Yt{`RF68`$*VffEP+cysSy{SQkT0)wCKo;7h=6MX6S&(cSP zjoV&FTc$pDWyg_*_io>3A8u`Jdgt{Uho|2YADF`R|5mqWXmG{RX}c-!zg2V7(&Wnv HZd?B+MEa}B literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/bioreactor_glow_animated.png b/src/main/resources/assets/actuallyadditions/textures/block/bioreactor_glow_animated.png new file mode 100644 index 0000000000000000000000000000000000000000..43c85e8405b8bfd02d9bdb7d1eee0319cbf0bf13 GIT binary patch literal 2065 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block.png index bd2ad36f8efe6e209591dcabde9d2d637d30aa07..fa809bd8e8ef2eb52e8e1142ca10d144dba0b9ae 100644 GIT binary patch literal 3289 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 F`U@kPFKqw- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick_block.png new file mode 100644 index 0000000000000000000000000000000000000000..f3f94ac9c7753fa784c725d76667ebd3c4c82e60 GIT binary patch literal 3305 zcmcInUx?g97+m{>IxiR)ZESc@Fj94QWVY{6H7 zuO>-o3c~dCbbeaO2hoHe8ipZYA`pT=0>v|aLYv5sw{PrX+<^%I6Ph#>#5_(zY6&`aCKpacwU%+m7FdndnV-ZUD`v7`HAsTE8Z4nY z8(v@lpe>g(8;klqZkNBWxbe6-)>5 zY;xkcOUzA276iqb-V&neNG2MZ{Sl){5LJSp*5%G{7e$VcJm$6^@O&qjj_*xl=uBWm zny><&5(xo|BwP_?6N~V>FMZ;+XgP2^ccxdAAgom|HnC=sg`&V>hbDAcVaGPzAgWVX z1Fudem=O9CJeRGk*&oz`2n>UFQg45$zkfIiT(1TL@yOmiTxpoiB16>`rpc;K9kuJt{>XzGL2JEQQ?DG*Xj>{Fh9M%# z3E zJ55&R@SSdN5xTC77;UxFRR)x}N)orl;=oO&X~g;_fJe&~31La+1HZwd9`{2UQP{m$ z6c>0m3hG>z&|DI5Gz@E=-J-3~@SV;Mk-^C?X(y(Qt3yO2UAA<{XqVXpiH__b-5?BU zRFoanVY;K!F2q+rBv!C&im+kgZk_ut5OtQ%u2O%3!QL-iLohD0n69cC!V-0n!ho7O zwJc=ovaA|Z#l+AS3ue(ue4T@_mu0{*i=Of#BgxXBIV|#eIMBwvI05Vl`)_9E7us2^-=vTjWX#cgpBgTX3yg zWLia9F!UT(yIpVwPMg``8$Pn*JM$rLBRHI&-n_X12m5zR#lFh+*~24GtUrZUpW0~j z{rcS5RUdCKU;J#x;SI$TGhcuD_`{b~X>{Y(68S*6ZB`t7N#1n$9zK_=sHOTZFT8%) zf9JKzrn|R|ugz8G{x*L6cJ#d3xb)Z^rE|}m|M`I=N;2_T#U7_vb^;zwynv e2maXl!%c_8V>>1<*Dj`iMoI(wipTdndFUUkYdG-$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block.png index 8b6b869a28e61da3a2881643eaafb0b1ffc1a94d..152e927bce33f4c724d7c491aebb1a401097f6bf 100644 GIT binary patch literal 3331 zcmcIne~1)S9N)8uJQb2i#3F~0NXfVJ=Eu&?OtkAi2c!D9w_~jR~}SSp_UuXMfD?*`0S}4!g56 z?|t9*$LD?C=e<2R(7$~}=bFw$BC#UZmmP%PhobL;OW^+I;j#)pOTE6GK_ap2;pp3u zIDTR^Jp5!AM#7Q&GX{05Nn*N1maJ7huudepHrG5t_p*>HvXbp&`0LXj@tkdD_#LS{ z&U-zqZ1?T=+0g#}0^Prt>L$N=6W3KUz(JLTgsW96PGHnBeBG}B&r!3$b9Iw&Z-(!V z0&*ky0j|gO8K)*Oq8LkDT2G3qqG;MiPQnrva9R*Ck|YDGMoQ+I7Z1^V(=rCL+nTZ9 zEyI_?&@%*Ke0)4PE+<{TB#64M3s@2)34sL)CY+GekQ1zHdC0PW`nDI^uERwhNzok* zGdyJ4D52`bZk?bB696XEh$o0i9FnbSHbOn6KfWPv;CQ`S2MX|8Kk6NH0o2G2zd z2lIGvXj}7)je2Gk#cK9ErcqC9>KQ#gBcbaTT({EV&Oi%APLh(CTff70Om{rk5Y^Be zz_KJ{89pKs0v5@*ASwnH;qz2<#|_iGYueUCyQze5x`45Pbwko;nF5PV5|RatO=?)K zUnMXHc9oQv;5j9pi)Ys8aVxG5fgwA&y*<~{GvK?HU4f2ZaQjv+*W06tx~d{6Db~}? z=Z%~bgv6mNm(B1{Ytpt&gHe(e3DuCO5FM$al0rHY2})V2jEkC#Ma^uD&$@IpVr4YG zu|Q3if{&T>7}YeZXvs)d(?z7Iii|WW=>Q86i7aA@Q)AHvr(^E*UXGKK|F@l-Im`;cZRYkNgzzw8CqJ@~@Ta6ZNCHZn>Df8E2Lxyau2$*YFew4h zG-%4xR#Iv{RqRc3BVE)9rgGXsm?%0jG0YoLED0$orWMmvmWoX35+Y>+7Y)&y*B290 zvTRC4Bv~np^t56jQY0y)Qc+2ZGD(?=+~%w9wUMH5=UVF8WAxckZ4=EbhSVm0Hm%cE7<0_#4iUr2&l@KoV|Ru~k~O8MF%emeN=P&n z6KT4{5G+B(R86Lt8fig%8$@COD~1RgCT@w>e}SkueY8xR5`(>8xQk+##?pF%is#Y^Avdk&;d z4ISyc|A8%MC;z&3VeQr7>FeK}eR=xqJHhj7PZ{@3eVx5D^~a5l$vu}hYN2bZe?^JG%heMHD!e|WdHyHAxT6* zR5(vnlF@F1FbqZWylD*yAqjNQ79J*TXfOT$f7`Jx%BXZ?Ie)gV?F8JV%fg59dH??K z1C}E;^pn|i4QcYRUP1;(2-dHskgSU%HczX9sxclvCLm1%N(GU=%vb~v(@hPz?-`0Q>gtA(e%r^Py5i6v}l|C)I%(DX6&P;&>!z$;Nb2 z0;^G^lzkC2B!AE--Q>(6P!AxaPG=3X94fGT$!b$+j+A-TD z|0igB!8dA;LmVH5dN%>Nq24&Ba#LC@HIoPqRu`~Kb7&2)t=fq8i6juqwwoZ24;wd{ zfFArXB2}BI-eg(i5Ht|T;rGU0w%-#w%OU$N&HU07*qoM6N<$g03E= A761SM diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_block_top.png new file mode 100644 index 0000000000000000000000000000000000000000..969df9c52018d995b617f4712a14300700cd05d3 GIT binary patch literal 3352 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 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block_top.png new file mode 100644 index 0000000000000000000000000000000000000000..46c2cc749f5f41a0110d5fbcca9d98c2a785603f GIT binary patch literal 3355 zcmcgvYm5_B6fTk&Sc7qW1jDb%pa#X;x$|hJGoj$pF6l*PNCJe!#6$%=)7N%!m)(du>Erg^ zbI;>D-#zE{xq(&7=XA~Mip64c`unnZ_`W52&$k;6GJ z!%BAFW}mIzysBVs9yT?~FImhjs_CGh!a~B;DrG0oYiYi&SBG&lE%01jBpgojJ&{3f zFgL(uT%U2tI7TMM5~pf$F{vo2)cu@y)di{9mh(pZa@{yJ1y*Ji=7a&rifvi1O8jHOby+Wn56KW=|p-t+YiwJ>xSHx_-fR%PsBuiU*)!^PJhUNyA zB_T`m5s?tENX7+G(Xj}xh0!N&h~`{sTbnvXC4|)i#yU>vqB2etSWHPsrWB^8Zn=Ji zKo0B*DKf!xiagiOte$bpt`CO6JGpbdKa&~oUCS=RLXcm+lgDsiZ_uLRAPdh^!)p4U)i2v#3E^+8*?6s1c;xsWtM7f=1Iw zN|L6Dh%haIWKl^V%@i%f2xbyv8X**-ifEyO8gPk32QkgJCI=&WmPZTtut}{HvkH0nA{lJ~v?3Sa~pO12RFwiDc)>(D)T7Kx1&VLhpg3 z1VGcES)P`XVslis7f+0|p%HA#s)aC7G(<5VL=;OxN`j>f)s!WJNsEN2GJ%Rl(VJ8k z6BDvbB?C!T0wYaTEJPq*C~1m{D#|256}dxKU2DTd;o7k@Xwzp$v2AL4v6^jc`@_}C zjZVx)qRi;9G9XA}+Ma-}(<4S>f3?Jb64yAy4Y9zr!Yc7uPZ4-DWswjjb>4MGncv~Q zM|=X^i}^vCw|uw4wGT8Gx*YMmvTfFBD~vj{*&*6+@{`&L$mq2plH`z_c>OrKdIPLV$tY2O9iE7StIS6+d9U9^kEpj@AJ7RRC z&Ar|h8C8)w3?0|i))d@C<2&NN|8joe+cUq|-90ZRz4TW6$n5)`zdOH^t|*+@duqv{KI@(*&X4|fY~}0D z+PUv<`S#I^%YWFjzgvD``+GOWx@K?P*nP2U#hf1>Ir_(+XP?}jAN{!N-1+Z+{W7_} zbntNclS^A~|L8N}#rRQU@7ayH$BTO|9e8B{zwf6FPhal&>g1b4{K1>Qi=USE9p3Q9 nxo_Uxexf^HIdbgS+=q9ZSiAqkw$G!#Fa5o%vL7sc?5V#170*?T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_smooth_block.png new file mode 100644 index 0000000000000000000000000000000000000000..667de2e9ada95edb3a5c97d4ace6232b88f10a26 GIT binary patch literal 3265 zcmcgvONbmr7@kNDNhHQ6NR-fY5F=XC)zy!gZZZkGGrQRZC%bMY?(RXfx~h7n%}jUO z-Mc%x2T>1V@EH*gF?bLZ^x(mOmk>n|L5ZLn5Q5&k2}baN_<;ELJbGu7ec`K_>FKWe z>wkRp)mJqqCyyT4y=(8TTrRhJe5^7Bzc;4e9oNDArBe+Pes+dqvvDqW{VnNtTkiCk z+u`9GuQrp+RPVQ0(8^ODI3nL}g27TACeBXZE(;M36UyzwpF}Xh3N9!rMugbdv<*$_T{1+AxNA>UMtiZ~tt2;+ zB(xP}VPPS^pyh+8uBet}DVQjPAh1C3qMy(<^5gw|4;2x!$O{uM@TJrvb%MF1Btxd% z5?W#A){lEI0boj-hKicUX-OSJ&N91jE^2mybEb%xrPazp#L37!l+goZP3yR}7z$-d#KBy|#K=6PxxZgcoJ@%oJhw0$%(KCX z=dLq0?O9cnXnX6JrahTyXqO{FlOU=EL9@@D$v%n_A$cqvnD%@gEX4PuHS`9E3Qa^w zPKktoMH;TDx{X!%+?(EU*R&dN&s`ieB?uR47z5{4*#U()P3Xp!oY`&=wJ4zPwP;-^ zp$tn2zr*O&&1tv67yq zt3|4Dj#O$Ek#6b+vNRVX!&FV;>Lw}btnY0i@<1JEbI@y=6$g*ZF$u9O6;WXsNK;ck zOm&f?Zvy-N$_o=7Pvl zN~tdV$3WcxW{A~koAlbEIaBcfnYf#TIoLD1x(B3Z1+ISSLog{Z5H#)y(=e^~o|@jF zwUKr#ikVh$5vIC@I0l5M?h>RMqUaQuMjSy7Dyb%ci>}r1GHrg7pR;u;uP1>Hr| zp$0OUsuxs^8eG=~e098bQ&cvtrK39bn3vYJ*vsOWcr43D>IjWZS$CpXx=aO^d(GY& zbln;;x^5R50w}S;^6i?%ftxJQNDS41N1MunvTpK$KQE$z^g|j^*tbL!mt;2zT2i*4 zr6iDO7&blDp{+9S^WNT&!6~mBC#LfoLqxQq?i7WJT)_xZxz171A_5hts&kWzA}`WD z#8*M2*064?uvOx|a{V2Mdeg@m)UONJ^_726jNurLFc=3enj8_V7ZD`|6=_B07)8nq zOhHhto$qTk_&=_MZ94s%%y>$Qj3MhI#zo`}5MYpGSqf5zZvRfaP3g9^4dnlwp^idz zg+{qrgSzjPE{vn;y6hZR?6uTptL%gGiw#@hCY$3{Bs=AD>Mi)En`5dU9T*0VsQo55 z_ok28fg4`3BfIcn#YS)-e>^@j0f+f#$16j%1E=O*e&B|jy1i2UcKi7&vzPYV@#T{* zzIAe1yY=$mSzL`R^|0MxXg&%)9yHlRI*`+Srl&#PXlFeUi+4|JmsSca83S z!hhlO=k}c)e*Wi+UtipHe9!q`9{%XUI}ef3_vANzQ(h~)zWm_ZS0-Nh>ZaZ7((l@v tAB^lg^=aLBe`)#E>9fn`ol8G$+ZW6&T_`{5rhhWVM~+tB9e(7gzX0r8Djom; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_black_lotus.png b/src/main/resources/assets/actuallyadditions/textures/block/block_black_lotus.png new file mode 100644 index 0000000000000000000000000000000000000000..b4ca5e0d6b774706bf55cc754c400d3eeb6def78 GIT binary patch literal 3478 zcmcgvYitxn9KS*+&k_VaKtI5`L=j#eDhVGz642RuYzwxu5p{F7w>$Hn z|Km5m`OVx@73H%Eh7=C*csvDVrJ+jlJHq)6$|v{nm;Z$1XK=D~zUA=@9p!xUJR3KU zArI%ZNVQ!Zo}(Zm;f1OZ#okmRNvu7dsnb(Qi0ZLTMRBdB2kGBGXrn1j4bt5?4HHv7FUKH`<0-%F1wK&>1g20t$8#*_X936Xyu$euNuaV9O`@4+~)OE#GCbZ`~1IF1uow=H4|T-#)wVH;MR z(SvKZ`=$T{+Hly7(QPh?gd4)LOBzWTSwOnAwj#|*%vNH{XfP2jX(VY*$W>$6mADhn zJ`5-3?qFMs^)S}yxv40e(t0p;dR)__Qfy*q8)n2X;yLbAqWGNxfe)nd(EO##En5daio4SYA55*Dk_hP@iA zNQoI{0+Kn<60jDtNxhb)+?iF1jksZwz$81NYkOI7afNBbv^eRoDre20%1VlTK=%0< z-V4&{hQmskZrM;rxGWT;Nv&Q@Qxz3rgm@7!f+YAE9}@jcfQ$MWKIX$Rf-x*|{@nPG zff^iEI^#17R5cLs(V3orAn)Tb&qxS}OjID=WLXL@A}2w>`2iB3FXwHpsS%BU@vdH- ztW@F=MSVOk%YcDcmKXtu5+frJV=&|}kFgA)N~&^bp%6DDCFm@~Af0QhcIX*z$Ta$S zj$A|z$dw&5znA{b?uT`a%mq(V4zV)uR}qaPFq2s6whAqU%xJqJabc^(v16e;`Pe7zU?9Z`y{1xDkC@StxA-64`q;?>8#H5(M9P_bBL7o ziG$=UqmT`;mo2g{!tF5H@n+oV7U`%+8ip>%)m#%f13QoI;hVg;$9Jrgb!(Et`K$a_ z8$6!8NLi>T5_o3&`a_HRff0|ly}RJCRSnyoOpPcyIc~XU;X$-;>&_pp^*c~L{-XnH zkFBYwxzy3VVAtfrwX4FXFTjQ+3+4@NzXx_~VTJYUM&5N}U&|MR-~YbFvpBFE?Y;WR zAK$|KUmG_q-S1uX&WWc%{+E|M8&1@Cq%p%PuYY{^-pV&iN0%H~GNt|eiyibq`H2%X z>%h6$+|e_e`=42HvmTy8(p$9@0D|t>UUo}ysPzr zH#W|>ckGImfv2}O9)c6+tjSwVT^;3laK(>nFT7W}VKNj8&t7@%>p~yC^!dTrKkd7+ z?PUMz;T6k5)vxUkj800B?b)(v!1m{dT_0zTJ-obi|MjuYhV`@JZv!S4 eEDzk+&~|L#u9i_Nc6{jkb1Ew-54Fr#wE8cVG>+x~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_breaker_front.png b/src/main/resources/assets/actuallyadditions/textures/block/block_breaker_front.png new file mode 100644 index 0000000000000000000000000000000000000000..6fa284fd0ec14e0a53875247057429c3b739cfc5 GIT binary patch literal 3582 zcmcIn3v3+48D7$qn8cKnA{5*Q%hFOu&D=h3Z+GQO;`mH_QqFPDhp?k2WNv2myv^P2 zW_Qm%yDg%H5^$ic(|}OGYQ>{a0uha9Q#CvkLW_u%hRRCZheDw#O+hN*S)#hMoxN8s z)Q+uER(E^5GynXLZ@&3v?$(~}wHGdKS#7 z9GeY2!mLva;vCJiQbNJ4yS4o)OcXG_1YKT?2w_QOLyYQnZqdt^gJZ;#JSh-6@Tsj> zw{-`c!0`v1SzOn<&k8`HO{MBFX3V8fsE6=_&Ous66_6RN{migS_%!jIqK8Q5AWiei zS~Y%l6saY zWif^UoYNR1!*sj?q;p^uV2<#vo#WX0%o-g|-tlN)nw{L(p6ux8@f_32(+)qqb`6{C z>`+BrRe=-{%ju?4M$+~JXd{wL#5r1P#Imp<%P1O!x(Fav5fG4q0W>uk=!y(ABE%#a z$7VpNu~lm(I*6@VU7OaQYm3REO2F;Rw5tjG<%%3doe^5?FltUX4T z71lOf&7zlVt>?p*<;H-hGEpd8tb`Jz(rnE@*ZC2nGJa@)P)eL*5m(H7#|(y`N7{3g zM{|k;gZKjwi5WpLM7m)LHSzjiAgWFu8i00= z(7m7k5XIbm-0buv=uPB4rpFj;pmMdIk<3>xXapQa`>Eo32}r9?si; z{o~It%y~~F6YZJSv0^&D{ST{`e&ghEcK6tgk9nJgWq;;UU)gvfa`MnG-@SC|{8zS} zzWk=dyY1}Ki-m>hhnnu+w*;-pT-H2v$KIdacI?1E-q|?%8^B%B+w7PxJ~2LiT%Ia| zi3O`SHGOmKeYfppn^sKxDShY_Z@BGqm!StIFJRERvDdUC{!~%__;~jhC#2NmzusEE z>5uPUKmAB>?4M}W5&w#X`wG*p_Rh$Yt)s!l^*f$b4!4f3n_Ra8Prv%=+uL71{@&ZK zckXMswfnBa=IQT(OP9R${`HqLi+V2kwzVts_cp%y;K;$ixTde^z|jqDM?SXn=9iz{ z$}B9L|I*Y+=fs=KZa6i4kI&rxi{DO6Onmi5+ML^Z(Mw0CW5w>`w$CS@5t@IWU-^Tl z2jqKS{MAL*Irg5>>Awx`ZfQv$y0z`ir!VA~!*^~U_4WvK!{pazM zn@+v=wTqX1V%tLX?$qw13m)6>=&r+8{p7RHy?irdZaHyR>8Vry-v7H56K|aE{rS!v z{>qlyANrxSVf?{owC^Mz|MFDVb0_)fu>+gg r2OclnU3zW#13Q`KgFUO8-dyys_Lm(uZ67tle`v|h?!=xoo4@rRRLR5c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_breaker_side.png b/src/main/resources/assets/actuallyadditions/textures/block/block_breaker_side.png new file mode 100644 index 0000000000000000000000000000000000000000..3302044787ecc20c8cf801777d0bc402858578cd GIT binary patch literal 3530 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 bS5x<%*!|1Xm!6T6KNr=xg~~^>$6o#i!IvMK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_2.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8ee12c13e714d918c2a7a6a4f0a811f695d765 GIT binary patch literal 3368 zcmcInYitxn96uXGDVAU%2qcDeF+8GsJNvrZT{*DyO54OMO?#wmVhpo0v)6^Y-DP*% zyY`#?VB!P6U`RB^L_V1i5itfIfYxuu1SJ7Kv@seIq(l)DG!YYvv-j9u^-3F&&E4Ma z%zyrm-~8q`b1(Mxbhb2aY>vfZE!|z|KKi>l{64sx-Z$O64e8Gcw`<6c#a6BfzxT!7 zcym2{n6a{h!C>YY9XW+K#EwDYrGiVXW3e5(N-jhPNx&E+XW1$C#;2dLjD=I|fRX_j zx19`IUE?0^6j*?Ct6i5J>QXy~qdMU-0{p$2NZ01>}Y!Vzyv29^M zW-!ysv^ySQ5^=yG07NFK#f5|{tLl@C2t>exBrgC?6m^i$6^W@{ERE)2Q}0Xfsm7vj zDRwvrT%G5O#bUfD#T_rl3!0|!K;%V{qZXV$W(Tmu+5YC5hcxk#XSspp*i7gV8qP?N zVriz85(;kQ*7mC~QNZ{Tba^2T!jj5{7)5sOh?g%1$A~9+QXqEVQ(Gajb%&k6@rRuS zTu0sW0#Il(nJ7lXTndFKgdcQ_(lV-mG_>}!V=m$Qi0_Peh;)q7G&k3(@q<1xhvyQ8 zQ}bwWV3`Yy4SVJlMM~BJreRNH>gw$tfq~;?9VcJoPHzoGMik?K**0L=*eUwk!y2js zNE!wt#fC)UD2pVJ6=WR<^z%e`2NlzdgDrEc-c;ZOIV%EPqSn$pQ_5lt1GuO$M!M;E z1xV+>D!?4!T|37z(ah@YPTuioV49s&-`?Hc-s?H0m8TtkU*~S7yQ4iJXo&HkZ1}g3Dl2<1d}5W5RniKLQJa)X`xd$G$j}=#1va=91Q81AE`7ZML;hq2lT2A z8d{`(u6v(t(YX*=CL~q`{(h=)6lNN$+}3NANPaMFQDpo|5{derq4_;jfac(;mEJ}t z#ium&tMarP=BiJ5YiDDm4GjV$B~1=MS>rIE2tnBtIawj9kwlVc5OD_|Did{45xoU{ z5kZk8EE=3>DuC0HvdKXMDqI2ya#E0>f@P`BSJ`VNMgGpUl(k3ivclTNs#)}tLs33V zS#ETQDiejm#Y!++ZMGWHbt%NCxGfG7N{Krx;)j5Q&m18!8bvlOT~3 zu#D*%6bYAvf{YWGs92?IupvZ37Rb6lH%w3yum1v3)i)Z3c8<`!pTCP@5Rp_x#44wV zib>U#%9DXZRRgAmB`g>i8;y!-sKocU7_=w@7Mb*r7ZFJo1`QL>s^dUC&!QBVGUNWA zc#AS_X?w`O8F!B-sjO2Kx#9n*M3wh+1<5_(>MS2!^oE+VL=Mukj7~SiMYhPL2zSWn z(3^9&TV$vrWf(--(^UsTKU7-j2AG_0SS@rPsBkwm) z^sas3_VF3^k7X166Wim5-z}VY?6-Bdnp)02-IGdxG<9)mruFEB(a8a~^{JL)+qXR& zZ~5+;`^&9evp0QyGy976#kSu!{dzpc2j|AupIw#zo}E6udh6v*_kkalZ@Dt`{IxT! z=YKx+@mC)ldws*Q^iQuHnzb*jx}08iwdu?^Z(qMWIkoZI*_F@D#A1&gePrEMcFUei z16Nw@{jFDoq_!bD zy?1orXzu>CnFFWRH=R89$@y69)!DO0CRd(+d0*zkhbAwE|7E&6deSF$@1OV^4cl3` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_3.png new file mode 100644 index 0000000000000000000000000000000000000000..b603b48c99679c2dbe25b9aa2b1ab2c900eecdc5 GIT binary patch literal 3502 zcmcInd5qLl7%vNoKo*F~;qr$~F@h{_+P)ssmYs!VW?|Pb>t=V5T~zc<`?_11X=~fv z8PMRd9#J9!Di}nK@d$r-MNqs!0vZK@=pTkegBZmlM(|9GMtz-&L3i1WM>ErD-}k-m z_`Tovy*GEZw=J$6UpJnjsM^++Lqj7&>`KG zY^URnhiN&&0iEL@9aST|EQ*RUmxdhVST4%)9Dq>cWK9z2(!~&Oo?&VoiA5z}}8g1I6424Fo)6v zoInANF(HuvVUfV4cv0hc@~IE+Tv0XY7?!!JT9pU9n1Y-p2pSYmQza}mP=JP2HgwH& zyeuMXU}aGcW?j37p(`t^#hr}f5yvDtp?bVE9&h&?)5;Km-?4Zh-P#iDUx?&eS7EH(%HvE|!Xn7{#USKrN%!dz(tu9ERZhK$ zEQ(KP>X+KnLex`w%2290j4o*V8hNtOca~m zkhU-{34#IB0Gbj9)Tn3zltvPebzY3}0+I|-sIpbCS`3jrb1sG6qqSIJZmUXBbmHqO z@z8~KqanSxP{W&DA`g+>3wwTyF+C?sR|=XA92&W9#?lM4W&3TTv_n+jWQO$Pqy95P1O-J*E0_l+ z)*;{x(Ey4HF{wdbG-LxShJwlv{{`eT66yG78!Pt0t{8h)$$NI1BZ{5!#8=U9N)1`>eeHN^T|K%+)GiTGOdZG zlydhAoxDA;VDi?pj-B6faP0bR>2U+SSH6Wj~0cYOVN zLw()1%WK}gcl>oRrms76>xRxf<1%ei=bd{&{?UEU zuU-DhFYg`y>6-=CYH7->IUDz_`!sRe?l11S`XYNY)$;pvb!lNetY1PpR8rGo}N*+qVeF; z<{8Yu{(07fkB%;-7QDaW^-V&4Qe*4H@21^9@c4~2C+6nEe^jl_ZHZ?VUUSQz2nmN7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/block_canola_stage_4.png new file mode 100644 index 0000000000000000000000000000000000000000..3e7952698d58ad8f156044b52607f05beee9c757 GIT binary patch literal 3587 zcmcIneQXqE8sBOJ1gcz$$QivGhXXgJ|+EBwyzzf&f`{g+>VPvGZLyQ$p` z1g6#a->SftCuYOL7e=zpYfG$9R4WrCnw6r#e8vXtKw#05yiL?D>M<$WVVE)Y%%0a+ z#?WHy?V$vpup4Nn(X_^)tJbVcs%yGbS!0(hW)|fYFp!}hVe*-@=_>gcTd=FZvoGdY zrl8_=#n?LEA=8#+`si@jYgF}gDIZ4Y(m$}nYMv=id$TRbA zH%!gSxeNRpN)u?Dcr?cPL_)wKkxvSe!VB=Z!N2oG)r6%Pde2Bz0SQtP^NJ`aSUgV^ zSga9`jH|4vif%a>0&8GoNC)L?vx8+SE2}hEY0Ck}5S=(u-rUg8;#j(oh5@(r#(Ji? zu^}wT;V{BMp%88&p){MWM@*GA$73wy8Z-<|iKv<;>MBNBlt@SlOBfL%t0*Nz)d;3) zijZ)5e%w;CJ}dqC#RAnV6>JQLCt@iYQRNiUd8#5IBoP#)S_teComVB9@DWQ6RY6CT@Dx)j6QV&@J}ne510fN=5Myjv*yhtS zoh=F@n1>760bHd??c9)85$hgHI0I=ba z_VY)e0S&`dPQ4Bm#RZzWrS?=$I!aGzWAW%nrvOV;jOd6bl8iJS5F(O}krblQR74eV zisD6_-32Blz!dAg*F+}ddxfFVj z(q#C#^^~GmMSoL?hbgohg{Z}aQvG738e0+@qtJC?#3-80byA?j1&X++=32U!BMzx=pRLLsZ~o$MoZp z?h8YN#i*2uQUU1{%39DQ4Mk;4QG^JR7S?DKD!mNx4m@Me(pyk6CpTCLYN>i0^4vXD)}ve0yU!`m$XPKEQdx*X4Fpn6DOmN%Ybnf-RDJx zBx8f7QO6j;fss6`guoOS_y6%XF5@P)hx~U@{=|z^=u^dZ!~L)m72o4UB$xTsSva~V zqxGDLauCik3T%kuY>^Xb+&-gyYu1n5BKfMLXOwJd@&u>V*&e8WrS_)blzTL%v3 zHQc`Afk4&%=6GE)x_u(2k z|KaL|O*NglJIu#sKK|6RkF4n3)w6BhZ=bpDXX_63*Ist~g|5Jx)21i^3|sYAKU;2uj8^cgQrf^gJ||Y2c|UA&2QXy6<2%nOPhDTadxA0 zpY>{W-Mg>!w@>bQ?z2-Tp8nJ4ed|BpclG_#=b+PDuROBjqJDh%oZYykFK_@KuD$Hb zy&qJW^MA3cZ{G4l`mYD}NO%4H?DJh4{cy9*|NFyFXF-66Rc3(H z_nv!aMa{8++BZX0{5A7VeZ1+_*5tCl#-S_kd3gTP#X~ntK6LB#!7V2Tk9nJ?^i4XK z`E>2px0Yt!dnNGa2gKEFN3|n;9~&on7Jl$#?-TUPZ_Z6!yKTv?;Eo+PU4!k(gH8YV x<`A-04?g;Fw_Zd@7PS%3Ha{{bon%lZHS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_1.png b/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_1.png new file mode 100644 index 0000000000000000000000000000000000000000..95f81a2141ab5107ffca5f83c2dc5b4e3e1ef5cc GIT binary patch literal 3227 zcmcgvON`q@7*2&)m7)ryUQiLjaz#Z26WilQVykJ{CfjZVX;<4+-94Z(o*5_ZCbqG? zn`{qIfmEpy2qX?jh#MD#5JxT`Kpc=bapHtP+<+6MJ#c8z@{gT(vt`q)cv*>K&;0X0 zzWL^x$@QhPXAT}Xe4tb+9c(T(mf`nd@!dZM_s4H-5%_r^T3k&^r3Vj*@4nJI?>+(# zKl|;Kbfxv2L&JWVu+Zh@VLt-vQt9}~VMOQ}PbHUk{GcZP`pM_A!d<$||C&ilvHO)-1!QR-cxzid99eD4L2ec2vtTb!l|T5G`h&v)nj6iUn^qxtpeu zqbP&HpghpaVcbzP+qM-ID;OiNK*?s1k|7F`BV!K@p3vBjQa=nN;gPuEdRmhq)4YU! zRJaY25ljG>G9;0rl~qwvX2@t^7p=#=EI6YI@9{nl(gbX^!ZzxLX_$1wDXxp|9RUE^ zR;!4yYcBnM5h6(!HlU0VAiG*8?ahcQ%RC9!W6BpcAk8D=YLaxBZ{xX#;b2}2PJM66 zSkbeiC_eP3n2MglG;-=OCutbB!>~8z&e9k~3FERVJ$ca&SU5YWqLC@ZL-dMpZTp$NqWo=9TkoQ&^J|L6iNm!FTt2=u@fVSZpmp%`Zk^oJUkvyFuozYXzKe0Q~ zu1!>`S3IN=!$wR6goxo`WSG3_R;Z3$j*lxsnZQLZdQ*LI&D3>BMA)KH)3#ny0ATyOvCQoJC*MwmHh;Jb$ssN6O^JAvB*TDi$ke@~GM0g|2%e zM(%ddr8JaC z6!mH~9S(cH@(+rknyOb!6EwiB7zmUKBin_tY~7>O02R+A{h)5$JKEYoPot-arlOp z;`q)3Shq18&VTvrP51*)T5UGw+tt_Uovp2t_dRj-y8QinbFUqK=EHs89{Tde(F>o> zwa@Lpy>;umOE;gt0rzXaU;5##@QXhl{pPpJN4r;#-BzwWbnc}e&8zpn-8l2X*IRE~ jdRc#8yYtmrsr1v$$DV!l^4!Pb??ZFpY~!O-FTC<6^Jf=$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_2.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b88246c356a2d5f933ff732e09a2797f78a401 GIT binary patch literal 3366 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 JH-F8he*myXfJy)W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_4.png new file mode 100644 index 0000000000000000000000000000000000000000..5faa9c13b124cb015e8f68f91a67e3eaa84fbaba GIT binary patch literal 3592 zcmcgvdu$xV9lnr~f{P^{jbsueuQv$N!rZ=hZ#TXK+h^iyIAfecv3bw!%-Sp8-L7}n zzO(yB0tHF~5mpjFB&CfK(f|z&E+Qh~kw6|KfUwliLV}?*5-J7?C@$|d>Fhl=7iz~= zX?ybB?aln=_xOI_d^7$l=lbunW|7a@@e`1Ioo%;tx}ney zF7V$oLhF86Lmu8YlO0}1;wnwIGGU0U6b|PzHn9$c>KEm0sP|xxO5rXu8>K&aW*1GF zC`vDr5^Tb5!rf-epo5nVwkGw#9$iKBqJ>m_ULy`N*n?C)lg_$YK1vt-YUJ4;W@xHl z;`K!720tLxk!YiuEC*9^m<2k^@|2>6Iaw4Vk;^Hb)%zud%Ww2~_DtlV}by zwD#DQrC8)wlvMo7JH^K$y$Hrl%jCnoW#_h2~2IR$-&UGoTO!?%iL)zqe$_5n5E_~ zGqcFbxj*u2C@sJ-=;0{s6A2I&32c%RHI^fPm-(M;(KKNp(-^2Unst+8oO;(`3SJU))H= zo10`#m1V$(xk9>$gci@b9?a@E9*feX*05=*Evzf2m_?EJm6W81t}IGz!@-wC0-o~5)e3&m8x?Fz>vi}#wvt}ROQn`BW_4a(BFtrx;)t7(=**y z98`Fgyoel-S7}k_6!Ryiug#jI7d%b*#45tSlxQ4*nZzoLwV8RG?ueNL8Ml~(TshNu z>I@N}lW>(wZy-%^2~FLSJT=0u(o@=8I5E;G6|%aZ7=VSM3J~k}O*D8QN;r~Ibb(J{ zzMk=wiMS|=-lV=TCkX=LQ-C)l7O09y+Mj|FkV!WcPJj{;g$iEbTB z@j^sQMKA{ptn+|FA_5VW$3TIch-8E#C<4n6e+wcm$%-0B4$MHj{u78w?bEwqwhNQ9 zpZN~Or~(wQ&PgDmkcw186hK6fc_2f`8VW?bf`|_Od%q`C;{S0m`jiZqqUk;_0+LJ) z8p4iQ!GTJi1u0Mk#{GBVP06_Fogx4CCKYt5C^yWvm8keTRz&hje|HwHF4{zzGhGgn zyNpH-#3_!*=?J&aXy2RlU5`j#MG7!fTvy9O+Pvnuo~75+>|efR?fQ9luD-jrW`1fz?QJ`sTGCr};gbjUJxVnm{2(=J z$CBP1KO9?rZsUfYgZB@k_`!E)U$pmyi`(X{7XRdItJ~+U%3pM3@95};#*utv*I(;L z_Iy+Ixb%SPKCtn`B}2K(AIfcAUUk>lSqpYZZ$CS{V$K!E?mwIA|J$(>>YKkmbfo&6 z*F$T!9f^2*ooUoXDn zjjj8S|6{K6#G305-M1;+`j?@Phkt&d@{&zlkM6!jk}tjF!J*xEzc{zx; z<1_8Z-w*s|_0f&V-fKQj&sg!+%~v0O;){JRj|hVg$;zT%opH|%q1)-$EOWebaI|^T z;Xmy8X30lKFt_vjL%s90KR&YJGc@zTp*44WaMPA*>YW=qYxb;vs&4E$FbAUE^N;t- z-+S$)>-KM%IdWI1?a21VPhUQE{wMmAxueRP$6vv7hqjLU|EtBDTVua#yydok0f8gc AsQ>@~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/block_coffee_stage_5.png new file mode 100644 index 0000000000000000000000000000000000000000..19e5b2fe93de23cdbfa76cb1156335f0b16c6b83 GIT binary patch literal 3759 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 F{09!MFRlOp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_dropper_front.png b/src/main/resources/assets/actuallyadditions/textures/block/block_dropper_front.png new file mode 100644 index 0000000000000000000000000000000000000000..7d9ad4da21eb8faf21885967a19f644e30f23502 GIT binary patch literal 3579 zcmcIn4Qv!u9v{F{M7XPpMl``;0I!_P&gahVOuB`3x6oA=n|877nV!6P^QJqpJ2TEq zyIa&?JjH;Xh!BlHqTvwn0}U~!QI6tA4vYo~w#IPelpG;ZIa0+yf(YE3{TLQ)Y2(La zcXsBz|NDRZ-tYb1+m$Vg7EYOT{Um}QrX-sat@yXb|4tl_?@z4BNciV+ySdXPh%2u4 zzvGDY8?VC;UmEESuOoGv0xT@A(u5>r4XZveii)eH!~DjH1U?k zs0KeE*^z1?>eju46Z>2Wl;{9o{Md{z}C)K zp5qcP55*{-NHk`Vz@|A-VLAM{*}tod5sf!1ZXI6IxR;j63 zfX>5JDZK$tii>ILmgT7tbeEs9M*Z+et1@7r5YcHCh%&9Q7$G3)JS~P%REnmr`hVBXSA&YXO09cwR=r2~JQRQZ17`l#)7$vv)48oMS$RaM8xt8wbfrA>lF^@(S z31-CPEwdLnRq5Nn0eJU9jvJ$N$I6kxf+jtS1h$=uc?)HhyYG%#5gYKy*Na? z5Ea!Z;%FT~p5`=BqoXp9=m_9MP0~*!g0WGT{qN4z76hNYcA|MimT4cClhE?LfC1#gI>Y>{ITZlBSK;R+{h`*nbQT-}ogsz9SQ_TL&M`_fNTZ zIYEqjE176W*RJVl-L>@K{HbTNU2B>eLgT}S4lQ}&kwq&SCl((2iE%^VJR0zu0;D^ZboNU3+`F z4!$w2<=VzWv$t+i|MBMoZ|vQ??xQ2e?Pz9wZ{759ne|(m7jHz*9DVz--*3C)=2TnP zXXieAtv>ccf8U+={qSyo@9T4~Ze;h|v#IuLPid&RZpD>*wxiC5nvSQg+4JqmlY4i3 zck=!JZNC5W5WWA3fv={XTlp`w;jM$m#xEg`*S$IS(N|;p4sUF~VfW$f?=?=`virY% z(}|Byop`g2*l>m+?y7%w@*{Dge@NI(48E+kul;1k_GhPmMwrY0l9p%Bd>np!N?(2I zzWxJu)hvEx=%%$t1`eM-c68g_TW_87U0r1Igm+F{RtvWG&m4HV`-|k2^X2DjS3Nmv z+TRus-=8^qWZGr+@_$;=210+m^Y8n&etP%d`?n2TQnO;l&M!}&-L*C~FqN72aB|Kx z_}6zI2zgzv9UtT-$FJJf9)5DxjQMM3t$a@#TK)Wg%oo;8eX(}ZO9Pj#+Elye-$zeu rUibLnn%lRv-g5anV(NDf)$H3ecx=m#`kjLR_bl18DDi6Jk_Z0}Sj)#Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_dropper_side.png b/src/main/resources/assets/actuallyadditions/textures/block/block_dropper_side.png new file mode 100644 index 0000000000000000000000000000000000000000..199cdbfe028940734571a3b5cdaf6d2a3d3682eb GIT binary patch literal 3530 zcmcIn3yjo67+%B}L=7mQfMRL|g-ExZw)<$q0(ZM`tg>+I?S(y}3DeGWuiS21+uq$m zz#J+l7^4tHgZPS~F)Be+e4;VDL=ucaL{Tt`dWsr|Q9+2t=|0M$cihECv)yfH{`nu@ zeDlrhipE(D7Y!agI1mV2l$?=Bli#7qe4? zZ}m*p&8B9`s#yp^WGXmVELg-k5STQjXhF3NyOe@+x)Gy~zVS9q=_p3e4W+o0700dm zj72tXS~M%8E^1RHL{FJaO)AR7K>@pvDi-pFBNtsm6)c6N3KJB6TW=U5;~63g){&ojh=aTXdbEHZ|3b=5-xJF2Z)u5KEX=MgGqyBniP zrsWa}mhaYZDliei*dnx85ahg)N`^@F?W}e?UkZ*?7UyvR8?Hlafp2TIny%@zn!UL8 zyUz$fpiQOx7(M1vDEJ{9cUlK2qXI~e)=p-jh1oQA%ywJF(>h3+S68cX+%!IoXFrA$ zbAPa_YrTy1dd?^c7xi9Dy&m7xlH)dpu4!jXGhgLSV--b;=Yt$Iey(mHv(uU2)leCL z6VSym+9MJ}SR`;6Aj%vdpXZ#(-VLW~$fB13MGQ9x8;5Dh8s)Tu7 zk^no>7d%aQ#45wzL^O`TOk$PV8ucR1XA?R>#wjNeuI*_#vxf-KX}GGT*O5ta z2u+=eJk`To zjSSWDM5*3l#fYvn>pjr5f5a%e?QF$_5@%V&Wi!Xr+)ilYx*XwApCZBbn!IUrV7n%L z3)+zEUf6bGv}T(H%3siwYf{j%^1520E!$zB$`0YfN%tDZfgNXuh!>)w62*Ygu*x$4 ziHM0xJZ2&gh$xJ36h&bb;=e!yGMp#_B3@io=l%&qmFZJkp^?L6?`Qu-F$ic7V@+j9 zO&X(!C2AsxfjrQ{5nhF)sGf@HQHlTOV$?nv(8r{EyzoiVJ7@^odJP9^dFH1;l^FNm z#OsrB{o6zSz9|3aNh;}7S#H?BDpC18QATpQw>nEl7r7_R=`RP#Swy=uaa2X?O?KX^KlAAaQh+@9ZrA@jx2qts}3bMu7t*+;r}Jorie zBQdr1sgLGemDnrR4{9sS+;Tkq-XF_x_r;_J57U)z4u+#$1% ze79fQ+dSl`daS$o_}f$44z`a8o&5dRRLkUZPW*iG;*kSS+!;Ic%gVsX38U0?&a?Yg zitC)MU);O+vD@D1T993X0|z$Wefj$PR}Ja9W$@m4!j3h&$BnV}9Nskb)6L^PcqqG7 zx-7Heyh&HybE=`~hMkAO_+?{{#{h~eZ8!C!Se%9%cWiEBkbeg Who##V$ai@Ewvy9kB{tO0zx7WlU#!aj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_1.png b/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b25a72fa91814cc65b2e5d7500d3fe9b5d3440f2 GIT binary patch literal 3246 zcmcInO>f*p7+w^qg3?MwNC@?U<*HH<%z8Zjwz`edY}!O(OO$Ta^nmDiJl?gsYrD3S z-SpIQKvaSQy%eD$4xG3kZlH32@)r;{Dsd_W1RN@H0V%v=?>d{3bR$Yf*-XP+0Jr)nSGdJ!J( zhwasTwe_0I;(nd_vB&Gfegf9D+VR<8LfIvrOCIlpQA7UYtFL7#^c(VdqlH_^Jnx2! zS5kiV%9%F1a)~*_Ipw04jXde*M(=%t;kYgl3!}bb0VO$+FF+8 z&Cmdu7?=N_hmc{Mo?gI(r| zk!?lsVYrK_7^zGXcRuAbkJEM>_r}~=9-}A`QpeJ<^I_!2gY0Ed!)O9;(wsMBK_mn$ z(r{bVU97_2E8-iMrmffygN;d36{&igU?7}J%x$K?VxQ)8s zBTLoFy7O@_P9ZR4r%m=R&Cf5VaS--kAX_?shQ6y&4ST9%Bb!+ishaK}YHJ?SOilvJupJ)wI4YvtF_5O}26C7h zAWktSoI8~I;78EH1viiq6&tZ3k2_ZdJ$q|qr$sO{kOOF=Nf)M!Zw;S|LRbqTOM+M> z{AWSq0A`3)^eu-&-dk;kfJ{~4mJIt+F2ZqZ6WnQ{FXBM%Nz=5z%bjv$=`_&InR{-AA@VII^g!`=-xr-=<@TAA(42 zW8GEZz{F$m`Y#ZTmXCF5)ZuXUE00l(W%`%}CPB6bTC5qm29n@&WLuu^nam0T8thce zj!OK5i(yk4FlEsNFDjDk4w}!?aDoGqJgZWW3da3E@uo6vZ)eEAH{}yvq(Y}kxltZg zqVm02B6&*e&f@Cg?xZ<;f1Qm9A)!^CxU+y!@F@mO8H z;ibC1^9c5B3YYWWkNk84F7~~p=3Lu;kNv&5IXiRo>UH_u4>})QzFn*R_U#MbUBy4VDgL8aS~%1E?BvC_{s9is8i)V@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_2.png new file mode 100644 index 0000000000000000000000000000000000000000..7582638b1cf13b390e58beca48c6ef8d15413519 GIT binary patch literal 3261 zcmcgvU5MO79A6P?ZK+r)R{CN{DSp)1B$I5uxb5}2d+n{b^|)^7^+lY_OzuK=lQhZQ z?p1{LK=GjBgF;cRqWJD}(FZFc^g;1W5bT5CgW!XrJ{HgaY<6>d^{#hVHSA`Sng9Gh ze)F5(%&ttIKDBSpp*^KiX?%sP+bwtXa+J&|n&UW%iWQ6zSfF$%%t#M~>EWS=I!|d5#90u9lJH2pXd$c0kZE2* zCobHE=>R4GOzDwW(aNeQsc*<=VHYnX?S61Z72f6@9%d=nYK3h)A7xQGA8p~f=-vZ!iTGGm?>QjTv?QDCrQGgP=p^ zxDtnRvQ*5hTZ`IJ0)ZhreYCw%t4$}7AGDz(ojG+vYE0Hl%`r`c%UVC(X47qiX+}cI z8}+ITwU&c`xi-hPWmy<`6`vu~G6*7`?ICVk6~m{Pa+MFq*CV-v_Fc(;s z1hI1X&w$1O%n+;JHXZbMd$t|`GHITKIofl6V-E<>I$XojCty-iplLdgrxRpu@YD{D zZH~0(5S8kdk5mCNQvo4j_!t=#ZhIEhvB&Y4B9sYS&}RgkMGWNpu{~Eac-7Ie%2)kpO^z4Z7UMWmdQuqB2Pxrk4Zvc_u@%fmHi~@NX3Gd zvPdFv+zx1;w#s7220KInr@UpHlq}vGBCOknXLAktoMNOggCX0&99cv&n8~=!Y%+xS zE{L?2YPcF~nCeix{s}~b>7(-`oa3vNco511x`q}a4;b8wtqdw8H-=ufe*2W(^a(P9*{n4(ghmPO6{K0`k zYtijbzKnnV7QGHH_S;AImRBD6uz7X=LGRC_w_f#nzrOL-mCu*!2XB16vi8l*n>XX| zy7a}T`d2sJ`N2GX>qq7A)y`voyubgNyZX}Q@1AA9T^mz&zkBDkhgO%re`@v0?$RB8 VWcl%nb|(H{G$v2iKR)sD@?ZZsC0YOg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_3.png new file mode 100644 index 0000000000000000000000000000000000000000..9ce445ee2e0ce00f40ff8dfbd52bcfd4d4065022 GIT binary patch literal 3390 zcmcgvYitxn96uo_U?3!rphUyE^?|{;ectUOJ+SQ+dgx&-r(ByznBARiH@&-EcDHxe zMguk)f?7UEqJ~I_DKQ$1h6Lk_h>14vL5LbYm>_C25s}~vBtbFy-+OGY*wV(==5B9y z=0E?(Z+`QexgDMB*Djd9Y*aPtYwv zKq{N=q}ptkQ1K{>be82QNr`fCQIzGoD4yk6hLsqOMLe&vaWy7TwTp&mu3@TO$u+fD z@Rp$aeBV(Src^3LOG4Ckdl^nq6o%y)o=0GTyupHx%c$Tr)jcGMr@NNpTXum8JYvlr z@Dns-S}h^(gl-F74JH7LDPxD>qHIu7#n8}0J7>VnRe~EjLvkcf3cd%nTxjd`*}m=d z*;BXfGt9qe$_5l%-Z|v#=USi2{7(v8Q`t4+zjWT=mjh zU{XAwsaKPyR@_^A%2}%>M_N-bs|%8eSS%{YU;!a4nmiI?MAjr-;5EWGGl4RJi>l~N z>5FhNK`?j?@n(!giX@r{YdD7DIwwk;fMbRzH2A7`t)|Fay_Smhs2x^N+h8q=4P;B0 z4^@#H73x^|ul7c}MD6n31PrB`Un6bnXehX~=Mr;Ov_;?*JI1zFT&!XcCB zJmL(|K(fLUBw(u3u?dMPbw#WNGIikER@BekH_~wNDa*v}P$iH~-nAma4yKC2d z@!Cz)mJ@INj)!AU9F*7X+B(uCqn)GQKWiL(TzxrvW+Xcr`KWvObBnWIJ-ksHan-Yz z4p1k@hMHS0{j}})(2miakJ9_TyrXCI)8)5E_Kkgv&gBlxiR}61__DFhv$tKgKbLwQ W>?!Yly|^p*hm&ewpM14-^YEWZY-dIQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_4.png new file mode 100644 index 0000000000000000000000000000000000000000..af5c686fdf586fc3c6cf9996c0110d5b903aab1e GIT binary patch literal 3487 zcmcIne{9rL96v|^!662iID$|L!7b41&+E0#ZaD4+8+hX~4mMQC-u1oSn%%Xf?Y0|g zME_wx3=#=3WEe0p4x$(n0W(n`NH7w@67?U!gs7MiNsK`P1_5917YA-^5ozvv?R($% z{qcF9_j&KO#2S}Po-}ik&*z)mP#KHBM4wkwGwlb^Odx+IZDDJluX=ID0%|*Qi3CdOMu`0V^J65T!w}gVh%!+t zjN0`2jW$}fu`#Z0Y*%GSF0LV}GYWQ)MlK*S>6GCpnGl)vtKes^nI?&>iQ66`YrTL( zOEgA=O&bxSpP^KS;fSE@XGKAfq(ubBa16}^X_lclPGLkPz!Uk4#L;Z1DNT{3`B?ZZ zM7FuErOpF26c|eA=cH-R@qMMLocGxPa>%?i!D^%mSP3SJ3 zqZp3Oi-TQV8)mH6b5BtyqYq>1^%PAlC2S+$ns(eYQw8qC3MdjB=Vyq@X5D~hms91{ zkRN~|z(pa_BNByK#4~YLP#6|}7J7FkXBsu3u6381vJ@-CIYtSv3NPMcidhVS3q~}C zs-l^88sIt5(;$gx%Se($ab}gUnKEr07-z?qwl{>sG27Ji6z*`EmMtL~>cS!`iz3DO z*=)MesM26KE-+No5DAgER==)8g#$bkG(n|;a!{fYvH++=kO@$105T|`X^3N_!uW`( zc6hAx#^)9&G*#^5Zh9hQk;o&Bf+E9Umx4qA72jY0LQZ3VBy)j+x0SYzH3Fncy?R+e z>`_gK94E^x1&|z|cvc8dvdU@{0u161k^z9YDvuTlc7sy_-a-tKg~k?-o~e#pV~}I; zh2;QW`9W((=)c>&+R*V_a3tXoD+m87tZ^7-94p%v(=#a5645a-PA&m!LQ;z)*5f&?t}q0ZLR^A;|I|00q9pSJrDTMf$Au&k7>W@$@z8Zf^@6yYR?jpKmM2Sdd1 zl8}%POKC{uC>9Ek!pja(LBI-7gh+xCC_sE4L~NW96c%roOhLT<3q<+pQ`>-%M0oF~ zAEFopWGTpTA|(PIt7}jYD2d@P*8^fgPN=M^u|pO!q!K^kV$=~CFv6sJyeN`nc+eoS z^%4%0@~oHwk!9Tf6K`b3jcO11_o95nla$q|oZQg&D^cz}l0$N-w>q;&7iB2T87&9# zSw_Jd;s{&hXoTBao}M@JVYf(6MY1rI99IiX_zdhl77yR}rFeWt241%|KAhK`IsUfK zH)dT!q&6IT(-ig`eHrcx&vsS&Fne z78{HyQu&0cPcOFa7?@(My0WPG>y$KO+U^A(h5tCQ;q;F$AG?0%*t8egJGXqX=fItD z%rjkYHT_h!qW^q0bEj#S?wO+V1hb53bMfRi10T-E{G|vf`Jm z*XAy-s<^hm_viN6048e zx6j_x#(l$2J$1Nz{?4Q8L+K;dtyimdCcoO#ocv^c@5Dag%sWQq&LsAHi~#-n#@~45 z<_}N!`p(V7&8dYwtIM|D`fdsw``-LZ6*sn3k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/block_flax_stage_5.png new file mode 100644 index 0000000000000000000000000000000000000000..8ced446d67832d2bbc2aa7ded2fa7f21d3798e97 GIT binary patch literal 3615 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_greenhouse_glass.png b/src/main/resources/assets/actuallyadditions/textures/block/block_greenhouse_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..25ee3e6af52d99b1627826443f5d94c6314f6728 GIT binary patch literal 3365 zcmcInYitxn96uYyfDVd95pfI}uasS89gDRst+)uUrvYcsqGhM~Uk@GTIg6zEzC;e@ z+zvWmb#3ry?}pWRykR}o2)}d**H+P)gE9>eS1FflU$3P3s$ZQwhs^@dRZW8RX}&!S z$Q5$kT!-UPPK`r=A(XhJ78g}TNu?HZ5|p3-lY$6=BUWxVj(=4-dzO<+$S&1yR#90ZM`-0cHXG5j#K?VEgkM9x~L&p5+FXV{@TLWH^IC znrE5TN+`RLTidV0!~hd2$Q8sm3`?pS5**pNgI=i`oM3^LXqno9&uqoW)*WyH#~*Me zaUFG!3&5bw<)Ro9=29+4A^f0oh?P+XWI}5{KjKoMhx*Q-hiT^!OLKms8b9cvV|Y$u zI5Uq12bMX>*sy0@QM6)BVjA{Drmo)MQ4}~{-f>C|?sPX$t(b4TWrd47ce$UF~T(+}A6*W}_Qe3R2 zo6G50+YgY9X*QGQS*>x)B04sbB83`TDyAUm+cgxcKGKfZ?v&=_2e(%adj z_>880U7nVsV*ROPEtwc;LqibDNfSV%Xn;V55K>GDC<&S}l311uDzyorGBFo5(VNs4 z6%(>dB!h7v0fClOOn?lO04f%hq$r~VQRF6HRj;)ag)7%m)gHae3TqpwXVFWait^#A za-$<$nGZ;o5Z7(t&O(_z>q{%z>5cQhU zcaewK?nOO6&6}Q6=As471rCQ?w`AceZG|D5)OUyoPJYrjJ{r0*M3S6Rj1(1tNwEY( z60T@Xq9BPxg{Xw4ND4I|z6>HU4;5Wx8zyXs*MEViK7Duq*+t6se&H&LK^Phki%iBe zr~*S)5YS{f0ZdaiG*!ezBy^%;CRE~UTnwI)0aHwR$cu<1lY>U6XEkx4nP*W7T$OSE zPrNA^H@!XN-;44ZPf}HOby8u;p(g&UG#}GXSy6@XBnMsh*NBl(-H2F z(V;izYPZNxMXE3~9akGo>E&DO2Q4(HNc?{u<*{h4g0J)e4c_s$Py zABA%|4}VKGZP|8eE}3`BtuJkz_hBq|s!O@Z(HlPB^X!bHEql1p7UPZYpMU+K-DLEc za~q5I(0(b`d*ae_i91f7+h@JkzxFoz_BnX0HTFdB_KVxjq;BtAv+UIcu`h%4jQoN> zzH5yQ9K7%09ltGm>(jw)KkmHuc;Bi^KO{feeB&nv&1JDdd`Dl)D=$8Iq$PIz7f?9T zxAE!RuH4tZUtF}VYsYzT{kvs&OK(rVoSHBt8OXnBE^XE_RX8_$nMN^X4>5n zRKR$mAcA@)RR?) zg-D-=r6J4mq+jxIK2Zz=#*#eCvkdEJIF{ylnf1wDfy})q9L-Wxxgk`Oi-ms$skq~q zGQ*@&DNjo97*;dGNs`2{Jj3%ewxI2H-2rJ@w@2kYgpds_&2%(FCtZ&qX0$p%3TK)v zA!!!e>UIt$3>cFJCc}AHx1@}r0t*uZcN>of~hH2SqM0W6*Y`Ro;&q<6iJ@Gq?&dOCr!mw~)oSjfS9pO5A}TqfN} zL=Nk=19XVOp&*58^=O(RLkNK1$0M5cLr8mBQKcnO3eY@|R2C>c0f->KK4idFmzD1N zY=bHW#6C`^C-B|?s|W&(M6W=L0Wm;JoP=mU=ND8#5PcHs&3l_pbqS&jOmEvX< z^YOeSaWp`ZmlinDOG}VbX#`lrBP0Q!;Hq3&$k+`|3Al|Ir1FDJEi*+D<0=z& zkrlmeeId>(2nrvgdDY9(k{@#b#DJIfK~D5@0`MxLP~>AqsF(-Nvy&+u0%Fg@70f zAdXfMz_cB^9|!bZ$|j+XZ}So zSWHC7;?Cze%t}5W3N(P;7>y+gDt=Xr;Xdf9m@bw0e=Y|0$bcR;-Q`7rB;A9iAWJLa zKrzn>DUcb){WtM?WL)pgkiRqTf8L~wPG#kW`KuCTe}}S2*0|l7xw^<*X-;oBi0?8o zJ`j62B6}m;E~8y<#=kuxT@}f|P;_0*58*qo`&hVq;~$0VJJNCATKICVU0M$aqR;wp zs4`l^gn;hSM2`w_|ddDaK9t>VFy+%e(crq((T8}&fRb$v)%qwJoV%Dz57m`n0?*! z-)HQ3@0s%DOFnAtygYo~?Uh5Tm!cKgR%zigciT@sd+7U)ZF>%!{O!n;Q*Yk1Ff?-M zwk!UC&+oeTcQep$Be4X1D6NG1e!gSK$Mb%jy?V`(2M@jU%UgphN?O*OB8ZN@bB=WG zIpma*CFg7|o72|#-QjOm)pYbFX5U5}*>Pg$*Po?oKaG~mJ^bZ22L`>+cXG@8O|iLK z?&>_Y%o888V(Z%VV+U+J{`jQp%U(JD$-~R8Y3NsPj1E6IcAL6x*qo#3YwvsG;#8-8 zaYfmk%j#C{x_R=Tb;;osBes0TmCU=%|M&sv$y-YsujV#ixw!wxN1pxs>qG1Ucwy4- zT|0JE#ZvU>W^wORi+=iT!*x5CuUb_;iK(A5Wy9_r@#Rab=?|w*jDDzrNObJ3xcb-O ZgTr5)SpD1$5%)i{aCKd1^@JJo{shva#(n?* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_placer_side.png b/src/main/resources/assets/actuallyadditions/textures/block/block_placer_side.png new file mode 100644 index 0000000000000000000000000000000000000000..b0cd9cc1a858d1ff30567efb259860536b902b11 GIT binary patch literal 3527 zcmcIn3v3ic7+z4J@=yYr5Tmdx#uR04-@CUfS1i3kD;$>gkd~lvc6YX2d$)V;Zrdw@ z3PBBsqSC~~cT`f;U@K4?AN7$SXpFCDlqMub6Ga19MI%IB&fbdyTiS?h?)G+P{`nu@ zeDlrR`kKWHCXTym96=BhtE-~5_;*t9Eg6mPk3QBU;h#%WRSh0NjGq#GM-fjxJrzIv zY{l#S`q&~>cakA!I2sD2lPPRX5Oe0HQ&4Y4KB=Kb%Z^Y3Z@)*8mJy+ri7_UYsz6Ov z)k+uDty~<}S2pX4LCq~A=cHBaAc=fPrjrTVQ_~SD<5$JcK{HK}856%bLX`&r$@*9g zS>d>dltK*98HOWeCB#aC5Dw2KIfi3sMy6Q?aGc6Ws>qYMi^9=d!&Gad^K-HATZC%z z{gg`6ZEbC#Ha_IIjWnw$3e9jd#{p~syms4%X<&OZ^B$te(_Jg&TaHZz9--#6_z?zGV(EHt0E{D3rE_Fb#SNrYW_;MbLNLxZ@=9+^NZZS6K4gLVe#jN;Lc=CV~$~&?Zu`nV1zh_EhLo_&M?I+HlPoOH8ynB zblfDwb6_Q5BcfAwBSjWwR;_Rnj*A21?D*pL>WYdQ*Dqm80AZce0B4FY%(9wdN!)(7-Vv}7A)j=>j} z1AOHMH4M{#x_hZ@;kn=_G9XqK{yMC27-k$R(^g}pQKCL-VPw2)5>jzb!YA|Y|K3+tg^w8))dI-ylesn3JNe7j1Uw|4hSL&YqHLB8sg^Afihti zS9;`_l{aD@4J#7#kjXoC zD{_m{PeB*r-3z&1gfd+xNfs6~={qD$r4p8&p)K8N8@U~#04FtM91pgh8zPPm3tAYl zz(hI+SVJ&CSm6+mAuAY?fx<=@<{>@{A~wzlDvLKvCNEz91)|*a=}pjXM0oF~&!ZTm ziwq-j22c<$16~%eMj4U}Boj%dW{9$E%7Ya%s1je`V)S7dFwCR}yeN=lXwVGgT16Zv z=2;;HGQ+t4C*H7(8`&Q6??rimCn=*-S-GLlR-){CG>hc?V0C7WF6v;KGg1!Xvy6&2 z#9_9`kqCFd=)jwEzFTCVA{iKpj;r}5d1BY54I@PbePLPCuTW7}$TaT2* z>c%Ykcq6-Z&-VUANqnhzMd*{s@7ujo=KU#m_Z@9{u~>S+5P$DK7jZyZqX{PV<)-YxW~eSd$O9!)s!_U(#wl|294<6dZ8 z_w8NPGuJWGHhs)r^YHxm%r0 zb;*qG>zC~Q>X)7O3O&C1O#S-J+Qut7C+?bh?DfzS3!9VA?(f+1>dtRQf3$t$8ull7 Z#>#{BZ@sna#o(`2b>-sdYxC|{`wuV)t$P3f literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_1.png b/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a7c7b57baa2cc53c9626a92fccd864a849db96e8 GIT binary patch literal 3250 zcmcInPpI5P99|Jhtt}MvP&~16$eeGLt>*KxEzMgcFnd}SQ&7?`* z+kHi-cu=bK&&5meU=h3&ym$~1vFN3U*pqlFcoDpaN);&<>u-|XynS`I`>-}_c9WUk z{Qi9N%{Q~>7f&4DvuppZQmM43xzJdG-@W4AxdXlr+_+8P=b>ofR8lHE{D`<8C|!JS zA3XdNv{%xV)-#UBdu2ko%gTdZ1lFa}p(BHcc&Aw^xvUd}HTjp%zL2GW*5s3wmfDKy zY&BRo8?)uJC)(cG)1FP`BZs9!0|y-RSW2WpuNx-LpeAR29e5VaiY#R&>FJt0Cjv?< ztwpKMVJXDE)rF+}F!I?kJjV+lq=6j1gF%WFt(;0ENlHk%tCLyf}!`fQORsNL;>_)?~;u zFQFF|Zo^~<69A?RNTg_GRg{z&Qm?R!*5Ym!oO%lDvK|Z51Z=g!Hd^H=PgeO9*G2c1 z003>PRm7N>ORraiNYeRrC}Rl7MC+uz5iwpFAmQ7!F_!lCqjC zh=hPey4uzZN7dl-l=xP2(-xUfmRvvB|#LAv8!MOG9%dajAFZEJ`yyMlDh zs36#4u5F&<;kx^lmTlIA8GJHr8$^cB#OF$m(f;P59x4+DBzT*#!1Nf-66udWw;j8kk34fG-^;}*_fd!(F|%*W>Jfb zAie`4t*si41{?ET6;6l3}o%k~Tl>9$Le!Jru11tB1~Vp_Vc zLZ>~cn2Ab!pNsKkGGNA}3tki?nGPCdaWKY#ah??^NEze)pLjDFx4k{&-;44-Pg15+ zx!fpsDpCI4$dNoIR%do}aVBZbb~y-V83#7R8C&Fbgj+CLc;olFMG6(kU>G~Dj+)>M zEFO!)H@pjk&h{q|pbM@!% zDBQQMUAb~)@A8Kis-KX3d*6BNuXFKlYp?#PoXa-dov(j<>FTA+oyN6qKmGjT?zj25 zo66;{zxws>AC(<*XUxp*rJKLMG57qtubqK`kN#1*e&FEuZ@uv4Zt<_8Ie((@(a{%Q F`3FZIBy|7) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_2.png new file mode 100644 index 0000000000000000000000000000000000000000..74505fdc6b076d02acb6f6dedc631adc0960fb67 GIT binary patch literal 3366 zcmcgvTWl0n7~UcQT|`NEF(5J-0)fEUx$j)U0%f$w;5^AEps2DLkm>AOsABYbSFeJo~=mQ2YXbka!#zaN^XD`z&wzLs-vO7C- z&VT;PcfRwTvxj=Rw=GUCOC}PD#rdvW5q_6M-@6yUedUcmG5p-)b@c^_#G<9qw=Hq( zwFltgYrE7N_7=8lhFeKt)743;TJgX-k=VGo>S1G$gp^MDZ6`y2H}Nq|*=B~`DHYg) zmn8#s*O*UsjCGfcu|Y#M>CKy{ja3aCR7i-aYNhN1S~Wx0{A%zVH8V6-GYJPXbbAz# z>Mit8S=T32I>jP`WqC?gQ(RgU6=eg(vpmbNGQ+Wm=QTF1NdnclXo%*UmR8JlHe$hB zh8_q*Ph*&ok&)DhkaGQghEr9QVR?q<5m=yL)CqAFIl-!?ha3qE-}XY=b*RWA*4?2n zLqn$Z5-MKo)(ILg0booOdkmLiqmpWdrV-nDLw>my+%yGOcw`8ubWMB!N5R8>C|x(p=T7CJ2jU63;md z2lIGvXj?Okje4dOMXL4;rcqC9>SBV`#q%kaTD#MBOm`$$7uC=h zKyo-F89E{o0u~8ui4!%JgU|Zt&elx}u4!ANt)?8}#8SjLPLtA8Oo7EF4)LtUrlDD` zU%@a3b_Mqn#&h~y}*~0z-B}YkNMM?eSg9E<;C9+_sgZTC9Ea3@JF*c#9h!z^Sfs}Bx5HobMu{WY;d8pnf^DJB-2XHk8 z_07^h+5MPf!(0Fa5wYsDHdUsXZV-lW;XlZ-+?< zfTlr1p0?ut##7neG(FO~idjRDEyQ9`MJ5XfVbS7|C=o@M4T0AQzmbWQ30%}gZ$@8) zlLW!!b;Mf|i&R;(5Z1AT(gr8WoPZ@$6k2@Myw+1>ZeL4Hd$cY)s%^B9#SXGJ&WEbW zjfRc-L>bXyB_`cywx^-%+=x+kJ2F6k61Q2zb+f>=!V&C~_I}{etRlh8n7r!@6Tc;W z5BnH)FX9Io+Vb5B6)$KibSdn4W!tFHmKk=;#tsp~NzWK3z{9tPh!+%5R|tnJV(^GF zMH4A1Pmqi`(M+2}F%{f|_!fw`5-VyPY?y3Qy#5J9jp;K6u+vXq?`Q6$7?lMkD+KX| zKoHA`BGS#Yg@CbyH5E>0MbN>&&-b)S{2v!%%*udSCOzUsOp=*FGl_4vaG;fEaSBw8 zasN)dSs6FCJ>-9%q?%6E<%YRciR$mUI+C5y>Z~1IwCOa5pCbq1ETh4OILj6}7vYW= z9eH!_bc>8sqy|IFakbe5XW-~DK77MVe0(PktXm%r=jW1_#^GRpHJ@uQDKA}rh3h`G zWl6{DkACpknZxVly$8sl-HCU-=gwbwd0w)3Ih#A(Mznzu?6);&Hm~iOP+2 z=Xb54*A|y0J9nKs`{~&)ZZ6GVesDq={B`B`JKHXN(nXHkwdD8w{)xA@CkofS6ASl9 z&)k3h%KUtnJ~8^`=)TqY?GHWQb@`94iZ{nz`0d*G!MBE=-2M1R``2E*c;(`y)$_+w zooA8{A3m1aY%i2QbboqkzIWo{zH6u4eFqoc#~k|{8yBQC$KO1@f*e`D;g@#~{`}*C x_fEb#n8`nV@`t1ME?>U;+tbPAE9Px#+tO~WW8WCQ6#bLQcXa38-@517zW^ICR22XK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_3.png new file mode 100644 index 0000000000000000000000000000000000000000..82fa704f96b96f6641cd3f717fb18f3deb40fa63 GIT binary patch literal 3391 zcmcIne{9rL96!|XYe5K#5Q)%~glx*Y_O-q1weA>WH`pcKIL9%z;2*xWuXlBKZP#|Y z+f2Yn{1t-+5;P!D2$JajK>p(oh=^!}#2`d4CK@$CA|xP2LyRV5zTS`Sh8tT%n!8^6 z-uHcfeBS4M-n-Y*o$Ke#eROUp6q=XpNOY0k1^##TOmbiT$0#B{bL@^@Hxz1k$p6j= z?cKM8JX|p{Jzh`hDOt4&VWe3K4wnixu?~frTS_)k`>;nTIBS@3`o^&nG-YUUdUGVj zrtCJHGdhMHym7cQqYn3}l18_zrkYDKaZtb>qDqCl>B^-zUG^)JXTO=Dsj`XJ7pGhO zfK*Q^O|@ALrlMgMs4UA-q7;TvL5RgxQ5?&$3@b8_1so@{Q8~g>)r%(498H(I66>n5 z$XlGwd7dpZOtDxD7x}Q|WEm()62o!~#{psi+#%CLC1AQMY912URUO0j49lc^k4Uiw zyf{rVt&~u(1GlDIg^2*hl#tE9Fzc68Hq_L>&K_{`<=~pi;5;s1({qU}3~cS30P0w`pB&Ow>u$C(lqYsf=W8f&Vo zTTTIyIWP(+iy7O@(o`_Ba+{U691@sh$Je(f+uG8Or5kzD;dZTGOC{UeqEL!P0T+hl zbW)WV0l3W2;m68tSCaPutPz}-ZnS}(Fl~U_v&Y*5s#`8 zFbFbkB?(gESWoZx9wIfJK4?G?pNQ1f2sy1jiIn zox1dGfnU_n!!MIqbH8)})h%%G`NcZdK^deS&98oV<^93K;u7=}Q{ zDhHq@XdotW7>Ec8T2#X^Erx0k-v$xPu!0Q9hRN2%>%Tx$ojx^(%q%8*KXVtwD1sp9 z0KWWW@Y?(-rb$>gAE*fHujP|vd< z1**)r|0mv*jGNvb^6y1?k0+_DQx&;kZdanpd!mBmI)8PRk1p~=nloJvlCz9VHpD5m z$ms~T&uHJ9b+=ojuOej_>W-_mCUOS$AA`d;c?pj1*d*)LA&2w5d+xhV4)(W_iPlVP z$MszY%v0=wms>XM-npo$u`&1fm4L1+o_wwJw7n09hE4tysKXiS(t$Fd9 z%P&2$=Hl*OE*)AH%8V{w)y?-uKRAA_>7%!2-Rx^PI{#4U!tO7`8KEB^xVk@d{$lK> ztG})T-8|gW`O3<#V@pHYiFZb?QQdEzpR?$b;i2?b-)%V4kZM_ZYsc|(pS^x|<{Ryg zdEcMBeDnE{C8xyJee*v26VBScExmbJb_;s=^8?F{#^!!|eCyMlJAO~~#UH$&f%o_A dJ?U<}pMCea{`dYG0sdc{WP4}g@Y-iz{0G#WV9)>n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_4.png b/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_4.png new file mode 100644 index 0000000000000000000000000000000000000000..3839d706ae25ddcf11d2adb6801d9171ad7630da GIT binary patch literal 3462 zcmcgvZEO@p7`_@X(gvcDC?d$R7=_~8&VJm-u02S5SLi9%p5+K_LJf1fv+dfu-DP*% zUJDBH10^CsA`(#$G-4#sA0)&CQZNt`L*ygU9|Sc)f<_DkA|O9Xz}fri6x;&7@5t?eSF2&zMMV#}1Xmt(qR9uO2!=Q<@T@m-=Eb zW`=Q_R@Y2xu;zg6?*wv-9cS-lczyWI>;WksC!5MAvW zq?%%JDr{Jo@_QkWA>^ol=wuY#;1o_{-LZ)*Ta-2149BqB zj1g29hldy-(8gj#8^ijNP8UtsPHiU%BM->1(srWT#7rZ$jSfr3wVlMxS%qk9rx6e0 zIfm&(yg1p>)Dh;oBSV718Ephnccdt4N?{8l$FLHHkt%Q}UO~aS*)42qQ`^;s2_^2ch;w4Lp*mg2!qu&WN23-A zW<=)=y%Sp{?wiO$WcR|B9immsNK?fHO*saIOf#j)S=ut4x{}`^ig3~++ObjR{UPG` zppXn=7N}U}0IRrbP~GGLUXySylpWMt43 zY-uGNDCJqv1uDz9f5+bFj2qJ)^1ml3Tc>j6hPk&A<-Q|1Bp0}=GkbKAhO0Sa;^XE_D6i!jR=oWo+P3K0BtG%pCxw!Ed`O#gN( zl>U5obl2|vPl;r#BEDt8wB_ecKC|#6PI@A9@X#y0U#w6M8WInhH>4W$>NlR8w!WN- zmEXL52emZZYTrJ2P5AdaKVCYswer(r2R4rL_P#nWWBl$bdpAWE)l^;DSvfKGI#nL6 z+4s`*fth`MtA0K;9iQ8XcAmUUT{tz}XI6Y2*mq^?wAk^v{q8@dXl;F@w`Td;zW^|a Bh9Cd{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_5.png new file mode 100644 index 0000000000000000000000000000000000000000..b2eeda2dd5996c08b37bb14c3abc6b0c5faabb48 GIT binary patch literal 3557 zcmcIndu$X%9KKQ%LGe}aiMp=DV03Puw|l$x#L_FY(SuqJDFKApo!NHVyW8#Vw!LD4 zL=uA_2A|QYpn_;H@`psCqSgl_R3$1!iEpDpG(bdagNgMqdynPNmNq^%y}Q|&-~1lm zeDlrp&idK2CQi6$LMRlPSXUcwAirn(pVLky-s$1zWM3#ob*|bfpL!rv)SsUuD*rPPuWM*RY4?B8j%0w}Gek8#r>}uR> z)-H4K+-0+q`m$DCLG<+NsLHHL9Hg-ascbrxan)>$&iPeI+wW#*Dre%g#^@?PAk~ZRnQ&N}(I?M8utb{p96r<5=D4yk6hLstP1w5~^k{S`H!b6j24l>k+_{>5q@)o0; zJ0QDD~cZC*wr1=_Dm~7`5vKWwRQl1>L9T(72slu-a=NNYFQWn-oRyH>lSDHEq6`K~|@Gm0v?) z0**ru$7r8OfUrnllboos9QnK2|7P>12@9Dc$)Hwm4|;W(KrG#iIwZCH?ug^7&i$rZaxXAbY#JaBSe6X!&NN3 ziY$stXzCW^X$EX6v{L4ELnEyzkktj*04x+0fLMYM6b&AT5ggTIUEnp$S2Dgb5f^#U z8`c-*B7%T;4e&;U1&S;h0BSG-B%KpwPJj_43MIaBUh^q3C$A-^J!-A#*Va|YVlHkA z@}Y8aqe4BuP`bZaF`^6I<`8rp9WnB5JDV|~#7Q=B-psWOuM;}Bs)_JuM3G>IP2S3M zV5cN~8#<7jUf6MCwBcB3D%jAJXHn3$Q>LDyEz^-fg%cuxlO8sX3p-8@5idkVEs8l{ zV4VjX5)p_hJO(o4L?j_hwlpk4{1=G0BrB>MIWXCxc>NQI3d^TA!%PzIZkWF+QT{!iM{=gWJ9AeTbtuglEeFY6MkNR0 z2uI{-gxhDd@6GzRN2ISJIT%W=tHmyI2lku6<(s?&*LR#D`_>_s^F<32i$bBYjdk&= zWOVIQ_g+4yzkbpk8@8?6V)X7yPJZ~Svwp7FQ@gqThHsx(z4}6<_UyqG%De2k!*k!M zL@h1j_l*6meAV09<_Fhp>0bHxG3VE{bAIfW2*!D5GwuSpCY>!|&}<`kviUv1jktZ{EHBq7|fh%0BDX z?MDX=G@SqOgVDRXZ*IBdrTbcYQM6t^_Vu?9_1e@x%Y@UWwoKW+Vr6V``^)PeS+f&v z>O1hsnU%cMvwKN*czeasw|v(B&9zebickB6@4eXI z_NFzruYYg({F~$*Ro@?a2UjfJeDRUa$;b9vW9-|0yK>uyGY?(geouP*ul?5R8~S?I z?pwLu>XVn0KlYro6HeXO_V~nckxgwINMm5adBzM;ZaaGanpaTIvnl=QLvZutF7u0( z^U9A7{xbXh{-*|?vC9WOz4XAWn)mw;eEGoivZa^zd_HT{w4MGxVs$mM<6CDez5P!K CcE6DT literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_6.png b/src/main/resources/assets/actuallyadditions/textures/block/block_rice_stage_6.png new file mode 100644 index 0000000000000000000000000000000000000000..7d7ee97f314e3768e327717f6fb5a957edf084ce GIT binary patch literal 3602 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 P|H4pZO|Yl@sptO%&|U#k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/canola_top.png b/src/main/resources/assets/actuallyadditions/textures/block/canola_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e38883ef258403f4287840e402589d030c133224 GIT binary patch literal 3696 zcmcgv4R93I9bd4eYIMvXZE2m6Wm9Kj&E9_A$8NbeNiN7aIgClr1QWu$eeaSbce|V2 zP41wjrS`)x(~L3%kQ&r!hbmDRQ6nHtkxBwiYDx{ocFP0_+r;40_WOb;VEYVFwdR#26uq;n{B^T!rMW3&LaVpiN&%ZEW5N7myrf!Tx+Xpxq+ApWa%xYf=XL) znt7ROEV}|-!*dG5v3Yi|twtso>-1b#6iTQQm^wXKQ$sE>5wLZ$O4p+q?v!UxBzfM& zlKGFS8r0*~y-p430Vn`$1AYqE>QYrG1CI!KkL1IdvkEOCk*5Kt;G5(V zMBXcTI5(deAJCN+hn3Fw)B=UNf_+>|kCWJl;N?8DS7F^Wl0=2}iISUUrHJC@J-AOq z8E+4nD%J=P9qZM}3Sy5+*u(RZ#L)oZ(E=yBX-VNCGy*K*5t0CaxGIMhGIoPg0?tD8 zQ<=tUhn~@vRHK(?@rC68U+F{SFljQDwsqfFREO7tf5g*dk$Kt4?K5jRUqUNJ(0FmTfzg%iD;0NhX%#`sEl zO{K`(xR#{$$O}}bw&m$8Dp7MbA2KO7GEhjzia}5hLX`-iRsN@rd>UPJ|wae9#9n5PuFLu8I|94sV!j zM!fzTh|<%iGy<&w;k}>v0>!v_C5d7zSkE_K0 z<6@La88FGDJG{t}WMa@DGSx907|XM43S^RTUrxM988@{(@uq*#Ez(huBn)GYtC=Qz26i5^hj09n zJ-#CiuUiuz&M&^W3lhY1S1?dimA}ScvG>8eqFFDO&1^g9Z-4m-FoQbHmQc+juWWl| z$ulE2{p~E>Fnacmw)&GFteum4v2f?zFZ}6X-fiDuH??huy;;}!Fu0@V^uM}J{Cdfv zk*2G%-#us!OslQ07y1Ze;9JV#bG<*9o3nA>JBj!|mwx~C*G?UMsJC)fDXMw4v-8pl z|B)Hx>o>3Les0cluMOpG{^8e%RsH?_dzY54zh~7)A6Z0E?rk%EQqcc6`QEW(zx`xo z{NtzMz3v%Ah4^UU_eQ@r&uE7u6yH9=4y#L4K%^h8X zWqn6mI(F>X(UE&(=B~yk=a+QX{;sFz>b$~d-@Ut?JEyM6**Y?~f$pyDYrb;j%CTj8 zt${~gTKCwQOZkgd*Ahk-0c+O(X3O?B*6w@fU3=Lt9_}(v5(gLG)pYONj$CEy;L+fN zhYnj`-+Z|GzMSAK!C}a6GzQwcwab5fe;U#E^nsuKy{(<=wD#{PylZqg?Cv{O_5vYm z)8Fdt{p#jfZw(C%eYUA@=kTYW9v`agT2@zAH?8^)-_+Licg!3v++Q@X>wAw8u@j@a zH*G6`hs03b6X5XS?(J`EY3i=^gx2m0{%H4!b0cqV(khR9MttKdwZ}KCdVZzzpDEr(fBNh+F literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/charcoal_block.png b/src/main/resources/assets/actuallyadditions/textures/block/charcoal_block.png index 31c637308b2be7d26fe99893781bfc416ac579d6..d4c676a7ff629fe5736eccbd8c922ac847cc80f3 100644 GIT binary patch literal 3529 zcmcIn3v3ic7(R#!0us;$Um>guqQuVa?Bi~4SFQ$nEp6yQEoW$}D6_k>?b^HBb$8pl zw(*IN2pTPrm;ff42qp>!kw9XJRMf->DySi}k(cp-uU4Zm^;u`{)vLC&@v*tv+nxF6 ze|+=JH*=5Hu2^=-w5z81e7;Mnt0Hyecb4~^I+@&`>}n2@pNp-k2FK@{ewp{3O2JJ=GE5J2AEYTm3)8CuQ5dz# zakEj?VdGUDD`IL#iz;dKO=Z;Lv`ic%u#2d4BA#^QbePWgmC3W$%+OTE#BB-FOT2(o zeYBP;H*HJ>{Sc@Sa+E0f*`OeVLZuW3ImkefVIkl+83yG5PvtI}M6)$ru8UOWVv)Bn z-R!!S%rL1`%Aex>rrpG_k|Z&ZV>k{F3*fXTU6ck%XMWy81Uss2Sgv6vDbFKP%vLu{ zlT5QEB&>qlq?3b*0LG+|#jt+pm6S2m)PkMWYR5CdHI>0}oWM!fA+~J6)@n9g(`h!x za9!vg5r9A&jTT~znoA;42;sODZKRAGAfsA4v33hHb=WamZ53Cvku>M$t8v^qJdEcA zh7>IF-*Olf~h5!+Zef~9W%{%o;$U96e*7LL+bj~Mp83V&LXdd z+yERwE)LTkkpN*44`Zw#LzaAQ@a`~c8Z|XTZ!b1w0n2-)Tu_Gm2vfph4Y_DsV@;KH z(@r2V2Sx%lVa7@}(Ntk(<#ID_+9WW^jxTPnE-$aOP2Gr-4ySI}QmVS5JjhDHAmIFL zCf#UMu1-2GN~*Xz5~fM5e#6jYk;5pU=@{r*NCyHEAP7NG0!kpLvmr$Y@KDN+kCz8HdRb}2 zqpAcsPLf!FuoM71D+GX~vO2&BVh&>oA&pe!(LyF}NJ_|Ch+#V4Snts@-kNO`IY=%d z2jt2PY8a<~xcio*LFR&^DUVoL_*W5)BQTR#nYLOZjpOwZgCOH%lL!{~G>q&a0yGR) zzVszzQXE24Cnrx!QB&?IZj_CVv?3v>@}dqP5+tBOf)EmP4hR7pQbd*K6wEDVJY^y- zvZ6PpFU$sbUgH$N=>Z5NQP2TWPyhr~RuEa9@I&B>d}X|5Q)JFxOGbO-D#NR-J(tBQ zd{-eKDkC>CQnM4KdW#inbgtPLg{~7LM%Hbr852sJXAx)398-5w$i_>W2#>}U31-aX z&14(4i_*7{jmYkWZ6{3Ywwa&`3z~9G3Rza%P&2e;+LBsshbX{Fj~T~7ZRdxG<3oZH z!Yt6S$^ljrG!T+F3`E2VT2R9wEkxGfs1UI+D99|?FkxQ2{s}}m-)b{THes^&GykF( zNfQw#hzRHsgaC^|2q>Z_C~S}q233p^Qb#LhR3-kOi&4jAz&Mlc@uEPIu|dEmPf|vwvU0=xRf)3ikt~vx-s;R8UF6X;XQCV=XBnAn zh~sRL6A^BY(VjQ+-)@nfiez9YI=aerfc>46yvA~Ao$CWcZx7~WRbb;^JH5c5s$bRSA&nElknJe$VL4^}-k z_{&#=gFkYWlYRY%pWoWE_ekd=yt}b+?W;R+<>3RJ_niD@V5sr&Z~Id$?7eQALdHF~ z@bcM-=)%6v_iGLx_^|Kzf+r51`tGN_>48M;d#}Iy^9v=rcJ)@g+0!6g^hdYRqWS8C z&*sf(zvtwcJGRm*yT0%L4f#&&NSxZY=M=i_*-4vDKDt?1_X>CV-m->6c&G=j|Ly7& Xo^ftnZ^KOQ&sKHCipWb#*FNwk(Mz=Q delta 458 zcmV;*0X6=~8{`9!B!2{FK}|sb0I`n?{9y$E000SaNLh0L01l=A01l=Bhuo=e00007 zbV*G`2i*k*2rdF-LWO2a@9MfXA5G;PwfNl8poO>MMlz)&$N6@Qhs4^r_>1RwnazrcU@ zgbB;C2$Lmq_ukn%Gb$YUc@|HTu)3O$h6BPvtW@#+{(POy(=-krR?CZGwm3;Z-gk9f zox_9hbXN+2R2@$z-=Dk7B7+Bm^!dI7`Pi>tUv5Ao)dVGllgY>*^j76*90i~t{AWqX zDTRf=sfs+^K7UrrMYdUA!=o6LBoKhVZEFam2-+Utk!#<&lfdtbQV34>5KZ#}8p}7G z%+d$}I4{5^Z3Ld%yg*pK=|lwJ@`$9}&Oy5e%RK@?bORLP?7L3$0%JDabGP5z3Stcd za_NLkU_<(r!n$1B0}$5?0TlQAYviA% zWe*Hk#!Q%qDaLA%A1M-j&6s;mhm?@P+vPm>4*@D^%B&%5z5oCK07*qoM6N<$f*=OM AT>t<8 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_fire_animated.png b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_fire_animated.png new file mode 100644 index 0000000000000000000000000000000000000000..f877479abe9a227de4102c1d4e852ed8807df3a8 GIT binary patch literal 2414 zcmcImeNYtV9bUiqya)tzs!eoR93+Ol+r95wIXJi@9F2#_T|^B9_IBUnZn(QWcK7ap z1iy$3FcT&=DNg)=sHm7kCY5MPXktu4wN`_cT9b%qomy;(jUqKM!P@uWpiU>T{?nb^ z+jrmhd7t0&`*?qIO@#${kHsvEK@jAze6y(tzT@Fzh?)t1cP=hJ4qwqe^I8ExViQBp z3}pMxpCHJbTQ1ugagAjK#c&=e&2n}it@ijJ8bLC$s(mz52}INmDqLPY_I2+u40W-3 ztXO3sEIuP}y3Dmau+|pXnA%E4$6{HTXht;!2|Pfg(Q1#|D^S&XY=W19vSn~ur}IUyr7GLpdMa*9w>Dg_$8Fldcu z9aNF&nXoPRrN^A2=%Zw^U@#~RDx@4=AtQAJ$aG}O4($%hO~=blPb;S>uhmrDsWt=Q#dxuEb=NKtqLFwr8=W1+0!B#9F$o1CQN z8hAfVkQ6~oLM^ZkSX!hX4a~7FN6n)^Efy-@D~Pn00r@6921Q9-E|$`f0BF^K!Ieq{ zgVQRd0@o=B8dorYWLO8Qp&gnDU2wmNWBj4;h4xRDEz2>GV>&_q0nPYs2Tu^g{NIV z5avg7Xp%PQ1d#M0RWb<^IENUdd5~QJQ}REnQ1)Zu1v>C>>5o<+|3~TJurf~CTLEB) zm0=-gWT9R(nH1T7=WAl^fxa~bhs`iFobJN#W4ez6FQn#SmrhK+8bpv;Dfy;so4M&m z>oIP?kaVK#iL!L}A3lBAs%mzo__NJtiw;^7ioQ84z7czW=Cj310`n;%nCF(5!NyHR zM`At8I+}Af#P5DB_29_(;U_QaG8o+rp%-saJ=*Tx_uKs2&-|+OcGuvr7Vb8^-N>>3?waOHqtWsW~O=Jb4!*oRlhr05bw-^uJpyK z5#>z0^qoVApDv0>Vq!1+Vx6I?(|Ejp%TV8Q2y(N(F{{7coYNRtb$#1#Frs3_zASM4 zCQ&_dUbdruC%>%i`C7mL3gYafjyZv^6pOUELS&xe|CzdI5)82OLOnMwEPzujtmK6>!hU*Gy>ZT!9L zu^Fp|w>6kXzU{AfCVcYhopTL=KP{%_)HbK>J-W2-wN)iL^W2qRmL|_XzZGn5- zO@?_bwq?J^C2cE5UTCy#s(UllcQAcGvO1AAHvKF07dz0GWN$=N-RUq8I}S|k0+ zm+y6q-#)xcwL5XZG~-4TZjZafo6IY^XPpJ3=-hkVJAPTVK~@#fR+{yj+np!JM#l@d z4b}1w&MYvORPHQEuDpA?r0YtH=ECUfi!MKl5+Chv-&b^^S=R{wre>6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_fire_animated.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_fire_animated.png.mcmeta new file mode 100644 index 000000000..aa7d14af8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_fire_animated.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_front.png b/src/main/resources/assets/actuallyadditions/textures/block/coal_generator_front.png new file mode 100644 index 0000000000000000000000000000000000000000..713c76784bd64f117a9dc672dcc05895b6ec804c GIT binary patch literal 2206 zcmbVOdu$VR9KVUoIUY_Ruq+`t4lo;dy+?c3-njx>+ifLwn`4eG4Bhqa*Y=>jt9Q4x z8$KpciG=yX0Hf#8G@h!0eJK+KSVO91tcC7@XrqTwOV-?d#CI3BU--Tm(F z^ZR^1-`DSVuU3|qPRh>9Mi69@x6EAyuQ}$Cbss!$Y74RO@?f;APDhXlQ_Uj->DZc! zAekHG>RO}L_c$-A5sM(Heqf15q7aQBg$v_RL0kz8)DMEP;=~4fj$o)PIkBaTkMu=d zAS9QyXkbZ8d9~QGQsg9T;R3WU&O?F-Fa$In2`f4ucVY=%9*)h&1coLc#!4qvWEw|Nq)CFb6BLQlG*7ZTV?|Rx3|iBq0AJ-UN!fyT zPAp^?QJx@Tv6v-hwWwN;NyEGse zs#dM4;gLjDjz~sn+CrlFOJzk;V|u};3BWBFz=@ez!(qy-WHn{uNecewn`bf!^{J8^ zXubtXRg)x7Gd#`R1cfCd35IZ2uq5&URf`DFVL2iM0TES#7@7_v?^4661`R`X*3r+s zE?1?d2IMe&p;wg_qh61Tr8t(wX$zH*>+|tmMK=UR1YWljgTb-Lvc%IO$pJgd;5N?6 z;cUQW!v(9K#u?g1SviId&=NN?->r&`W(k<{lieVxBILLs&rb@BopuCpzi4N0ma$2= zpW#T{ZlxH`5g-F3CyuaHXfkX_Av~JZR3$-1mJ$Vt1SHPU6u@b#&5An$tcWu#3j)AF z+5|x|%l?Mt5tbt8pAIvwr`oDm2&P71dBNDC0mWFY679$700S-BZ2?^H3sAmD+3b{6 zU?iKhkT5$6QlQCEl9sr${Y0JfWwNQKIi+F=cqXj}O_Vk-h-S+=G1075AYrM;@)+5= zr?{l%$3g&--l2w*)^#;t!~_i#1z~3I+9Sm6#Op%Sou%Jfp(QolBK^NT^?#(N!XkzQ zB?#d9Phh4qiM%G0Lfo3K#Jf?e>IfVz)#fn0N5Gr(E&~)ut-(E{blJ{+1j*R%br)6V zx2=DoXT#5nra3?BJ?|(P+BK9N%xH@|{OgSTy-&Bk{>XSsZ_j#m{0nUrWj%6NTlD4V zJHIRKOXuv{aOw+^erW#Dxx2Q!?dFdD#0?zZ_Lx4n56!CY8^4J1PWd~N%YNp0K*LEgHUdKsY~`^X3m%f0^Z-aw=qV3>+RD_symH z#d2LuM`t_m7I>$7G8*`82Y0W!(2!g5UT;^;hdUM=x;FI3k1cgOKfQM4@?X~n&V<># z^^@0(LoyqVoEw)rc}=(7p3gLh8Sh^ny6{2Go{I;|XA8FJUpJkq?Yq!e01nh=zLkY6 z@0-~#tlP%tT)qDMG|$I16BbSLNb{Owt4fb|oj=rc_Trz&OM)YJ;z@k*D?&Wa*mvgp zy&vVTz4GjCIZs@dRpkBZ^oso}y89<01BDyJS@$EJtcvFf=C*E@JBCm9?Z^jpCFh1K zNTgHNjyq3GEza4wH3vJPZ*Jb+yX+0QL+*I$@PT^EjP0>c>MfT8mp&&82PY!Ol{LmPfqe6GxiYkwyYig_JK`vjuGvx7uWS4w!CP5L3lmo?%l-=tN#Uz CP4)Hw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crate_base.png b/src/main/resources/assets/actuallyadditions/textures/block/crate_base.png new file mode 100644 index 0000000000000000000000000000000000000000..bbaf1381ec463426ea177e65c435064fcff26273 GIT binary patch literal 3565 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crusher_front_double.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_front_double.png new file mode 100644 index 0000000000000000000000000000000000000000..7a8033ba1bc3575415b54328f9968519c596f4ac GIT binary patch literal 3612 zcmcgv4Q$-h9d}u&`T<)Q6atK3T&ARe&wjSgcQ(0ZNiHAP_R=&-X;RU`v;CZNb7#A@ zlej--2|l))4Hl`bQ<4VfHEd1-&H%Lc1u}`Dl|qBfwmGKg|X-R>Xju; zG`3lHKKs4@`+xl2@BQAppSHKPTs-%xxdcI69BYks;NJ@WJNp8BAKsb}@y{H)wZ|oh zd6)X%8N~fND)Ga6Mpw7j9bYP|Rw@8BOF@B5%Es0NQCpX>q1uN$QbE0j8KK5U_EDsv zMW~g*I2*ScQNm~)a!}_`TbDZ2r%D=Cw}`CG$k;&&d63MclBO$XB2><=jGz5xh9Yw& zUSEW&_XCpM@piJ&au6v7SXyOSjtofwAPPb_d=tsB9LumF2Cy{8$*d>`d9rX(IGUsB za!0he5DULWsD$U)GQ*_P=|GwfSWYhkBuQdej^Q{OThQ*H>A?(bx(kXPqR3Sp!}biz zBz=!ivHHCTg)_~Ukg`i|O}79O28_u-n*jmVFDYlJsUj*6NFaGDE> z)wo^+m9 z4O6qy?n1wY!T=P79*R&tk!Z{!p6vpH%mVzm(Z92K)3~J>`e3;!N3&uV2+ANNbJ97c zn8h0O;FQLiD(jY$f_M&$6zoNeZT3=RX=dd{D``16FwTxIZ;v%LwmX(?Byoq^(b7Q1 zni@qQi6YGfKrY>QT#lKp2Tc{lq7e$$8ZZn^RybZ`If18vsEf3u3L*_f3DF>^LqXwy zE()RI_^74!`>gcG=NG7Eso2Na^mqUy7*fMDAH+9B@x7^vLIYKUNRc#NRrI2_WsZS0 z0w&A7`dMk%qpFA;CrN;YND9(C5P~>0pwkGlh(kz%P{UREw2-kIoD%dGVuUI-cKh^9 z_U9Wz9E&e32ly%s>Y1YdZ1)P&z;nS-q))6o{GC|iFw8hsuC3k3pk#N{z{t4yB*gNb zo^yM!0G)-aSb9C46c^LfEyz;?>@7ScjYSh9tw@kn`H)VtP>^Vi#Rx$`=V&2_!b(Wx zIR$aGjIT`CMPBqK^@Tu?=QU2DIX%eIQb^EgsK6jCsz3+<9tJgmFY}f2nop5Ae=Rxf zky{PFw!uOcooHPtA2KI5GF0;urTU8%X;h)vn1HU+BSzkBI)N}H&a;T~X0D}sY3QK( zUd*E@MS__$dCMF?PFeakbRgcnkmE)u-LX<+X+e{oMMB$78fuQV%z&vCc8C(3)TD7- zIBWVFYL$sT>V7L8HSGhv*Olf+lJxtc76_;;%sjx>!L5c*A6i;`N_ERG2vOr*&wUqwfXP!J)si+kBd>KWWW@Y z?(?EVlF32SkYki_pqyu=6v!Oo{yXueWZd-jkpKH6<#Z}9H_X?SDE}VKBiZb)&fL*O zo=9`1%RzjWk@1E&#TGdo;r1Erd$Ydj7U`=<4u-PhYOx8Qf&ItQ;Tyk{j_=6C>(;@C z^Xec~O%OBw8jIF<)ofke0s2PUEB>kMsjWJ~&9C`MJvn^cT_AhQl342>-LE#@d}5im zhd*8Y^pZQ1&BL_!!LdD+OTo<1AK$(8W|M~7!0eDc=7HT%J?>|=jPJ~evf=HHEtt|&|N$CH!a@;6CH=vK2cRw zRjGb8NZixBAl~`Xk)dZVZ}|Chs@2O^t(Z?-`h%YBg!$H)2W~$0?Y$>1XkYxs-%qve?)7ryzK zCqHs6act#hj~{Khqhm`p5!rEyoLw>V@ZqtxWn*g_;){E>e}B*SE}HeHcZMIHv2=Im z4ZpbO;KDxQkTAdD^w6_sjvxQ^&zkp*9e6bP#Hzua)thRzG|b+Lu3WcvJNn1K*ol_9 z4cGoMn+;q(@5^Y*%-a_)G`^_WvS$4kKOAtr+jI%>QuoN)v+NBUW|0R@{b=*A_OVs> zR^K;Az5Dsv1N}#n;!~qEao_bR@#-Nm`(}pLdPCy*GR4llAM{<|Zm%d(-!2kdN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crusher_side.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_side.png new file mode 100644 index 0000000000000000000000000000000000000000..59093654e14ec3fc7b99559a0923b8a46887aeb9 GIT binary patch literal 3479 zcmcInZEO@p7`_@}03p_Zk*Fc-!jB@(?e5&(-tDFbw!N0NdeD|4Eg{O>?%Z|5-R`ox z?OhwGh!KPoKhOjPOymb>NB~7kVyk>9VxtK`42h{AnixPtAVdVj=EmwQ#w0sAbBaasVI)CT8O^TyN{++B}6au zN7#r_fm_t-4inGsnA<3KER{uto;`~yO-sZ<65EJMCli__r9*VauSA}mW`?FRCic=0 zUFJ+kHAU*E3f;t%;AMf#vXBahUQXcoVDK>tvXEui0K>5WLWvb5zmLjYG?~p*Vp2o6 zDmNE-3(+mMZAc80N~OFhpI0~I3@3^r!$Jl^KrDdOuGuIJG;3PkLl|4KsT#JbYn0;= zMfFxYM3YFfDI^Wot!Cw5B7iYzWH6kUbyCV0Dza;5w3>;`^fb9z_a5FH4myR5e9U zSu>m*aszM}**HWyL;{3GKDLqLC6*(fna-WfnnrX*jkOn=a)9$Sa(;>DBtJXIl(1Mq zHX6}bk)@b!CJ|W!HHqSwF|;^MxhpGG=n35<6O-tCh3z#J6?LW_Qxl}aYM4__)l^mp zoG1tYdbv!vk%&~ISvJySToVq_Bv-GhDiRJT5JSHLWYMXYATNL*i!cyHIfxMf017Za zKCH{F4lAAU*#cE`nfMq8FTnG>f`b_N{ec+ZAnyl3frCI$pr7Yu0S0s6k!a?bD$xj( zDD>(?r4WyDRDe(vIe@U}2R@GY5oIn0NJJQ7EFz?ktQ=Z6Zb(STDZ~(+Z)|etnP|;6 z1|Ul=A_wHk4Qd{tf1rDTrjoTF5IDrj!atvA9D$k4m1(O}(>T!-RtYjzHVC1xr+IJ> z5ugFM@~M}RMX?A?t(-iSqj>Hqq0Sl_>8OZU*+)QT5ibITB?uut1_AHK!DvAC!6=5M zjH67%MOO5N^@TaV&!@mBfH6M{!~h=yD2n_*kU2iU`H)}XeFeTUUb7)Gx6UP_JyNym zPIYFEF49n%Gg=Ok zvy4PG#1Xd0(FnK0Xvdp=yIZ8AA{iJ8j;r}5at3xD-NQF|agXm!h|i}eTA9%PG`_usw!9WdFvG=1{d=)k^T?j3jX%BiDAimw-il8S>4VIhm)_f6TRWqR!_7~7H?R{{BTwD~F&<;53~u&F!wQ038m_wTo*?&DSUcJSess+H#0j<=7TKKJ|elj~C@Tfbej z>#3QiH^0$v^?@}lA6)(1_v;@&cs5&}F)Q|7Sl-vC+$gztVp6^FH`ujbEFbH6KHhzN z*O+&Y^&JkB9plxFdzX)Yd`Z{YKRZi1qbH_Cj%`yt-*@&cdLmp|KjDRQJ-^l0O+Iw( z*;u6b@TLB#A000Zdk#+d?EK8F!X{=%cf;C4wKJYM)A8xaF`slNdrxTRdZw>j&x>a~^4tE`vX_goB|{n=Ez`gV6+zEQG{^ZXRNQgq*6p6`11 WpL$OC<_qVqQ%&XE@XqojEB^s+dzRb) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png index 5a3d50ce07c2aba4fc5475183a615a303594b440..89243d081d39f798159e068aff60288caddbdfa9 100644 GIT binary patch literal 18977 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 V7RP%Q9#{YX002ovPDHLkV1f_!*KPm+ literal 3071 zcmV004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( 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 N002ovPDHLkV1j=}hDKyBT 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�%X)99+vyU6^saI7q1Fl*24CP8Dy8Dbxl= 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%0DxLKfgUN_gB&Ki$fBp*j|3;JVPmdT@0L| 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 literal 3071 zcmV004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( 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 literal 3071 zcmV004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( 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 literal 3071 zcmV004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( 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 b5f**}XbBooxB6#N00000NkvXXu0mjfsH0<8 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png index bd1356e13b777effb00885f0d0dd2a4b13bf6a2a..c004516eeb9ce879dc4a49a7e577ebe95ffccb8f 100644 GIT binary patch literal 3329 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 delta 1100 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 ahqxkp?OVt1Ewuhj7Umau-&nA0&A$L~2O`J- delta 852 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 Y{|@-mqtm;OdH?T4>l-4cY9H+X57b}ep8x;= delta 368 zcmV-$0gwL79DoCm8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01FZT01FZU(%pXi00007bV*G`2j2?=6FMm~qQRK}000~Q52CehLR+qEXyd*b1!im^EaBHEK3^4k(s86mSu4m zhT#?*9-y-C={p53 z00oJv(JER&G_X1f^3!Mq@M|7;nBFLG0gSJVrUq&No@f_VfYBF>G4ufhFvN#>-i?L; O0000}L4GNVqm=PsOIgUm>XLayGp8Kf~qk$JdJSzgdETkGn z5ExFU|3;koYvu2=hI?N$ALv&b0 zlGP2R^A4rxxdoG$ z$GSkQ8FuN#kicy3X0Ya=hD`fqi{cE)sCbgaI3q`3906TrG|~hH&CUZgX(A{N?`L7N{uUNV zGinWB8H_ZlOc)C&8iPxQ$0#*HF*J_@wMsQyEXrsE0A~oy#F*e3r_Z%^EozV^nIMpm-xZ_~Bw1H7w34X%mLClm_E*N`6TY7HRde*CR>7BdGbHD zy3_IcKuS~8CHdLEpOMU2ebl!&p!g`8_gCZh0rM zd|S`$-aI5~{j8ZYXI@(Tn4{9PFKcH*l9}U*z6@SN>N>i``HF{Eghdv!o{jI%exm3o z!e#$up1Uf0XM?OI>*~>KpH@`pPWh=Xuj!6^UU?;_vD;O3>tT^4Uwyjb1k6gClD+tmL~}x6WSsbly%NN&NWvhZ4G4TR&{<*qZiK zYD5iwFJkb^&#`2AW?4h$jk$B@PDwUq&C6)0x7040I3p=F;*A!vd>m58AL;4o`QnS^ z6&1&fMA$ukstBEs@Mf^5-qPybh=y&mK0J1m_W9j@zkkWJ80o4a^hEI5+>JU`ay)l_ zWA47D=<=n=CVRl4-oQ$HyLKT+LTX1xM^&~%C*813BV9Er)^q*h?+pI1NQ3`Ow*0xB z4U*z9HTe2jV+!#{OS2mra+`15Zfk2R34i?Gy|?%6+t-w{DeCp0_wz+>tXg$=Y43N{ z@~pb^PD`M&g`wwFH@uXq{o_i);Fq+twSi)GZ_}>LQHMIYl}pbB8DC0N_5(L>c1>zW zUptZb{f*w1F6NuUiJzBm+hKjQp;1wxsMH%R_Z5w3s@j^i95lUr6-|C{`3ooFo>&`s>foP8 zlTRK#Q&V4`Ixc);@Z-QGiL|=eaUs%IqES~jU*1*HQUB)njEs^R_LJsA%|)HPsRhim zX~!k^7p6o%Z1CS2Ek#~j6mGj-*Qj5axMiw-^~Icj#jg2KBK=eQG5wx)@%fB~N5Z2| zR{I|FCT;hZf%*B!va}tq5ew=@-j4(Vf%UVdT-{Vr5%l`o*9CiC&}EiQIq8xVugFI? zw9;O*w6)~K@%N;gzqYAkmfTF)k)ED`t)I2d*8%;tKOgO0gN99x(JlRf3M-UI$JI;^ zt5-@V%!o)xkXAHQfUMfME%i6u`Xf0D6dzUE*IrD}qpyA6{ln$UmkXtqtLm`G*a_om z!fICACTC>y-acdxn9XK?`}M!oh}u!m0}%;TbHgVzJVO}-hvTao&Mgb74;(n~bj+v*p{(i^AJnS)t^7 zR$|z(E9gn`Y@p}-mmBCNn|g2L$*Z5{kBN-9Ju|Z`;lk!+wQ*^R=Ca4j%F2u$)T=En z$v^nON4m3_?V2E*&bi#&F3J~nmX?-U4w@hQY{efGn|sC-PETD|8+YNnuFtay&MCjj5a>AT=-;5Uv{|kO8 B7K8u* delta 457 zcmV;)0XF`+8rB1l7k?lK1^@s68;SVL00004XF*Lt006O%3;baP00009a7bBm000XR z000XR0j(pwbpQYW2XskIMF-yt0~0zaGorzn0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@RY%_jN0003&Nkl-Hw7l4260B2PA+ofQTc+)gF%{t zWyt_J$M=%WRbXUtu%87>o({HR{?S4DJCl0?!Q8mKkJ)1M00000NkvXXu0mjf>_5N` diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta index b81aa6365..a5ede46a0 100644 --- a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta @@ -1,7 +1,7 @@ { "animation": { - "frametime": 20, + "frametime": 2, "interpolate": true } } diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_block.png index 24e9ab0e7078eb5eaaac5183f432d951ae24bbff..85b2295e225fbda1739ef1efed2ab5f909be6311 100644 GIT binary patch literal 3702 zcmcIn4R93I9Y2FngAG$a9BHxLSkUyS8d)wWM#2kJLx$dT!bH{{Px<|66DTdv!DJZIlL7qi{YP+2 zR|9yHFG5AkAZ*sF*IKZCZB2u+wnY(D{QgB)d0Ija63_uyIuTFWQaXTV{7UHAZ6;V7D= zYEoTjNiG(83*gO;V@f2MN~OFh)@xWXk`_ggq!^N62xLLn?MVluiKIO@?;!+j#nMej zH-KGu{bD87NAC7O{~ z{u)!nVih=GQe#z-G{Z^&GzWSD#2{%VV>nirSt)454GRTE*|B5W!@*#!WoUXFb=Y-F z7h~b7AWw@tPcU9OlWrs;g_E`ek_rrm0ywJGtLv&HFdQe#f?FqqgiLdO0;nn=7#0ew ztY|XiV19haP+DD9y5qA8R5cXj<7#?-UQ-w!<0mwMW(d~L@r3A81%jt}Syd>J<~3j5 z+X_oZ8Uf;Cy}DVc$fF|j3?qs(0ift3Seo+@qC#r~1QcW-6ai3CRW2A%|DnAFi+FgWHCD+_-;(l`V&ij`@r)zdH@4e1CO zJDUVQwrAzFJxGAA!j&(*5>1MYXlm!=X)%c9p5pqV@sXBAKq;(WBPhU$gi0ZV0H-ko z=YxXmS6D`dOgZT)6LOIiy$O9m+Q+ggBNL3~qX^N@X#|jgkKh$V2bu*wm1D>F%6QGD zNM65|jP^*?x?5X&E{l5ja3LQoBR3LIvJ<7aixsMPu2~<4t~W-EtlLyGM3lJBBF>uG zhUTPz1uJ8SN0W*KIbrffvJF~e(l>zx(C!5-JAiAJk-!QI8gmQ`m}Xp8GPEVzl4@>; zD8PwN7{>-}*N2E<1x^+qO=wVI2wLS-LJ%29_yNtSyb1+X0C|W%0}< z9N%FQty>En&hc$KqaIHY7Y&`>V}oUhg~8*V7q$>z9?YX2|^I-=118rT#X3^^uQ? zuLMRHFhqZ{dh5o~1&5{@o};I3y>fFAW8e15bBDFgo$wn!JiOkwx&G7lmcMq-`sqC* zYi^%YJ?*K-|MK%ofBxxnkEAajeE--Xwd&x%x=+pTCEpxo?zl^|N9_3*p1V(L?~ zf{D?<$)UrwbhsszSocmerS`l(bAH)B&&4);+A;jKg)i<7&pEbm+tvf{$-fSbngi2@ zzUjZ%eqvh7lTF{M(C+@j{;qlS3ww>%4xIn+_>^SDX4Lf}m_uSd{gmmwT!Js+3 zuV|TH?cLVDdPBK1dyx5LQOVQunzr0>{MZY}W;}zSxOMr;?y6$qmN%9@II^ne;$Z*g zrmqHviW|;yXP)?Y%Yn7m3!J} zeDKE1j+6U(JilJ>rS|hL)zlYxs0;q`e{^b{o`K(&2?rl)^gr8LanRaOynD;rr_YLW VUf%iM)9ydRa8*rc-{Lio{s#+H`xF2G delta 768 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 b+lL~D>}SnAzUlF{|Ak>8^MVh~T)pl;v3P;= delta 1094 zcmV-M1iAb49L@-k7k?lK1^@s68;SVL00004XF*Lt006O%3;baP00009a7bBm000XQ z000XQ0h0Lxr2qf`2XskIMF-yt0~0zaGorzn0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@RY%_jN000BINklslCMJ*~v4hcV%pxZA->;WIK@J!E&jBDQ{x&|>v}>^}pl2f)@2uvuhV zARFwH0x4|*Wq*#B^1wzG$Yg+262>4=?BFd8f|S>R3MW>w15{~NA)6e_rht_MFnb5M z83nG*`v%=h21Tw=a*WY7SFJFG%N17_faQ5I2P9^J>+!BJsB)5o60I)-xmAO2q9pt; z1Bn;!0&yCMSds}A@?Gq5f17K-90x_3F*A#RBeOJ+XMds%#+T_D$DAb~$vLqk6U?Um z!=4J~_I;69#RqV?g^aer6sp6GRT(5ZIAHawB_psYf-F!lKQqA6Z5EMx zpPvDuEaK!64eq*K9PR;+?-_%mN8?R`Oi_G2+Q-Cl2cea%4xaN496dG$GI~%2?w5gG zrV=|mMt>E0J7;drPK5)1T>{pDb z+5$~hS=`Aiw~*WK;NSP~`R5(*_Z#3(8oqyNj`rmt@SJ9|Zx2*tS%6{f_2Jb&cKhWf5~I9Wz@_wLDk?}+e4PKqraA&VJivM`Gq zs(-bAU_|RD>ZH-?kEp9{_t6yWdu&_BV&MM|dHgsz1&&Y1G0<+a9iqNv^xXnl#PeVb z7O#3aq}3X;WN+0#6M4br#VW z@F-4sghB?Y#aM#?zF4Oq1Kk6OC6s~sN@P=AVptQ+_3uIJq>qnh7-5g{Y?#VtXlRjv zM|4X=Z5n*~h!Nw=Y$_$tEo`!FvaRt1FC`c!7P`h-wc)QkAVULN0~^l@?3jHYT0c=@ zV_@(NbPBdG<4|N_g|#3uXn1^pb`;5ZcR0lA!2!)otZPUvpZv#+I9=AvZc0LTF{_pXU=rz?(WPu zGi|q3j7ow+L@82dw->KgB{By{CeSbnEKNnaH%N(Dt z>=N%g!S~4KKahuGdaT3kh%S~DGwnyJ8OQ!i+9J|EUsZL+LP`?5R2+BeMwtHg^*3os zSHpCBAj(FqI-JlO`fS|V*A!Fwl8U6#)eESqj7$`yv5TloI%PO=CQN7b%H-J_W@sua z;wHm%jc1VRh&EGorj04l&jN*IAr+MToG1vP(0mHAkY(5)!?6HDnHA*#PvtL~ShH14 zZiy_++ahmaI^nvO%rHGYJ^mivZ`z#%ZYe#v8!vNto3Hj2nuKPQAE9&qNpX;*%-N|9W%{Tfji9w6e$S(ELGXA z8>-pk%<*E#FTfGx;xO$I2@n?XY>X3RmLs2e-kr^fMom@MdP_w)z=|=*$sCm7nWBWn zDss`7!m1)`rkzG42YMQHV#YE$X{wl6xz0?PHZe@R<4eaI>*|_qQ`1vq!f9DlOEuQl ziJT;g0Q$MCyV0oJXgDr16xwZ-sKiAGC5ZzFO98-hLI6k#rvZ#u3^A4vQb|-EEo7pGxP-hy4AX_d4v(Ix zuH0Y{vg9J|fL!@S%f^^LJ>6#LBo~mTJYwbGZzVmBz)Wmq$C~vFPIW|df{c@MLM)wG zcIFIeK&Rm*O`clT+7v=&yufjNhT7U&oP|yI1qW};UP6%>53aA2KqARO4=OT0VShBrG zZqU8hdh=ei;#-RTP}z1PBPEw8#Vb~<()nS11iFro7&)~)2}~$)mLkrHIi}|JARE_o z5+04&B$!d1H;ry=m$+{s8Ac#0Y6;&KkL#P1pk09b=tRQn_!(ZE`pV zLu=Rid=viJ7^#U>_OI-ZCR?wcy7~#}=

lAFh1p!RCWc4cFdPKWXONd&>6Q^vV6s z-*Aof>BsKCM~^I@Q8u`BPWqu03CF2^zkFu!gURo_v}x1c-p^Maz4to=cmklLTyyW_L@d)jtCcJZRck9KcJ zZa?+j@yT~QX*@9FRNbCc>z6EDJlJEiJCgXTw*y+$OJ6^_Yq)B*#SB;W4<6btCGV`* zsUCZ|?Yr8iryXx9|KD|QtvgV$Z$qq#X`qkqnsas24VxB3)(-YQ|62Qm6CcA@g>~!8 zu4wD4cz6H9fB$dOzO@JRw=OstK6G-Z^00KxCx4ySJ#nb4cX_~`2k z&z)dC_{<;oTPtoEj%_~?pZn)EPt2RNvsV46`?j`eCuVPbd`)Ze3-Lh3ryE*kUUT`1 zTgACMr>>g2>yB-+Dn9QU{;rn#|2OE+p%;Arc*jzf{K>a{=*{3j3=e<-cguNiyz*h$ eYda?0K5;sGeEPnYe|33(;u`ClBG1*{eAf?L4AWQu delta 764 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 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png.mcmeta index b81aa6365..a5ede46a0 100644 --- a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png.mcmeta +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png.mcmeta @@ -1,7 +1,7 @@ { "animation": { - "frametime": 20, + "frametime": 2, "interpolate": true } } diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_block.png index d14b1400d23edacdad0c8b17c0a3583e8c493b64..99aac58b0dbda4e02e74ff82faa7bb86aba68c22 100644 GIT binary patch literal 3556 zcmcInd5qLl94;CU5Q0I2c*HctL|5$e^_po511vKuJIE}{?25Zl2(RtyOx>Bbw%y%X z6#u|gL%i642!a|#T>juN3Zn5Ks6f>9B)S^Fi+B)XBp!GozRty?+D_-wG;5e z*Jg8z-;$iIXm&0Hbz4QDe9pnv1Tke=-ho;h@<|n?O)E-$`}_`yH1#NTotOkkCx$X+ z{UR4NEox}i7PV=zPEDIiPRT3SK@Rzl%;&O}r{tql!LNd!gJy;z3nqSBl&TE^k}b(b zGG@Do42J-%0l<+FImCtqL6WW_Iluu1L>Ly(9H)S=BJyPEqHr`QXHH7Ns)2 z?{I48Ne|dM`H`x>#}^9r!8+{*+U$8nrk|~X;8#(=rxa+MICU)O=lC;>8{wb$I`ASQ)8yWQ1LT?bBcV!0a6PoWcd4r4er zuMGB0W00{y&q+n0yg7(z&{HvWl$eX4Z@bO5oh@^xv5X?gaUnonah+-DcBfYp)KD6L z;?PG?Dj*V#S;T{8R!{(oKa+wxD4Hg1-88zYO<5X*n>kit!wQg3GQ}*`p$~^N)-}bj z-5kVoVCG;NF^-j{$jZzrF*|F!I55tRuWnDoVvVkCm|5K6rDo0`6LqmLD~H207h((P zCX-6S@_cA%C=riRxYm$q>PlELB$h`SEs26itD2zFGB6^v8ZmeY2`W;7P#zz*wf2CO z!T90=)ol&?IFX*9st5szr47koX;~L|8Uh{AGK_?wY)G6a!m_tHu8B1QW~;phS?SoL zriM9AmRTAiS)_RurzUHxK_dtdhmZ`Rj;ji2p9u%LJWNxsBu_J7y7ZJarw)v?Dnp?05rYO$kZB!YgrHz>v>+l$jc7clB5n#3C=+&3 z6um)xAy(vhol|Mf5b<0^1cQbu6zQXB&PebWv>@^JqwsUy1XdDlAoEjpImjqQp zcnuM*piHh&>B9d1JtFv%)Q3lkUVR8_kWfZ(2 z4zWcJN4Nt<2j1*|yF~^nQh=fAxLR()XW-zma`?tCmE$|I@Va&J;kww(kq;;}@$ zw)u*l#dF`VCbFZ~U3&Dx#5q5FFzwLs2 zciyg>JFZC)x14)Ev0vBD(8q`aV87Z>{vi^7z9Zapd+(SFU(}$m%W|tIJ~XFYg*ddJK=(swwrf3v!DI#SoeTzCJ+SDyL8n$@+R_H5;QSIqk8aDVSz-FugBc=E>uJAPeY@cZ@%x4ryFifF5U zcTe|E2k!W2?E!F0!@A4%_O3pb8J*EKZy)=!;NAKBnz46I?q2Ni=Z*h#=GZTey-rNu zx?dxI?m76#qX({S9WmwbFV~Np_~G1lZtB|jiFNDgn-^TNZuDEktl)oGqOKvndB(ye Fe*&wSzj*)v delta 234 zcmaDN{hM)uWIY=L1B3kM|A|0~CEd~2k%3`jKlh(RRv@3Vz$3Dlfq`2Pgc<8o;wJ(H z*-JcqUD@w*GYea38ZSCH6DTB6;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XP{^HrziP7 zP)(Yri(`m||J94WTnvgFY#00%bz=0lbJd5o&D{z z_jk@o5(E4fy*^?31ONbD_w`W(aaTL;ylC?p_x<5%lLL1dulETx0>H#KEvFTbaqw*b zuufM8uQaVx`pHOE>qbzligq(=^;|RnxX&}|335Gc;;ZNgwN5T*FDw!8)s$SYLac<8 zdM`Rs?GtODm&N)Ald9BL%FyoxggSH(#wRx=;&y-XptLhh!Db3sZc_>my zYiKQpZRBF%0e*U!mw_fstRa|XHN!>)3}@sch#SOrU7^-dY_xHXh0#z4T0xj-xxnHY z2*V&G35FmUjL9H$E(FUUXfRaC)d5AAh|vYJl$wbdO{h{S^VJzmgpQViC%K7>&{(f}#?TKnWGdFfaolu$Y#jBnUzZiXbtJiVz&aRLn5iQiGbCIfUkAR0}JLLqusvMGzzgGE$TR zaVbiG1WXbjPT?v_f>Jo9A_V;3^Lnuw)}Ul5PF<0JPmwZ)HE0R0e$-kbf)?s^5teG^ z(793gsEwR;F+=lX8NFfXPNU`z6rGG9EwwHekQS3^N-)%{{uA{^$8!)iI+Er`jD(-B%zC-xrI|Gunb0MSz-oF5&o}V zzxzF0GoD;ETii4b$*_Qk7!kzd&r1}M;Fy#qa1c?68IYj4f>+@f1)>;?;t~p?F|l}% zg+~2%Sg1-x(-01W49>uyltM)y0Z|YrB_tRjWpG3+CPs@z&?1Udku(TPDHw!t%hXYk z5QvL03PvdvcTl6nQb`Gj6iFBmB2XzvL8zFU)C>ZmVj5RTND-oxLd=c&C9DDe25k_&+OL7gmo}GS^SK?%ayznBat|Y$Ev@4U z#lUT)CuUz;0|4VZd=;L-k@3IWQttj?;dJYct@9evR@sb=&&{D|OTvOj&bwENFtokD7yPQi$-&O8D6Si^Mn13CQxSmzCspsQ! z;N(8&s&(i(=})Nh#qY&{A~3tAs$Ut;jgH*e*M z1NSfmE)T1Y6c@e4pEG{j$19_ZmlSr21^9IrSO2*9qNn9Cvm8A2$E@au9%^%#8JA|i zZOVegs~^;4$ZV3LmX_Zu8e?al8yD%Fba;MzT`uW3WlrYeNNiWy-Q^}L(! z9ln^ScDG)Rv^{Oct!C6()=l$5vjOlxR1R zPWUhAlIbZ?5uc&**t9!7`2nZhuz2-Q52oW_2y_=zLWdk!4#Ley7f- zCi_%9WO9!4tQIW5W-!aZx!%|^$2PS+C_nfFyOF&^%>$3z(oE&mbi{>-K7 zVq-=!oKCqo*Y&~uGi<-D`b_Ya_vCR?Q!>SF=Fe+fZ=_u?#_y~7 zPg8W^jcixn<~6gt^?7x_{`jM7;GDGG2@Q5)z*LYM=Cr z_ip%!kf-nSZZ%dWco$5cw<){%-qwze+(u7cp4`N{i%*T$*4uk;$QbW*p>E&#x>%dI z){faNURk#PyqZw`q>1NRdFC@JlbT@c>*(y>-0C;4b!$WEi4~{ww$Hd6-m$H(tF)}FY_EKiVau_c zoKy8)?zc~#xMItDr>Ut))BEgaaz|!@>+-Z~y+^wEhu>~IS-alxnO}0s69AP*A53V? zU-2lP=dvfiJl5+UN$1|s_>n+Z!Tqdk$Zyf-VQn$z`h zPaTKZ+2og;k@Z|8*ZbG9r}HM(#_WpQY-RVs`gJWQ^F3E~+XSqgQE>(hah|<Pi8pUPzd$MR-4r7B^y|JJ4# zT-*6Pby;oxig4*Xzbto7_t?WgSYvU?i;n)eEeSa}54w8VHqZ6v_49bePy23$Z_X;8 p+P>NwP5Xs{{;=xCkX%m delta 253 zcmZ1{)x$JFyk3EWje&tdy7R{wAjOjI=21s-{)o)w$e0SbZ{n6NTS3wq9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj z&JU=j+|$J|#KZgTMMtg!3Op4=2r zy>wQkNkONCcn>^`?c2dzbj~{~7=4S2Pa7gEF!s+}k*Q6JUZgBj6RXTsw z*G8@fzIoq5XEbhId*IBcBb*kD1x$4U2Z|U~1sQj6Eja8AbOVE@tDnm{r-UW|uHjoL diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta index b81aa6365..a5ede46a0 100644 --- a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta @@ -1,7 +1,7 @@ { "animation": { - "frametime": 20, + "frametime": 2, "interpolate": true } } diff --git a/src/main/resources/assets/actuallyadditions/textures/block/display_stand_side.png b/src/main/resources/assets/actuallyadditions/textures/block/display_stand_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c574641e88d9f1b24473b7767c0fe7244ebff042 GIT binary patch literal 2114 zcmbVN4Qvxt96uOAo!};l9}5Y`5zGLu_tCpsd#=N+om&m9&1kaCAo_auuDz_iJMXS* zI~0kUfcODpb2ARz*Vz%mUXN@fHS-?d#CFh1htKHk0i zz2E=$|GM{9B-}E+vZfNlu<60pKpT2iJJ-FF(S2QSLO_rEjMh#I!|s2`xh7#7Ha>=7 zQ`f4|4!a|?Sd{dX3&?s5y0R$)p)ss}QPu!b7qsyhjH{ZDxG;2(z*X5twDTc4WcXo1 zZS67PlAdr>>gkfaGO?%uug{8zAO&rJXH!Yd60<&{z$>D$GffeA0b+Ogh(^aC-Vuu6 ze%*w);G#*1rdhns>tY0s^LU=bS(>FOx{hLKl4V6&5P3IVItXOVlohcp@Jz`Tdh-zp z+crds%49OGjN7G~af{U!vqZbo%I zIhLr%m}Hz~T{K?Xu4=NLvF49k00Y2=KElZwiBjgKqYNj~3_2G&ce)4->9VTiZi1o& z^XT+m2Sp_#0~_2CEK8!In<;=CR#PAjDMO1BcsY!sUr*{LGK|!@$Il1-{)nk7Y7%|0 z+FF|MV6$Ifyn;ZoE~X$i6cU4)Wdluu!GMoI!EvdoEXo3{@LrxLd5;n!We-P_F@{r6 znJN+|aIC<%i|(TJ0bNQvCE%*@|dS&{fGv1wI_bDIIa%$SV5wKa?VP$ih z!Y_XIWnW%#@8YpWXs}BI1R^!zNq>x9KKMav`>~v~ zxF*^A-j>A9)sL$u-i#a@So_US>lUmz^IPS)rOSi)r30{Y0Nb!FxPGfzgEbLX(%bj% zdgCa_oZpz9a(Kp}BlY(@o%?w7^3@-zPOKOK=PITWeNFj|@VM{ffrk9o=SI$)J=w7A zfmMgk5C8IO~4DL_5T2L C<<8Rp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/display_stand_top.png b/src/main/resources/assets/actuallyadditions/textures/block/display_stand_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f2b28d20ce12e78df0740241bfa22fa04e24f27f GIT binary patch literal 2262 zcmbVO3v3f*9KSh4Kp8_`1HqifNLb){uRhOp$kxFsw2p3pIT`F8U)#&tUb(xi9SIN! zLdaAY+Xy1!5a&=BTY?Y}0TIN2L|%%CIEeBN7$7P`oalFLS6<^0o8H}bcfarV|NURz zcS{Q06Z`fV)(1h5zRm)N2VT?lqt{dLysXx5hL_&qg4b09d3Jz)q#&zSXCO$=rBZQ; zR^pn>3UbiEi82oi(O?*&5hQzDG|UMVKtp-plR|dv>WyHTxjX|^uJ2qZ7h?ckt(L7lJ zsM$c`0!h-S#b%()Mx)g_7Ntp=BuEQEkvL7Wq?t7_XyS)KYl`S)J&p+pTky_~`86%f z5=0~tF+>=HtoR7ZX0s6_P0%zB5x80%(zqxdQb%?%IDjfBQdpDZ5UMkByj-c-F{m`| zLNJ`94XKGR!GIA_E=*7cQgvAP+bgLy8Oqx)&{3_^1A|TzO)#BcR*Gdg z(3PmdF3BiO8%T8YG$|y?5jE?s3BbW=z>euz!(qx8vY0ZmBnAIt^fMWUx@1xERzCoR z2{zhT%5o1BmW;@0++)F_zg53gWykW*zNSd9A-TZathy=@GFpKNFqGAV(_WFrd7IIUTLCZN9A^{+8_$~s zfzr$Vj^!?v@z6gNW?W6QRW9dCi~>?l_o4x1Vi=L;p)nJQ+bl*e&heZHHw%=}LNT04 zG&0$Q-cgVOjgR8A#G~!U{Vb4lJ=F;nMPOD^4;m|NmJ{@rwPS)_t3bpOkEL$1^+a(= z%#Zj1Bz;5;$E~ZfSBr2881I9beQb{q4->C)RgaebWQ7*j^nmpHd+Ps4PlQGAb0Hsq z>py|%&cyN>PYQ8=zGCn0T2;H?aH-aZ$vpzzBzGAQg47D!Lk9Po%p*w3Z%)Vf;?cEb z%PD{9l!1$OpFg#J#G1@y7s@xT%we;Sx9m$BRCEy)v$O-~sPwi;Ti=-#IkY0HsFc&bIFjX)U=my;_KJnLk*0WPLw&`ns(?YsZDo#p>Me=3O0BlYeq+N?n8J=Qlr@ zylzJ8$*uU76T7Zfv^3S9xt_7i<9=`OkRi?6PG4<4eyMlInMwue%eIQZ7(FWj1YJ$hnu`I^Qd$k+Yc zzhKO`U(Z(m>EB_SSzCJfs6TV;eEwgc;>XUq%(Vp>pIKH-w(h{&-C(zIV{B&_1Q@-xw=2859&NX~ z4S9qRm4u9esJx~Sks--=7!YKD5#{j*qLE}ohEoOx1P4SC29k-t-U~2e5)v=1Kv`bL0D(xJaWBe zML?vn6at|nZBUJu2^0*Aa3PE^;Cf04pvyHlG!RIlRjs%Ic!|e5AhGIh42f8!sLJ&U zFBUh5K`lSwOyHBYp?bw1%~aqq(Jux7Oa*}vNmn7CtjVfRenK9}*U4-`tX&Z~O;+5p z>`yeRBEbTaqydM=&y<3K999eTh~fsKgVRJSqIV4?2o$H>gqbB7mNZSk2^Pm=P#4gF zz-ip$V8ZAoC>@NO9|OyRxA|NP(Bnd1{(zwOQ(J0L^H0lMq zLOF_LP@3T=!orwwh7zK20egqc*X!le?PIbPWFBxNE5sUkqXig>CN?-`mB8Zen zL|}nuy|NPEfKH?US1V$nU@ZbajK(heWyK{6pytL$pF8dL3Ptuxe(*xAoLU4si|rJ_ zP!viU2wnCd43KV#q=Ftd#s{fNTo_;ZB{-^1mgDuIup+#!1`(7g_E;LA%ukn4%s%WB z0qGzriNRFatA#m5wAF%^{HF@BCk3x^4TFcyaJWhI0Lhw2jza~bi9;FMLZi5s6ucga z1I^(QssAsb$IHt5xL~aazOWeb?8!Wx+z0Bz00a0eeHb_yO#iUP6o&mAyC@rF`@(w1`3RrfO24xa1Ui6%wBV0Gzz~2xT32V zEjGCSDDsglB4G^n9etVH@W4%S%M^p4iwf8fr+#h=Lr}_3PKV81var_Bti@S| zzSN=b{E|`hQeW!+erP%4T)wNWMVMTL9gF}?>yJN z?{@d5#zlK(x8E9li5~L9?6$O>^y#I(_9K1J;l6!aP8T-+dHqOVWoh1ub=k{^?Mp81 z=>F@ikz?NG4$M25+o~S_-PWA4EUQP%Z60xOY1fLZb(Lw^+s9US^)2ovQ_nLaiqiAG z&9$eW`EuiqkB72Vr3Ih*W>mS4Le2M)_G$3gQ`>HJUtwM?d$}mR4qbNiCco<5jL+;n z*S22&qU^%a4=$6(W*nZl=l=XV59Va2p3k+jE%1r;qfGX?AM;RU*M`ikFofUBxhnXtRA>9;h zpleJU(~^&8HJ%4_Q1%IuD276lXut!WQvj8Z(qy+qQ{$YqW8^x8z$dtS<@)l+i zu4^eA*V@|ZYxVm~yO|SYS>|}a0l*Ro)@d_bm|+d4ykH@M9nID)S2qpXvj|l)?S>f= zX)cA7RWxfjd6)=bTn1X4;N!iNvVuq}%2{bUnRSjd4kvL68?HlSg`%vLFkRD0nBABz zF5lyTKpTw~eRLU1DphphxV0@LjXWS-N;|PO3v-RwG1In&Yg1<|DK$2Ru4%_iGg;tHLjgq^03T0Jn5!GeY;`7jIph^^ z1iCoPctm0ei~M{{5EWh^e~)|Ld`>iKB0b(#Dk`voKL&V3@GD~Q9#O(#1YOvpFw&H` zX{R9B13d+sF=rXg3|-t=rN&H}HgQa%^Ow%o)zmcDW?WB_1*dUpHCT|Hq2annm?63PbR8)wfFLLa18hhFAy!sJz^W1ovP72;2Bc6>2C$$XF}1YE zN>4v`K#{2t8+XG)P}W4O5*wO|ScpVOMj_0C5RVZ;Vo>B!!P*R4Cp7{lORaiQA!1Qe zB>-euU?G+RtX~iVtgH!f7DFBbjAaNB$;zXJLd=kmpmz|%OkuLgqh~Umn+yV;Jfs|u zC$BWGhxNP5vkjf>1z>28SULD-ks3!}Ccd(B4SEJAn<6?v#>oXCm9EUYcZC$7yKog! zuOge`5Slvq@>C6*^P{9*(KXVl40+8TjI%rxWft)SAt=THD+X{#4QhU%VlbKWDibl0 zD|+49!a~6BM?hskJixPZP>i!sg#lL51TiT1VE~E#5?fiTxe&Sg=aQ{G$~4`}tt}tL zEc|>i9y(iY6sYAkO7jjYCIrb%>s`>bcf`o)wL=7Y9KuZm=0D7mf{rpO)G8x}9$4h^#9Uahl{pR(|OYkP_vvx}Pu5{UoGgoF0s@gN@)chIaM;@1{iH~)} z>h-ZZHuin%o#*zQAFY*XN241XeVd=W^YYb}p@+))Eu${q{$~7&BNw+1OD|k7bx_sU z^M2UB=)E)4N%7Y!C&j(P$9)(0RQ=%G*|Gf+=cU!m=3i>Qop4<4a1UO%)OK8cbw|77 z>zKT4IyHRdk$0;mp8oB3_5EwXMZ4y-y>a4_v%PKbz$X?j+=S1heM>)jy5hAxlg@wG zpKtFhJ9M?>#)-z+rw4W(exdP;-G5YWc=Xm@aoM?K{F(XhId;eM0)lQG>u6}m;pX^kb AumAu6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/empowerer_side.png b/src/main/resources/assets/actuallyadditions/textures/block/empowerer_side.png new file mode 100644 index 0000000000000000000000000000000000000000..76a1411c502c36fcc8ebc1699b2adc188b04530e GIT binary patch literal 2119 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 delta 725 zcmV;`0xJE29qk2>B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT z000XT0n*)m`~Uy|2XskIMF-ym1OX=wY2m<_0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@NWrZ?j0006@Nkl*uZcS~F)SMmaiy^?Ozft{x~qvx_x=~pWf~@DlJkAvJ@dYlO&~X zcDVq*ER$OPDt~O?@xMP0{{Cw0z6PJva>^A;?RD5TkHVz%q{HX)<8B!7NWS;;OKbOy z@odMc-G&E{twqo3vU+2U-R0L)8b(SGcoFL!d`dptlFydKa^AIIy6f}qdePmeNUa*8 zq}RdqjD?Sj-uk^?eD&N_n-vRL!AJ_Zv^bp+r_-*|41YATRrhVQRW(3JfD0I7y~92I zUe7MWhLF*PsW=E;lUfV(+KMC*bPodFlh%i~%7rDdn2Q9mNI*!R;>hUW&eDvTT7?pv zQr!U&ineWMr66Pzsma-64IarR#<$?4-ycEI0lW~rxlTGwSEV4LfQ+7q7VMNzkF%7= z>GtrQU4Jc7!l!xH8q&F%dvVS=XNX1$7jqa%^uXJ!nlGMi9_^0>I#NXTX>G%7mpX|ViL!G_%w~oGd ze|$zyd6x*mVrd8ffz6HZ_H_{J`S8I<0FP2SG4}9Pr<4By%8YwIy;$�NkvXX Hu0mjf99>Y= diff --git a/src/main/resources/assets/actuallyadditions/textures/block/enderpearl_block.png b/src/main/resources/assets/actuallyadditions/textures/block/enderpearl_block.png index 87acd223d9386b55f1faebc9f2beb7e4f07467dc..c32dfb6397723ece713cc93ac4ae1b63052c0d81 100644 GIT binary patch literal 3744 zcmcgv4R93I9bZTXh%pdpRd5Da4kkc#Z$EDL?sl6C`M87}cp)a&A;E^>-R|4FC3m~$ z?k2gM3Qh+Z6c{mryy!kJCL*>w8x_{B#mJu^W!lfwm=gP!jPhRY@faIx(!z( zk8KI(r~I)>7*=W$I&4VP2E;^*$V;~QrFcnPKnkMJ1b93eQ4JyPu_g5isBLwVHasa} zws>simO;GHUx!y}I>eoJiV!J^!CkzacCxJ7eFx4^3`J5dlBNiT5h$m?Iq>vlL)LUj z7V5p#X;KelID4yq!^N62qZxm9jXc9glf#nXz)Tq)Rma2 zXew@L1VOFU^w^N6sSu*EtXkDb!-N1M;~+-TcFGDVDJY3qxmc?nNg9_#5=LMYs-}Tt z>8xxlteKh-)`n4?9lpi@g4XZP+8EN8Xf$iWFss^77->L;lr{n#F-X=!Lu=JVSk;Ey zoRx{jFzew}JV!AdiDxI9iag9*Yvh`sU|bnS)Edc(#)L{80#nlinik1$r!Ipc&M@}i@#S$>Vh{BR6$eJDnC@06gOvynbW4OJ zvo42A7AXcWnfYE#Y_(Wv%}*^*NfVKdtL_D%#G{)bcu|xIS!RQT8*)fF!@1lPM~O5o zWwb5U6;vZYBv-5Dm4q~kK_|oTJWT+|bA*FtIi!)62?!|2K*$3ip{Oic2uKZb30Mo! zW6N|lTJ(&xraD~=g)USM(3PIlG{X4R;h(As$_0YJB326i22|q^%*a-NTXLl z$QUUnoVg=S*N&h9bQP{l=;bIW2BN8vE>9I8lx{_o(qWM10VSdY5for~LZT2tfR!17 z<)Az0LMaVGri8RA6H<{Xdc*31H0N+gOpst?jv{y$D!KZilUPTNuB6tK zi{$lVN!A{rMzLb+NPE!$@5%auC(Dfh#8je0Yq3H^kW{xa1YJi*jMV)0FhrEN&LU2U z8JcXi109x!5RXPI66CPXYib+RbKH*s9iZI{>W0TA>sl1gE@<4;a1e_{6fsF#vQ3rJ zJ46;v+pu;F&~|-@7>An;x*<)-P-F;NLMz(MGmvlrnw6XqbW3iKf%qE`(E*ATXtZHc znd0@oK$K3O7zSzxqP?H|7Qr}BJ#q39M?jfl2oX`7;2D}Ff~@F}S;<8?CA6mhJKsZA z;_o;ZaYP1;kaUX|S&|G7ngn$vhXc7h%esIk8TbFOHzMOkw}*W1NlMnKRJkF)S&35b z-V~D6*6K_iU4)@(&S*J^&N2ep5J%b~M^U&fMqApnZ@WcWRU`>R&T%!7tBmR_pc zzWBhCc?)VU7V3XJV#LbMVjpjqHR*w(iX-`Blr7KvqW-1h#VtSia%FsX%S5$m@cF^@ z)n7a@wNRf?`oQg54&R6|y=|VOo90|TGwDWb;GH%1{(BmBa@D2Vu&+MF$z2OX%$*p# z2|M+M2b(f~dJsD~@L9=>(kBbl9f=1wJ$(7g=35%7$4*}zd}{8z7ZV#^y|3Z^&nIB( zUwyy3_@fnX{H-m zyXZ|T&iv-?J?fkfm9Gb0czNeXtEMzh?*4RI!Q;h?o7i9GKeoQ0?_r{M=lgljZtdUA zuAR8-LWt&=-b3x<-DlRWHdY<1*?1^_(yX4Jspfk#`_KGCS!nZj{P~}q*zAQh2Wp=7 zF7!2SyTi3_{L>dNe6SPu8ar0MMXq~Sk{>zLKf9~o*+1DHpWJib*8L~OV}pOM=@YB= zpB?*3U;Un=izfDsnRn~bQ2xwCJNi#e#}54Eo$)5~=E8Z!FAeI*eOu#+m0v&B zeDvsp$Lr4?*)?!tPtnf#<$Eu!Qhu;4@vpAuP7gBAUHSd;ihIB#D48 ONMBX0cSptYpZ^Dc8Vzdz delta 798 zcmV+(1L6Fj9li#T85#xv001BJ|6u?C00v@9M??Vs0RI60puMM)ks%j<00(qQO+^Ra z1r!r60Yh9~FaQ7m9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0-{MoK~y-)ZIVlGTV)W2pZRX*_#8WJ8moyd+Ng5d9k4`#HDbeppURFOQE?Fx&=w`M zPH7~I*oklF_MLB7I2$B?MtWBx&Ajh3BjtBrs|g-)77+o!XBjSdnyN-q4=SX-heI1p z32h^(>u@H|uz7}9LtYd-c{$_J=^4fvK3-h1UM$$%ZK&%8aSky8DUoak0?uXulX*Uw z&G_uAFE~0m!Ff-!+fglVS-roaxmnQ*m=Lfk6Jzoui|W)LwY5yK}4{_60F7LWl2^PY?ilNy!wf&Uw$R+Dzxk9#oU8c%piwhfyPK`8vJNT z62T=^ntg=@Zr)vgk(w6mI_MKf5(52~C@&X_)*fibvtyXWH7&y-~eVi4yJTmPptC7kmdPbM6nJ;oS|OMPU$ z+S6{fSZfhLjG*aYo%;wFL5yYm>?y~SQ^wN?gR;O$uc#`2yVV_i(;PlB&!BG6lnw)o zAl?&31rMhaCNH0(3WH&ZQw8HaDRfATkY~6&V2vX+EwO3wgA6w)7|)*Z`1~B7XUyNc zrLAh5rXG_8!ovr2BE(&V_nzWtL_RDTjE)$LhJ;bU`23vX=_#9=8@4w~s`VPDu}6dA z@_-wU(P52w_nzsC8IPtD@&_Ya@c0mLA<)zf^Ve@!T`y?&dz{`gSAkFj>}Y^?J*(xC zeZ9x!g99w*h+W6-?w0N9j%u?zL_k5iNDu70h#(jv)NMmn*I2h<86$n{Nih=J4vmr6 cb)+uxFK@C*1uoYs&j0`b07*qoM6N<$f`LzJ?EnA( diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energizer_side.png b/src/main/resources/assets/actuallyadditions/textures/block/energizer_side.png new file mode 100644 index 0000000000000000000000000000000000000000..d1adbb8bb40ea3d1040d4bdf18ac6bb1dafb02e9 GIT binary patch literal 3625 zcmcIn4Qv!u9v>Qxv>0=os1T2f(}5#Yc{|^`J7X7YyU?z=g|h5Ho1CO?X5Mti?#>J| zv+Ytq8w9`Za+ITyL`4vVn0V0Wsc_dS-W^cmH6|y?DM1bsG#ti+%T*G;K;P^ai?*~m zb+R+_=Dq*>fBgQx_kV96ZC%lPB4WbvY~HAmCs zM09!47XFG*DbKTIn(pc83H0y*%ju+9Ns?%Wqd5*>3E*xpJ(vTgJHMnMid@w(Y|pSv z($@$TE9*rl>}er{j9pf1xT9&i3PC9Q~Q)!e&8Dx4cmSxMb zcFOWBH)Tzrx;%W10Ss+CUbZo=FPTi)gzGKq#$glz8CTj(Zm8i`sINgP>t1lLoQlt zn3~n&*7-3MC!i?wP=xY{1Tc$uCdmpi!{Xna{*x()#x2dzH&lwUfaQ}cBlDunh}Vc> z7HiOhlL~99tXob7;v5(m*okP{?4-zYX5}U;Z8_L5_KvUYk2N*5I+kvv@qn9XZX{#N znu4qp3<55|=G~3Q<(TPu&{R<@8liBk0mIN_3Go`Iu_90;UcnC`43v;A0ZHePgu)?& zLPBYN)KarPEB*O}1*%yp)^XLna9C8KqH#c186IewpaVsac);jLU|?9$gAlu&r=+~n zF>sB5=}N7>R~pu+DnX8uBo;s zuyUmR+7VoUuEJFcy#Xi1#WZz`<*5;N7F%g!$@oYs5@b|9qyq*D63`fo5EOI{2qFqA zA(iJ8#MRS&Wx^^7MQ=h~h!uIv0tIlo$N(vXvj!C?f}qL@A(n@tCh!%y@>&Zn($|lr zkmwe}k8MNIi`8g-*&i}rZe*wy5~cc!6=_tl+ZczgQzJ$}ZBGheN?d0V7sOmk_j;g% z8agqLCM^>5gw9)LH*zZ6x1j^^?u8sTLg|i`A9eLt!lpOAvnxA~wkgGK)7%rc}KCABc+S zQ&Z6FM0oF~zeg}o)I~*NRiJZF1)47K0J01Rl(4``ipXPrqVa+mw-W!z!KjlmV3MT! zyeN}oV$d|?7!@3-|o8`kd{wN>ck%`x> zgAeDI4$at45Yx`bq7BJKJJ2fjk=YG5Z$5SA{UbG}j!7q|ZPCMbE%;luJGf=ryKQe~ zZ+)rmo$801XFmDzoDbg;Zraju=k!%AgZ<0jOYRU}e{i-pK{IjUj4=NhJ$Om4xc7AoxOeg$b*0FOY|N*eYv3{ z()GpbE9>GX2iOC3BWqsBw$&fqz57yc6kI5>2`sA@TRbKeXyb`x>HxPRjq z%t=-DYiD<*iM2JafBI!&z%`$@YX1J;f1PX&T^#F~v-rN?7<}aLjJwTX#QXQPx}rS>*tNEU%Zv*|HntfsLo4UhF_kxcirF(wdvDq l&JW!EYWw5+iSu8DtXsyo)}OtG|L+k*Y}tzFp~j9a-v9va*X;lR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/energizer_top.png b/src/main/resources/assets/actuallyadditions/textures/block/energizer_top.png new file mode 100644 index 0000000000000000000000000000000000000000..890247b5636a35a029410b908bf6d7d40b30ade0 GIT binary patch literal 3559 zcmcIn4{X%d9X?jHK|2^zJGPZI^;{;>v3Guc_St7EM-$?doYtes5t@Wiws+6ZIg>lv zvz_FU4ur-knu1o4I=W0nu(m9!s(cC25wE>v>RP>m2EY@^i$-|_dhFp&J*-nbT zbo4czv&|IWoyfq9*Gltt`-o3BjI8e>BmG1(`TN#zO(mT#mJfEqZYDLx_+U@VegmniE{WS`a1H>{XuT+_COr<;mEl)6Ny%LyIb zXv$b@;t9*86+EYp=jt=7x4H$_XMtIE()9LpYioz^T6TeT1le_K zxpZ5rB5H~PP+Tmho5|>DCkU}aXxd2etk$?~n>vLMstQFwRgwfyBC9}?B^4w|5>rTI zO+{vHyy238h?UX!$^tcA!hB4nmqcn3i53D-Ry81F8G)o|$v{$ZQbk%$fwEHb_MmSw zjlhNJUZbo`=8@zSgfvYAm}&_iiE;vHM6>|KkRnPoj7?TmL<^m{VJYEgA*T3RV^2iS z!a$`_MXW~1gm0)hY8RWT(#0$*rWuEra@Jn*5bbEQ^8&{GtxN?Ln5gbfLPXm2^m6IX28n{n#`$0 zLOF_>gh-i~i;C#Y>WhjANitCmAS(fZrpgw;Ih+6r5oJ}BaKe0>;aQzV30lXsm#>Q77G!#-xa7xjY_Z~1PKt1oCSbUEyK1)G#%Ps!kut zW2cX@y|h9C2avMCljDa2??k&HWgwj665?##muP0pKvi`P6o^|=@BpL zB$*vFllt~F4ov4+Jq51Jxc^VQIT<&(*z7 z^O5oNrC4mi;k41x)wqvlQ~7U+%l`eZy|?YUy|W?zKDQNa`K$QN{nmxeXyEwfudLmF z;?d?si^ovvtv@Wi3q7~9`zgoy{hh-0-Q&4EAMOPgT84K%@Rm24dwRti7k{^H@}C#C z4Cr@}&&IR^K?$`ybAH&_(|Mxl!1}S?dw;QMBGz~~*Ks&Iy1jS*#6$1>W8!pSKRdjv zShYjW9Gf)ch9?dL>1R*InvL#*me5`em@t0$NIURo8lL*u^LL1EHXT`c^>1%)?ccp+u+6wUI(ll;q0@y= zpL^xVl0#=4cje=x(OSN>^Nurre|X}d6-#$Ld$RHCN7Ii@ZhuW!{qqLHxOVMsbI*By zakD*fY_hGheea>%SAX!q_kKA3g(t6XjJ TBcF@@ily7u8!xW?&iDTVoy@gs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/enervator_side.png b/src/main/resources/assets/actuallyadditions/textures/block/enervator_side.png new file mode 100644 index 0000000000000000000000000000000000000000..bf1d7bab4819329b9c07245454d6714eab631293 GIT binary patch literal 3626 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 JXX@@+^(UKqwR->n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/esd_side.png b/src/main/resources/assets/actuallyadditions/textures/block/esd_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c2153569f3e2c0a490fa3c69c879e64866bfa5a0 GIT binary patch literal 3582 zcmcIn4U81k9Usn=9u)Afff#z0aWsmSw=?r*c6MgG6^`43+mk)dW0AYIG`^kp_HJZ% zW|*0~+e2$CT11;bA%p}@Nef6*BalF`DQHY;D<5Ye#VBnFVA~k1L{af0mI!^bAH!nr zxJ#{*otZc9{onuN_y4{Bd;4U2+k(jxXG~-mW^%G6(LvvJ!ChNJpFdyMqtMp`r=`nd zm~VYMxW_S@pT3bc-Z9gierIZ-ZrJ$ELAEp1&NkUDVU>sg3_*ZwOpAz$EUW5l779?{g%~di076|*^r*y^FOFJs zaaQk0%rD!bUvaL-_Z^+*`}_MN{ZhnsyLnO5G+ux_gn&u_Z@}_V0a)HG6%7gE8LsL0 zrfso-MwGF8{WwQGErpPGLbaAxhKT~k7m&k?5g`bvD2RI?|Z>hD2b+QY-R_lMMWS=X(;HDsz;Tp zL@A3g^3kZm*wC}Kn@2PUW*&7D-m$tlHq5NvWan&`8m8V!)&0q)rgqoPnmIb)bu5_2 zCYzfSQBxEEBVy6rR7y`;o{ubpBolFt#u_nAtYab}84?w!hJk=A$qG;fY=BryjHwwV zmQfU=GCyG(y#XtO`K1MlZG-B#;+{ev5u=g-NJhgzA+kWVNe~!v2Fo#m6{v;U?sZLC zBT%kdYv2{88jXwsp{9ud5iJTNQH}!55VL?Ffm$FMLYPJs&_btbs7okVh;gpc*%{C? z*IVk0L4jVh9MG#gscV$+E5nN|ljZ_)Y(T6M{EKLfqcBrj#lCj4KysZ4lOp4loKUJq zx~?9f1?UP~mCze$QanmiuUwwyq3&`kXWl(L(isg2h7`*J0m&M`0!0YPSqS7PQ8O_^ zf*ArE_@FXT6{Vs#qOKri5{4N7vrz$PF*yrR21S8lh;mGnP!!8jm9C=Jl8gMcV=2}i zy~PY-8z_6Rh%68NVTsEdE4qEZk78EauMCVi0j3LzsW=f6TQa#og#86;Rk0AX1KT9gO?OR5AVMTIaL9WIz*EAiJHj4>($MoD_Wi;yHE zgNBJ~R&k)3XQ2yhk#YYYd!sULYD^ck?Q9^QlusVxJ7k#*z zGgc1Lvy4tR#8I}$u@vrr(SbJmt8S4&6)D0{bzH4<(KB$+3=iM*BRswni>_Oj9?tjg zz5RWL8TVo`(U_jKZs~n5J#}(!-Il~Xzgg9}a^LhRp7ZLvU)*4QG{xL`TdIY1-ayB{ zu`Bs^|0i>2JT~){>)&dPyf&@d!LJ-zxiq=)6Qe~uy5-RHy=NZ2YtEUYFHT%Jw{-%8 zr%t_eQ|7g<-6uL)ckKJo&ijA$`r$p#54~N(Y$Th0q3n9@&f1#!Z7-kUhmODS-sRbh zf8dmy%AZ`bwRY;J^B2v{Q^r5`*WCQ|+c)6Dsr89k@tL;49qT&wyl`ag`7@_ZozC@t z)17?jgAZO8@`> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/esd_top.png b/src/main/resources/assets/actuallyadditions/textures/block/esd_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f685059eb46bf649f6ca57f552e04b4e5c2c1d69 GIT binary patch literal 3546 zcmcIn4Q$j@96vr3MF}8df)K485z``Wu+3kPhwjm>a4#*j@W@Y=ra>h9XJ?Y0{v zDt-h|kdF`o6C?%%2?8-;fC`AwM1cv329S>^Xao}yF#$=85`4X{9b{vRXmi(V-}}G+ z$M5~#@4Z`EIeqGY{*U$dcsv6t%0pH7caZyipf|p+Tov)-p9kaRwYJCe&=B|A%hS4H z7=HLwudZ=w!qX(hjCrAI%E+6D#j&-=GjVbv4wVMv5HhOQjUajT)6YmkSA*niUziEU zOHf2FUtpn`3#L~q3mOzrB_~fJCMG28Ach=BBw|s+mJ&fS=~u$fZZl01NfW0bNEW#P ziJEXFQDRz%@Ov3bVHiLNqL=mad>~Lr00uBLBhV~E0U$Ac$;T1ti^S0^Rg zEl5TjCoa)+b91w|ne&=fJW1aG8`M*vRT`B#B@wM zVs_y=+kIOA3~e}^jnQc?u~;^Q?UXj*GSYx_YHe4y#1UPEY_ri)P-zoRvmjHA?Np%- zJbN%4n`Z|*y4J;5x97H^P(ts*)a}Wd#-$PqLC3VJO*5L|PGtr~0st>VjG3()s@ZIh zb!$iuKq2U$An6i`!YtyLYL=H67JtUOcP3>THdS3~$u(suma7Jg#EB9J+-8bdtU?EN zYpg1gW?C_b=Rl9adPK*KdXmV_tW;t~O$!Ic*>Sn;6(uE=mZ|Ac++kNuEhZ{TOZ=?p z_fx>jCesavr3%A#prN3OP>{s6dUaiuv;YfKpMvca)<Wu-elwLn!JyN;u z*4C2FVkUYqn-7tc8wo0@iBjCfic~V)tan1!o)IJEwmE_@CGN6_Q)afQInB^QMfI3R z-HHU=W%8!cgshzOJ_uF-o@#=w{MgUSvtq zHE1fb^c)W4@+_MIk!0L|6R%sw^=uDGp`XjR|9O&ttZB6-z zXo3FIz?D;;e(PqRIhXp?oLNV{dMP;kz=aDxKdG$x>Cm(<=hXdneuY?ne53i==ZA;& znR1{lf79so^RNARe%R&>_LV=*irdymkFW5osd{hw+}(@!7alYA%{eJ;oL;;3xhvej zSC*`+Z8%s{_+i_)@ONjTTif29HoEx8u!6a7w@(Xwaj|kNS~g=_;jQy^`*yV+o8|p# z(5*uY`&JIV|H8q6CvGmhl_xJ+@Y4PP!gCELw-@f*v9)dQk5?DBJJNuUmduzi^u>>l zE@x-t4K1CKSDIHE+Ee#SDDUhGMPQM1U*E&+pU(~)7q1>X)w+J(k3YPBD#CBsfX-Yw zH(~J7FE5W6^G#X)o^wyUbo1|C7ykO?jfbz^=(j%a z^*2{91J^#gMYnH2wYyIbF?z2ab>#Gv#P!6){K(F>55`Vddp~*B*f;bkE&o~1sPUH$ zp13x0)4a+XJ3M>N#V*&iZvFPrHI2u6E%`an_te>ep!NFq#kGGPb^m=;lui%rDxUx9 EKewi{Qvd(} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/exp_solidifier_side.png b/src/main/resources/assets/actuallyadditions/textures/block/exp_solidifier_side.png new file mode 100644 index 0000000000000000000000000000000000000000..1c332002cbbf5d9db3548b5ae4680526cfbe4a93 GIT binary patch literal 3709 zcmcIne{dAl9bd3h1Bk@_ngB(X1u@$0?a$lWU2_3)2l+8vdR{KWQN;3Y_g%8&Zui*T zB$u>|)Syw7{LEm&JQd*-~E7>3QRuJVV_Z?W?&nvU*|?rap$&x~Z%S_{Kw zebxC+!*)Ghf*#Im;fNgxtdhi5MWMKjfy z9P+Qq#zJpiqS3aKGDWqvwz^t5mti(gj3h}E%~C8&A`8-L(`}FaA z&~e8jh#Jkdmq3|jN=PL0ZgndQ69SA%fh5JaXs4vKp{nHVlFep39b8o?7>5a{+ZM8A z^0vuF!#1o&V*=Ot?i&IiXaj+KjB#^GB=R9Fdu0nMBMZp5)>gPJ38@gYjAm1TD_c;S zi*wajb_ia_a|*+ed4901#U>c*^xRMsOlcFCIz4&Qr0g>xunjY881Wo;f;kj%mUYp1 z=^9N}jaKU(r-tkR=m$3R5)P3_#3GIkGrUYQ=<_Y-PG?L5hN{Kd3QZZ3VZ)3ly9Jqb z-(ZSZtO6TMYOE@9%rFxG&4HEx4UkIe4FsN_S=ndA4HE@M*>Q#K)jnU)G-6sDby%Uw z3cPxyPhccLAXyiaPB##ct98o;x&o{HUINwX(lk}(q9R~f!9zx4fG2s8kC76TM3U#D zTr38nF;-P`zgxk--U-K3;2F%kkAvJgrDsHiH37BX^!QUcCG z^b)zoh(phKbEeV5(&$2RfUfMIwUhK;@2=N1G#4y^JH*PsUxzdf!Hi<1+k#pO#v^_W zA!B8d5DI(N-q?c#=sH}v(pR8Ku@FtItUOhKhU`;ZD<2=}s03(*^TbFR@Di!g2qD17 zSdw=`G3rq`HVWA?%26idA|rYe`htv`<5V_EvN1PJN*=@k5Cv{hKvU;oIN(OJS>P+} zHIpKB^IFo{BUfooZEe{s>fok)K6qMgWT0dwN^uq|L*{#5YD;f}wCKU;4!sHFT1)2rvCxHpj?gdTDOT=yMTv!^2Qa)Us8Cczkc0SB5HVqzml?ES z(mC<^e;~?EpVA2Q28i~4>N6B02vG1KLL)&@Ig%F~YVuGa86n2;j3NS2kj5)!TqXX3 zi%}+Jz$BCI@FGu=i9u7LsTFXbkZ1W6@HFE-pLmlpZfbkT|1Qcec#_gOm603j(@KwShJ3jccGgl4{@iim-jJgx=)bNQ7 zdlx*__1Lz#GrrMv`@ykW*8XuvxEWmNs=32=SLD&BN{Z|2mpsxN+KT;X;kI6@_QYL3 zy?AB&Tvv%MZvN}JGiydSx7Qqf&=aV;zv}_ltuHpOAM@b&TGex?_17(LuZ!RJ=J2{%%bNxU4KfX(_m;?C zD(>EV>os-n_S-ic{dnN%fq}0q+x@3^+U`_V4@sXu(?@Y#E7JN^)jzb>8wCG&p# z#^urO?$ck!BK3CX@>7S#v|ly9+w{Vj56k9k(RRK6(MLz#6_50FcXuy4-TuLoSKr^= z^TBUN&MnlQzr60T%fD|M-uUeAXnXzhq5Vrj`@2pL{-U(9vU2p*<5>B%KTrQ&xbKsB zzj>%7l`491^y))9|9%B~7=JqP@!4Ni4#%H6b+PvQZ^ch7-TLyIr|IsY(HV<6-+qq# zTO(hy?_`Lgs5y`Luw6U&lG{{YsBLR;=PN}OKPlbLWAo?FfBfI(;crs@nXgG(!uNiC cR?T}0yMo1A4l&y2?Jm2U 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 VeAd%D_k{njl8LtX zCL~ka?%eI|zW2TF&+q$v-+T9P)0R!kNE`babWE%U!6i}C%?;iQOvZm{cH zT!Of9h5ubdJbttsKU_3oaW5WiR5U9cfV!okKqhTtX@Xd{K4U|z4SA%BS`9NyU3%_$ ziZt{vwLKVRqINAx8ui@{+S`^!f#3Oz7)1952flfYPIjuA+%QDSyG{*rf0o*RrgBf7Ds|y+;$kiOf z_6*A;eT`7H+PyG^J_HxCmAjLtxtW&?~LQdUscigI?llgb*`H5#Q*8kwGp zW!a*vowPj5O2%%07Dy%7H!PxOFCUN;d*r)IE*|Xvr4ZS6JrI1Ve#k7{+-E*MlIb)bj=iH0n5f%P6^5i zf3+xPu?{^ruduEu3Cl@CoC6~bTM=!WtrS_ztWs;GEC(CL-tjZX8)|Et94ld@@PymE zsfKK*s})&U6ag1tv+hQtN`vWo(9}>vBuwF01BRh1h}RgM;Z-0bK?1BK1Oa535Re%O zGC@fUYC*BEK4NL@J}dq8xdPQK4eOY8FT^934FwShp&$gBgjHfS0!T2T8WJQZ@H{GL zyW25vkASI}T79o{tWi@%j+12;KqLnN&tk7+jZFXq8N?wZL#X4Zd|D`24R#6og&3v^ zgK?jpsrKAph-2`D+X24vi(2NHpPt@k8aNjmMf$|b!M_#vI1Dqkl^ts`GAI>~7#JBh z=L809dZy*-8Qg%T;VOh)jg#VHn!5S+R0CV{Pbs5ncBEAqG8!LB00s&&&>25(LV^QA z5J_rC<2e;^>uA3-VHLTiH>WPd26vvRZR4 z($|h9+k2FH!;h^i@5NTMtLP7zZ8r+ka*5LXVnsTYA2w#8>%xeUQ`?zDm=f10;+&Xk zCA?1Ppz2o4qj{SIJ*V@Q*@2uH?%U9Tc=tk%8>SMDl_rY?O?nmyZ98RXS=!Park>v+ zif~eM+HqmWwISkoNl+!kf&|hy!0LhyB$>k{30XlGbtLH$EI|A*h}ak-C@kJEnL?lY zPaw*tPfJ3x72&;~{sh6`(hngCvoaxw2uLjEx+?KH;ALHeL8OL69@q50=X=&p{67vx zo0kFeB;DslktB12rX$Cg!GW1PE4n~t8Ta3@H!tHBwuk)Rla%dKxpqT;yc6Z#BRM2D z`qh~|x+t^toP}}_pJf!hA8OPPa5IzI@kHy0`ekmT` zk%{Zp!H4rdlya*`P4lN-byJ6M4>-D<2=P!h!D|QXub!;#t4hiX#apJ)r z8@;D`$KQKqysQ3ey)USJmE~jCuO$Bd!8gnIm5=?&t}m%RIJOtY14q7a;LM5sZQrgg zdv)Tn5RDGK{F4KF57iEI|MHnPQexZ4$afyS+|jf1t=}h?5XR$+H(W>TEpsYweQV^M zcg8+<*V)%z`vF-w87~<*J$!EeD;rAQcxpKCGxOb#Mvqs1VD|v_)|%yIH3Q2wdzZ}J zQ&ZRNdh+!>(&$se{go>R_O0nHS#|ML)k9-@%x?O_tv{ z`Cw01`<^Wmr_-D6soa))dg9=V+WwQM<)t$lt>um1{q=oQQ`X?%-~<0WTG4gkiJ>Qk zzy93$_j@k1@9dv=_RYGrSE3*N_4w$DRVQx0{l2sGxg%#I4;>rRHvd%k3{f_|qv|;O ze)oi&>bdilQljaONB%hcmCb9l{p@F7ocwupMMK}Id%>Bw`282k2Po}jX6eJretZA^ zMZan8yYyjie^q64Ys-=4{X-?h9gmcbzq#v+Z~t(~QI|N^zH?E{@76ay07fTweD6d5 PFJ434mdMjJ_wW7}_&(nL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/firework_box_top.png b/src/main/resources/assets/actuallyadditions/textures/block/firework_box_top.png new file mode 100644 index 0000000000000000000000000000000000000000..b58512a83ca1e81adba69f05f21df11858d9d70a GIT binary patch literal 3679 zcmcIn4R93I9p5PJ1PpR$Y*Q*^SrDaVZ$Iy2S5D;a5^|BF@wmi9tN3pB?PcZe_OiQ| z+@(brCQ_*x2`$PDq@7xdX>^9E(1C$WN;@#M(IKTcjM7Z44x=H1fDUG;BGbOTFAkfK zOszY2d%N%b-~Z$He((3*ZEaYyYWA#ovoH*s9jNn%(67zYNiN0 zYhteV5G$>Kcyq7;_h~xBopzd(Xqv@cf}L^lyxYADXK9wEXcxuMB+H7lQ*>~6{vuE` zT~@@9zcwEWy?KaM(@csK)zQ&m@8Im39;FyT5Gb0ZSe8T)LOAWbHWMFkIjXh^!6 zG*vBuTOL6~OPL-5WtuA?o-Dde7>9K5ZS)yPJ#$m!V zkS$ZRO}1*LX0&RPxGr|z5CB0N3>ITdm`glf3}Kix?Wl}AAQM^};Y<=zA!ukRU4k|3 zD9uHMY78?3uj4t5;mEu=*i@BC##%i$6a~}jB&JqR(KIRgbO=mM4{KViz@3Hyia5*K zY5cxN)P$^c7)z}h@&lkBn9xI5L?RK3I6BPmBF&)B_pLjfGYx98s$@z{8Iobb3@7qV z^tr(lu~-Hsn9^95L`Bo%0L_6K2T@2R6Hx*$&aCLuVw#QuqwKiS_JGgVplga6LmftF zl@|}x_?(R3bds!{$)+0&ih+b-f`kMEeh-0awX3Qu0=ME)AS08!+sTqHiFc9$8*!4f z+byteNdYc~FO2tVQp#ebH9ogMWlcgpuBQih26BqPkhILRqyzAPbTgblx@ag%4i_iT zpy=%fx{5Rc#7ezdS;@$w6mhbwfcyX`I7p7+9i$*J3JC!XSqKFHWK@+!3lX_NDFJIC zdWb?}vqjHXD%a>@X>=huKv#ZH%M|_ByBiZKnhTb|En?;1UyC#j!Hi;M+Zxm~j5YgJ zgp83(!dcqWa$^q?pzClIN?(a4#XvMQ^77;b(fm_PePCjwBLbi$&ZUqDQGt|cgb?5r zmgF7K9dSt<8-eU{%2FoeA}4y2`htvu<775MvWkNy1sAW7AOakuQ(|}*!vTlPb0xmA zUUMl@H?JkDJz|||)t1R;u@<%!^TD%nBLXQmQIfS-p-kkP)d}c2J!0hCcC!bwaT#{lg&hlu6ee8deIQh^dnGBPidXemR|1sGm-%Fr#lK>^|~LBxbQqi{s4pu~ z?%kh5vesIi*`td%k>*U7gXk}KVCB=HOR-;^?|p9bN1I=&>bn1( zlP~QaJ2}`j{G9_;?2^aWZ+LOvixp)*`uOg;@}ZtDu#VW0otw(vsf;zmTTb=&z8Tnm z_n~8Z^|9|RsJ=9K>EhrO&)ze!d0Wb`Qv>^M+Ze139a#1zU2$AE6yI$;Z+mpvx3EpN z`se6BFTMTP@0woqjJ|UEsj4kqJ^x;gojWpIwW#aUs~g@C>#_(l64j=b{iSqIK6 zBYk6U)b9D)L*46Uf|jQDu5R5o=bN|Aez5!Xv!A4E-s`%<>-mB+P2up!OBk#-xK(t*Y)=cq5d5wl)2uAD<7`! zd#ism<9+t7h4YV$TzKQop34{}t$sVTHTC$F4b_-!?+)fe_w%d&^4s4p4lMb3pmTF* x-3;u7`e%&9F6DcDGkOi|S36$*W9lC(=G{?!y6HE&FIs;A12t>>`@BzX{tw!u@MZu2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fishing_net.png b/src/main/resources/assets/actuallyadditions/textures/block/fishing_net.png new file mode 100644 index 0000000000000000000000000000000000000000..9e488eaa4be11487ef49d7cfab1f381d23664097 GIT binary patch literal 3440 zcmcInYitx%6y8dL$SWvBiAb0Z5K+84kDZy_8M;8*Ep!tWYFVUBNZ`($JMGZjnPFzy zZW}^?AA&I`2Kgg}7!!hun2?A_kRbfCKKjch2qYvmU<5={5|to$XCKoowzLtM?9R^I zd+vFB=R4=#eWPLZ%4w6IpBxH>rX}kWjpTQR|D80E+~*D6hvereyS~{Cg{I8(zZIeP zdS;V{pN({r*OXeNAS)Y&nx*1!E^8C%P^fBI&W5NBdz6Y>3^PvOI(?R=3@uKt7gKD? zuEniJeYbL5C7xCKSbhU4g zYDzUwwU&b^Da-=IvOE=)!<-}tvDhmV&+;t8Mj4I;Jg=~lB1WjAvL0 zP+Wi$(8F=sClVkmim+);P*{$97W;R$Aeyo?L+>gVO>ki((KstHs01)8L_thd1%Nn&1jxqJh)CSdQ&L&u7^FwQOu1Iy zD~)JGs>JiM%mIjH5kxpa1Tx}ufFX-{jAaNl5|vL2Ukz~y`h^&$OM^{5Ju~fv!6?s? zi?joB6&E#+F+ViD&NN6ac$)HwRe*mj>2U;RVkxhoiIIrLtAN)<7RXUS2T+9~kPs(Cxd;?BAyTF*ueIPJ^YB;-iLN*N*t&{d zti@Xbf2e%BQ6MTL3i-u~HM%%#j6m1%5u>2CvlSCcJfw&VVy>loozTJ6Erds7HVI}_ z=Pk1XJ7wb(RxJKz|Dt`r9NsI=j2@^tvgBmf+k;m>HcwX`I9BnMD;_vjdGGEA8*W!jzww;2 zpwAVLwtu*Sb#?Hs9d!%#FT7;*C)zJgJGC`evFYT+<9C}HPkp$z z@7n!uGu!4}9{8l6JKUJ8dviBCbwBqyJ9XV>yC>~jKDR}(KA-r5(f`w(E$_+;+h%Tu zXLk*pQp5{asY(3F!42OvPoLPi-gt6(?~a2Phy$^&&z$HF%|_dP-`ITq(9ynqvALJ7 zEV$l7Z#nVStH-+69XevYnCz*#{OjDFJMVno!QS{|+Y8#k-VS@Ky6INv{SCL1oB!T; f@MiCXtrNZ&So33U;kBpz|3t~U)rn7QHtqZexx9aO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_front.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_front.png new file mode 100644 index 0000000000000000000000000000000000000000..94db901b38e9707a35e5814ab8ceeb8a02e43662 GIT binary patch literal 3589 zcmcInd2HNN8h2@-&~k~b03i<7EN#-_@$)&hx6_c$q|H=J8qx_QupH0!^Nh)iZEPo* zgzmN=s5my=rb24BKX9ciL0oHA~sv`N6@ZzLjhH*mIa>Y>Xc2I zXj!cBjQ!sCzT@|P-}k+Fu(f5yd2=qCLlDGy$>u~G{=G1~&prcxZyd}@_~#tAxzi_z zxxWbS8N}AdF2xUDSm}f#W!MM^Ln;aydR5Nt_HsqzhR&cI$|F1Qu`FAa zb+b<3_*rKX)z#@!3}9$esj7_$eaYvmCj6kO2ZvDxWI|~_-RB~v4f#&Dr=zAG?B>;# zX#AiJoy2n*%dvQMabTH~tPN*Q2?`agNkqe$s;H~RJp=>COFK@k!kyL%iX_KH09kjF zWgAYfUmwO$UVsuXKrt#L5{+5JgET9sfW@E1;WsFWrX0gE`)Wm58VG63IgV9XR=N!t>)pZjM&Vc^mSw1#%$mBQbF^+mSz1JbL@UtHX<1P?3Gu8X z8Q4&fL~6p(yF*rn>q`l0I6BsG(mj@q%25F)ji~Vw9R;B_$uw!sQ~(e;4X}z_(YDI7 zaE*YuTCJg12G*!+62~bDOGBiHG|vhmt>~;tBM1rf zwKJWk&fo%c60S<A6^ur&c)r$>yE+TJX}lsHWim&AO>40@r5 z8Z($jQx*wkQs*7J2YEH_yU>HUdm+z{QKskQ$!bEAfkQ&q%~^VpwoH$0lsiNfPHIv+ zKI}O?L>w;*nv7W5L^!QkLojeMbBK;YRxl(3$%YIo5dR1wHVp)o#SIfwir4=FQF;6H zEVMHS_kQLl1fvMNsd1)60}=5w?(iC|h#XIIfR!~t)`lqI>GhERPRgHolZth!RBo6bSE6!5Dw29cpuaYKsi3ND+pb<7#CHpMk^2>fsx|RFCh-#(C@E z!})^r&;tZ9!ugGKD}<<$g78UHa>jTk*`hg_LaH1d6@$rz2EfAu(0}% zv)&t8yX@PmX6;~S&ABHyntpp=+seU<;}7J%d~)6FyLN9MJF=d))@Po0{FTNv`%e7p zo4ZF3?*AbBhBEuQRrS{#Yg)W#_qCrt#t(gT=WyFfc4W_|G%>P8R5s|thxUz*k00Cj z*{(zV>f^^>xnTR#i!OSy;oGN`%?oets=sFLy?02D?%nmw@PZYWzePN>g8*0leulhx z;d3{3z4VFuZtv||u3zxh%U8Yk?(XIPIeL79ojfR{4z}!^xo!p+=~yRkczDOZ`_^7S zCN~{%>+XBul4SiK2JUYr)+}w9y;1!8_&tv@qpyKk79aTPoj*T<`sD48a3e48n)|n-$0Ny2hyR*-|4%#T&wlDe ze5LdkaIUlJb$$Jt+ThsUf9w<9*gDoHT(M|=;`xtH9KU5ve}ULIw)fE1J?A%X_&jk# zuw zwE4i$ZxC_#pL^OCoqfiyS}s~yPi!0OoIkYY%!?uM;eq|qk?@aNvZ*DpYuO$5{s6pa B!c_nO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_side.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid_collector_side.png new file mode 100644 index 0000000000000000000000000000000000000000..5f7db1c7c739bee10b6eccd3f9df80924e2f4022 GIT binary patch literal 3517 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 MX@2tgdAHp4Cj+ag4FCWD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/generator_internal_off.png b/src/main/resources/assets/actuallyadditions/textures/block/generator_internal_off.png new file mode 100644 index 0000000000000000000000000000000000000000..76854d91dcdf098cf8f234ed99ca5afe060d1d67 GIT binary patch literal 3216 zcmcInO^@3|7!KtClvW^dsW@4#R9eBrp0Q)cX4A4ww%v$kS#5*5y)m8{Csq^N*xpUH z5>iD^+*&FQRDi^hijQ)s5D0PMz=dDHi3E;JV;NjPx zy_s#c&bch=mnn}tQ6BbVur8IBP7PzqE{RO>L?;Mq>L1^Hrz!!jsTV3Oy%pC*H(0%# zi1U}%+U)Wr=5Y1YNo8s1f`h)us50#L!qgqs)RA8oo@KM9DkGEZQcYc!0hP_xx>Ao4 zp;%=dF9&S-M2M?fZpBc>mkQAm?z!*YXo!?0L7W9qs7R00i?*_w3Yq35^y9*9 zn2uorz_cNaHC)zZNh3qf3cGkK>5YPOriq^Di!e*U78ka0H_D>48_jWDbngiO(6(Ad zjG4Lg`$dQ}TiJ#(#(>PUPTM=N&^AOGZ6!>sY(ttyC)K3chSw;84x4Vh>*YAV!P z4g&59YGaFd0&!+n5#=UDjzcN3DmrEr&Ul5e$@oUZwj?X%_rgPy_N)^5wth$Rc6J(Bl9dm90wyRoC-3qSwRlNJ`z+H zLDk-L8*QS)1#$q_c+kZK{kz?-hXKq5Q58w79RBm5 zaR4*K8nvwlL($u81b|GMCt*$ZT-@6O0<;U)r1WK&loV*1j^*hz?Tnv#!O7W3dk)o^ zVf#p@rh~W+2vO4~$gGH}XEOt)lq_jdnZQLZdUJgVTrmtzJVgA8jvU+c5%p*VSqz&t zHfV*L#+0v-*E~h-!L^LE$6XC%Z9C&E&WksTe3X&gxRm7+#pGfYTpc$DGw8ZMV&rZI zT>+GMz#`7g(#X#SG!e@k;L$>n(B>u|h1(*TNKI4RwJFhsDzDNB#P>mj+q&su z*f8~pc>NcM#?!~TH0%i2`?ZHCh7-Xp%M!@5oB@)7$0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/generator_side.png b/src/main/resources/assets/actuallyadditions/textures/block/generator_side.png new file mode 100644 index 0000000000000000000000000000000000000000..8270678e87925c9cd1df3583c081c321649e3814 GIT binary patch literal 2111 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 Aj{pDw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/green_block.png b/src/main/resources/assets/actuallyadditions/textures/block/green_block.png index 8888a3cdeb8cf9c7e2c4fac42874101b4271d7f1..af48159c0c5d02f913a4226b111d4117a083add7 100644 GIT binary patch literal 3302 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_glow_animated.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_glow_animated.png.mcmeta new file mode 100644 index 000000000..4b88a81dc --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_glow_animated.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 10, + "interpolate": true + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_side.png b/src/main/resources/assets/actuallyadditions/textures/block/heat_collector_side.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7e01be62d96478bde9277c876d541b77a35cee GIT binary patch literal 3630 zcmcgv4R93I9bXWKR7GKm8pMxf4U~v``*C}FyE{2Tl1s>;ca6u1fde*MGPr4}Uchoo;9JP7PWaA3#k+S3SMk_YP^(B+3m~hpdh@UJ92j=)T86~;P@98PzJ4T6kQ zbV9D4S$**gX+Rg?Du>=glHw4WI;Hm13{s`1w6S!2q?0P(p`Rel14(5OPY?ol69Xf3+P zT{@OR@6p-~FSh=Y7c23Gia&Ir-Dm(769v6u#e^WmVPhP+PK_AF^?lu#P~s9rToiLG z-R%Q5Zb}gzP1+>537xmhUTjynp9MA`yBD^d5Tn~xhOQJe?OHU*X43{N(3a~pQE7*$ zz{yN##{s>UhDh`)Qc}SJt79m#0wOi2s3K;AK#-7(u!0m&hWKj`2?<`(1hQfB<>vLD zKvYT}>;`5Elf9q&2Ejn6VoAU}OGquVk|Ieg5Ou%?cz^;)00Dxe4*xyh<96czaWHUF z227H4j~5k^Obi;rwo%1_YMxbGpbL!q@7SA^aZ}qv{_jaD^r>RI;lAF9itphfl5Jjf z7LG33xIJfz93*EMjckaMY>`uG+#aJnZPqv4BE2qBfT8NRS{@>2VDGVV_$Duv<2yD< z-P+`EzJY(8p{QveMZ!&q#aq|LL%SJa?r?Ck|EfK=d{VnSotl$=q%}PM{#VY=U-HtC z#zlYWvWLju}`jl zy8hQE&TKrDYTk5I--hSq6YFPD+uvgTc5dUrlWl`@_Ww-Z-#@%=?K@v_)0Yi(#g4z- zbMnypFRR}HwWFuct=ipMvo+2<7k@0i1J7G9V@`g1{K%@^ckg}Y2d7edZ=3mW)9+8r zdgwh@dw$iDJ8pjBu(D;^vii%ZtEf*KW>U}h%x%4E?mYP0(MO&<|J9aFuRmiCr5{(v z_S9av04X2Oo{jiJ$jkyDpZ@S}e;KlobmH(kCLMmM$Byt!sRoc-p8 zoy^!>bpGu%*F1XYha}=}6*~~HL*x42Nx9p*=+pk+ue|W>5 z*3(DNHq__WF1+jkDXNYcJAQZKOl;Twljc0Q;+J)i#rYT3WQN!M;#lf?hi?1nV`tEh zH-DgPf%)w>UCm6VnCtG?*uL+xY4WaNp##Rs~4 z|9s{T>-K`$*rILkoaYMiK$EaV}nXaXcv7Vv&n;~=9*d2O?71Jwu+FV^aL zr6G-~BCxC^F(iPJpX3e~|f$)AuJ0lna)?Jz{0ypMz=~f*IM$jMW=y7;g+22pK2qgit&)|I!&$ zfG)z754{p4#X&T6a^=!dRDBSuzjstF=WTxJtz#T-+2Q^1CmF~p-m ziv%^G^JcOI+C}bLzy_#$LE8xux@{)#!iL6O69<+RH`EMmsg|Uc>ktJvi2?06pyl!q zv7E>&B4kJ%sw~N9yhe%=3&{XrcumltsEHsC@t+`KqBJivsA1Ci;`MhR%B4?j0?8Oe zy`TCA!RS0k(`e_SPEL!YK%>e8I87rZonZuBV*>#N?diYfyWdLu9|xlj%78(V?(w2P zl7T_fpluX!pqOU`7w`<@{vCURGHz%+H86k(}Y}&dkw8?yu$y zm4oOkBcp~mNQ)dw;r1BqX*2(6i}b2U28N>JYJLcvfxXwl;TwGvj_)vu_N|Q$=g-gm z=vE9X*%A&_M$1+#Y6zOg>CuZ;l^yu;o{}q0?ORi_|7jt1s$*Z*E`u zO0ECGsEIeNZ2z^ibN7agCG)o({c^$5CEqL`5j{H2_+i+|^!Z!Qe7>Ul(Y@6As}{^! zKkm1E`dw2eTt8)U>AJ7&aHxIDffLwbX6}lLo{dUZ^SBz=b^P?h=x&)ku4``jp{?u6 zwtb8(!QVUE;dI{dWW!UB1M%e^srQ)~SMGCVzc~H%b8Clv_7!$g9JWu2wTGu1x?xY> zC*Pghe87D3!BM}TJaghVogcPfe+uz?hVsUS4c;!U(;0-U;J+bU9dfV=ApBOs^yFE0%Y<*`* Y@XR}<)kn5&_x>#l*VKhJRV`TZ2Rt9hA^-pY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/iron_casing_block.png b/src/main/resources/assets/actuallyadditions/textures/block/iron_casing_block.png index c8d32c603ae5116fd9f0905ca086f9d5ee1b1418..144377bc91307198934835f3b4c48529e6cdfc48 100644 GIT binary patch literal 3579 zcmcIn4Qv!u9^anaS@6^bxLAxPghZqA8%=1eD#d$X9NO)tK&_vR`Ofre=C1N?i-#;g~-ozyQ$L+ z1g@Ipe=7o82CK=#r$(~F>qsn7kd+BS%~EkNo3V*>AW*X)YeUqHJxax0h8d;5+P#OS z3@u8xO9_y$8*s{K8gTH^f#xI{=tiwJS$N1}ylupCTti8V*l zmDbpzf-UkErBj|~D=gdB*B9&)f|k?8aA!O{5TGK7SL;z#6&}O+H@I%T8YN#Y<_c-aCaSgFJjWgKvTq4Vr zWbKsYS#HXjKy_*Q5(5O?L6o02x=>P4?TEZN;wD;~?DFOWeG< z7>(<-;){4rVL1^mE%pq3g0=q4B|+h=F@dN*Qxdh61_wjWa*~#nE^?=(h$6-FK|sxK zH%!gyb8q!yC@jD+=;0{s6Nw=#56rQ9K#7oPEvrR2%$?v z35zx8!AXTRr0ABDfg}e;26kcAHoIu5lv$<0N?Q&wOuQ4y$KwqREsmudX)@uqF0QBI zjSV4A4uu##$mQHkB$T-6deB5T9*fc>)}Uc%3Ks@CuS1SOLI^Ne5@kk~pup%5a}tuI za99?L>thz`@mcAw&ljj>A)@1=djddV6^2zt$5>;KBtiy;WP%{l!jRLU%15N4w!0mJ z^az+P*Xnzv5sgR<@w_Z^48*d;2%IP}GU9XwLx6dVWe7DAl}`(Ws39&vzYwEzaj?Uu zXSydp80G=FNIM``VNvHK^B1SvOoQZtrzxLUdH9!-9!Fp%wsK=FMi!?#Vg^CR%{vh) zpXt1GhBTmya1}$ZBS~=yP2EC!s)t>Lr?gQ!KGLcT0TRMG10YG61_(k>)Okjfa6}Cw zfmbnK!}^_xsK__H33ZW73xdY046jRok;9_SKov?%2ytSV6QHDtLYc0d*1U`Cw^xi z>modwv`MfNI&Yc1*eP@0h7KgV7k1nztvgnRDit*4SroMGw1IN8WqVDnutSvKq$jlF z!rse6#0wEojbM({AmSNL6E!9x^Ozw8C~6@MN3;kmLi`PgxFir2j%=8q*u1_AM1}OB z6g0aq+56e=5sU~#Bt}9q19hY_As|MWhz3PQ6%o*MtU?v(;{`KrC;pLxL6b6IlBD~* zD3N4h&@}8AWgIByS;++|$G9KH-lUA1+8*-lqWqDQlA9NDhXw<7#n;oPqtv(&3xDl#cJ%Bz5bM z!}%v`YU%@likyLj^~~cB910JPYaVZJufy>sM?#JpK6M)r(V{_ot( ztzT|VF8I@Cs&T_dRlj=s{tw$%o~XR(-H-1Z`n!7Mv!mNzp(?k$zZH^yDT9YjiHVBT z7QK4y%P)_f9|Y$YC2H54=v8i=KsH#IP#b6>75_M=eNPJTM|!xaqK;3cyvu|&4GvY z-@kCxu6u_nT9)sx9eP4^&fl%9NADinbmfO}O>^fwx#+o5XD+OMbJ?rw_oJ$5 r&({vTF>l{5cduWu(hAf+w%9=@fAjD)3;*H&J&QLs$F|k~`k}7@jhD&2 delta 222 zcmew@{ho1xWIY=L1B3kM|A|0~Ey>&6h2cL4F4((#GEjuGz$3Dlfq`2Hgc&d0t@{HM zWH0gbb!ETLB`YMxacbU8C!kP`r;B5V#p$<`H*zs63b3kIP3_wMzW!C#^LL?wyi2@= zcO*Sf?DjEUAJlbJ!c$W)S*4{Qr@@eIZ@EkOlN)=>*IkoZ)irbBs^ezH4W)ZF+nuo7 zEM3F&V9w#{`VV!xv(}!m3=DlXhkeyA2^+Th1O+8~gN(InUwu>Be|5)m9i=-N+p3@b TNmFwLI)uT~)z4*}Q$iB}Z*o}s diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_interface_hopper_side.png b/src/main/resources/assets/actuallyadditions/textures/block/item_interface_hopper_side.png new file mode 100644 index 0000000000000000000000000000000000000000..079fd8b42b3259d66ac2963b076a6fe7600f2dc0 GIT binary patch literal 3510 zcmcIn3v3ic7(N6H0>)O1iW=N3MnT=%=RJ1isBI711Fn?zDkU+7+1c54DP0tVxQL=+U0YE)toi5k(UK+q5{5~E0bpdm1^szUFY0A(N^s-2rOWXCN z(`f8-NNZnH2KTMRvPRd;r{?7qaF8P&qVl<{=_>gIUGS^Gv)|0pRKdhsnV@U^fK+?B znX0!OLPf(IgE>y1Vse;|N>V(2EhTUQ$8s^2=NLgyxTq2lsnSJ5G)L2wmgEhkSn!sh zJ3Y@EEu=f^iZBL-PvUiN#bJ1usy>vDc>Vftu8M? zL#D+Na(3X>bW1P+U~C@QEFb3lk_v_z4(#kMCtC=vVU}b`j+mYcwtQe~cUqq1c3Pvj z4!TbZ0MMq>L5vY|$>o9&uD75Y$|wOcqP3gpwF%ooT&v5$WI;EiIlEkq>$Q+mc#dN@ zmh}buwo>m9iTUm zP7c8w7&+8ISljHNsbFT6dMj%=5E!x(E8A1`_05i@8(HXZTN>)9)PnjbFGr({5atW% zrqfEwbUkEZl1e6Ms5NXDnj%F+HAW5F#U_K~_F3d^eC1@)u%)E;qLO^vre@8)E_o7svrz zr9sQb=s(rnW*RUT0!{hED#G6i8V4{#tU_C}ktf;qqyfmd#U!GYJXziG4t12Cvc~+8kyd5IVKJurQzkPS2M8fa7Z@o*;%W?wf=YyWtglSqq9}T! z`XYQp6g5F*1UxdEVSlj_jV?7CBhYnx#3;J$=_EjjGc4kwnQQ4@4{}It2k>Z2kzhwn-ZHz1 zQ<1)n90a=;aohy0J64Vg7BuBq6teBCfeW-{yG^aMLj-WrqsDPj_n9FQ#JHr!3D4*R z3kLC;BEoIW+Lh z%`aZG?PPy+{UN;f=)T*mHAg!``wwg~*6`~;yl>S$O_;D^&FV)dU5b^aEiky|b^7Uv z$whBZy?)B!KW6V~yK3Vqsk-`;{^8+6W@>QN*;Ta-KQL?G{c`V7>Eh|Tw%-)~t-oe) z*Fp2ular1dwBsMVe66r<)3*KZ7=6dK3>`T>^Dh1Cs=Bte(1BOl77pd6ePPFwt#jKx z?Hasdxb^+xx4(AN)bn=SGIaHBXa2^Cb9SG9SIfc+H}8?wK5_e-!)DFrzu%debz(X6nz5YL|)Pknu*18pU{|VPB Bp5Xuh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_interface_hopper_top.png b/src/main/resources/assets/actuallyadditions/textures/block/item_interface_hopper_top.png new file mode 100644 index 0000000000000000000000000000000000000000..96cda511480b90baaf87bced21224724ffd093bb GIT binary patch literal 3554 zcmcIn3v3ic7~VqUDN>-GfPpMa3?T09?Cb7!(<_u-OAk0`t_80IjB~rQ?b^HDb9dWb zfmkFEB?JScfD#PE@QPY6#$w_NBZy#(#%NGu0=@{C72L^gYOyEFfM z|NnpU%|CPN>lV%(HDcljf*?kPYeP}|Tk3v>4Z`1>HaGk5&+t@jqfHPa$GM*pV#m($ z_~E?X5OZRY1+ro$y-+pd$eT{4ur)!H&q}AD(t;c^j+%5MNL_gQ2u12@ka|>%fJmwe zHS4u2EL6W@VS}=wMUhl$Rs~s}mN7sQIgm^z6NW9PgH#4r#?NjuLy;L1rzJ>Lx(>-$ zq>ijIEkydffK~wDNWbJ|eS#1OJVJ7S0}SvpETB0~20mHj$=pR@Z)F zFdUl~20Oae$5^-LmZVTx@59vXDVV0@Dhol!v>Hq^k=IULo<)-5ynvkksBWlcyFJ6r zAvXYppo4;xD~HHI106u5}cfvNVtySidZ~_bsMa#VT}Qzs9N} zYo?Wicnifz zx~g=?XBVhyDj4HtcyX2&CBLH52nIA7B0;1jk%crXKn^J)D+LhDqb;&@Tq9tj7}bqR z#fVDW$8nOxVhBm3dDg{ISPjDh#33X>sN$?#S;!a$hXmb)7^L!zF;||6)@-An1Ng$_ z0AIO5js5iB>|Si>crGvnuCTK7*W((8X~w=XZFPDYC1N2RGh=6i@D=wo-r9o;&`rAX zsaN7jv9V0;TzQ%Un{rPHy`m4MB?uJWuh9Ss60HKv5EL|y7DNSV#R938v5B zO`{E2Md7EQ1@Z2MEIUYPmYF0A3z~FH5~flKUCGFnX*1N^4pE?!>eG)6+ip)0#|MOX z0I{@&6pm(9L8Su{hiE@!1=XjbfEvJSuvd!M1|Y~R-Y`MFc>NcOa@a~UG@20J`8|I&tDEl7DGFjuU&dkw8?ycqwRD<{| zBjXLRzb$eAh1*rMi)P;G7U@=z3=Kuc)qE2^1G|rf!#92@9N&?F*R6#Q=bh&h_zytI z?r^BGVftni4bE38%Yq+A*hA01f1=DY^Xa*s@U%x_=G*H$BRBYd9^_d<#ZJB+`(tQy z&$p+v#DD7TP~kow7>pBa18AkNrcKaJkhiC7-~Gcv>P4#Cb138SbJb6(G~qvnsO{% ze)v>$$G)TA*A4sJc=M9?a(UAxG+~V1?f>eF(f;lDzIXDC>jaqK?7FaW=kl>bO6NQq zWX{f9{oCmmdk&wuaHQ)H*Ku`A&$d(OPsh1m51b=@c}n7smmLqWr{8*E`0CNS7X8?D za`((}54YW?jH*6KoLKwGJH*ASe?7SRuj}D;V~NYBpDA5iN>ofzAkRwd+%<&_}$BsUU^_!*Go5kzc$XZ z=W9v*;f=awxidGGA7DW7Qkt4lUrdx+Rr tb9CjdeKWqQ9{0`_Vo%qYSj&yUT}Qt4Zapz^zWXmMT)i-KaL(gv{suV;tr7qL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_interface_side.png b/src/main/resources/assets/actuallyadditions/textures/block/item_interface_side.png new file mode 100644 index 0000000000000000000000000000000000000000..fad3c8365e387b87f60e0b10c0007de34438ee17 GIT binary patch literal 3596 zcmcIne{dAl9p9ulgkO@5Ol^YVy0kS6?(N$jw|BedfFu{p0f!-k;WCQDyWO|BZSHp0 z-M!?3rUIjmzXrvIP+G86ff;A4tvJ%)58{-96f>w~I!yln5!w=96viJg*81b^{o=3* z$<(^DxBK?J@B9AvywCUh-aXR1^!90!t0xl#F)h**Zo%(L?^jWdpHFT~i1;u-+PTW6>qDVy1jhHRH&aNm*E$AZq7lEU0uKmyDx!-3U?VUmKuE zT@6ty{ZSCL8c;%ST4ST-YnHYuYdRE3rRL8gYcn!dkU}mbGpVHE$e9q8)hpw+*UeC5 zR>bWHQFWd{G8Szn8%!IKq7Tpt02~>Re5@!4!QibV2ROih0K)>B<76PpexA%<6t-ro zn%ojzn74($LR7+aEtz4uy1IN_yw9}T8CH@c25=0=(O80Zx(yd*Xv3LZ&=5wBV(XTx zn+EA=gmE+NhA8Z5E`*d-RBJeSm@r^W23id3171j3K~*WrS!p|&HLfZQN}?1pTnEdt zMOiChx~7vbM^RlIzQO>8HX1G37}1whs%XM-8#{3rc|b;#c3QhF#IzvCOxp@-?8I)) zE=1$FE$A|yi|dJ489#xmL|vbeHxgPAmKY#4jTm-a^*8k%iW)023>X}P_g zj5IcgtR#vw=VP<(Mx%1Xa9n68C=w1)I98votFnT40r4VBv#O}kaY<0CMk2sA?)$$7S~bVx<7`bF?4@gERnwpN5JSr!`3h8stPE22nxV z9kz~Z1WcA{^}JF&ui_%dNfJv#B>8Ec#d;)#)o26(;t-M`RB==uEo7_)y9B*N3{i#7 zm`BfKI@cNC0KRZJz*l}!+Zf}QhgTRnUJDF?N30zD%W;jvFk@TUzGgjxlCiLkk#TZP zh@~TKSB~HUbQ!Kf=yiBe986OuU!Lk=d%l&_=Z%bXT!KL10~!sWAkk_TX+gul`%y3+ zP+f0$ggeF~+gqD@ml`L(UPD9P_5Jfnt zQSCUe^Xd?Bd{Br75ld@G;c!|DDjk$KLS@Yt2T~GSD%jZpK%G8wQV``B12uI`Pn-*T)X7tNi2Ci2h7t zf92O}ubDFUrD@cUE zeA7ewU|V1Bk(smJTn(CrdRtzN-TFY~Up{$Vh^{(%;}dW7qh&L6ux;sYc7CwcOb@L* zeG9&;2bp>0{d;RS%|Gn!)~ksL3sxQ7sclTTsQCMm;YH;atgnB6#_s7p`)TCj@TL!vlRvJVc;eH@uT)}h z&%E+CpB~tA^CV)~qQ9k&o%@Wa{l(|&8aM7Nuh{ow=-zE<**-jJtq^^%@{`a1b9(>g zS#Nx?`cmSvbLU=7(3gJqWoS?Po%;_T|M@FN{C93RHQW|?D#_1WaKl@Fy8hYC{TsLc zVfu-$hW1e#%4Xbl@4pwvKB_AtY92i~uy`}7ny{|-$nMml=dWEfr%I{j4{Yxx9`5V? z$s;#cRYiw}`};1KL(jd}H0Ph)PycJnPiuA%!41mV%9GPOd}kx6)Z_1X|JNdoOT#bL HuU`KRc@M{Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_interface_top.png b/src/main/resources/assets/actuallyadditions/textures/block/item_interface_top.png new file mode 100644 index 0000000000000000000000000000000000000000..3694680d695bdda28420aa01eba57aa07ed6a0c2 GIT binary patch literal 3577 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 Sx8>eHWU-nB(ZTB5?*0P-ZM(Ms literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_side_b.png b/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_side_b.png new file mode 100644 index 0000000000000000000000000000000000000000..0a4236d464b516c30b06fd4ccb2459698203b756 GIT binary patch literal 3548 zcmcgv3v3ic7(P%54>2feP*B$em8x_5xV^`2xN6%g_LPG@uF`^NXLn}XwRgAc?zX*F zF^a?lL7|D7Sn(0%A-)JAAQA(L1rrp43W`X;2dM^QqZKs1xai}DxFNEEGZqPGkPV`cDfmw%81y_VY#!P7Vx~p1|+|a%3U6vuIq_BcPjHJQatZvsj0KI6w=$QA}5C2 z1RQ}j4$}^i0AZ1jjdOy;a^!c7^JKH4F&$}Yd!Z-?Sbv=3Bq1OP>?xvz#R%GPP+_D< zs%|DB$$^%HjhHb~jWp$ERw~mIx=9QZ?|g;*(Xz5iQ&+VF8L+BvD5aw1WdTkM1OV^l zGVaD=QZ!}RFs0yVButZ7y_$w3RuL4D7eXM&aRTr`K?ETfL_k#JfDbB24#+q^KcXuw z4lAAc*#(Mph3Gix9xJj?z$yYlAQS{FFF+8IVG#IbPL)Hv>PL#2*EY-4NR5DrLamNh zh-f6nd0rGb0I}!?K2Goxhd32r$YLI25kf?wa%dqDHN++8EW|LK@2qp^nP|y&26>iT zq#TedH>rM*@sq=~DUIZUrzwY6S@>&6jUzANBG{&h+ zL`Amf4X6uqexDEVG9U?Jffy820A=V00fiHSoDceu;49FT(VBIUIejdd+9OqHPHgQt zFKX}|u0K?!+(=N#CQ5M@D@Js#TkD6eLnB63ZCev2lsL^I&Wc&OYPUfXmoyR{4O%3a z0iD-Vt=KGZ-+(40yB9XCFs+(;l5!U`W$P3)jD)6SXv?&wP;Q5C;iLz&W5L$bL&W<+ zf*iseP_e=T4haZ^L>_}6yT}>XX}X7R^5Gueaf+;4lN`=VsFLSAo?%_l zNJ)HZ=Yv)2Zl72(ZvOt{$8#5c+hFaww_)9p4*$1(XRUdE^}5YhFDst+=@rY0SD2mj zmD-7Owfm&nH_Okw{YTr_vi!oYZ{E>8rTIYZstM|)y>C2mKwNWdPSIKSyuyw6eZjH` zyN*^Db-%b_aksqX(3Md$G|4k1dR}zr@w>OKJ=Rs_dtzqWmP>k0L`SfX%~)pX+ zTmoxr#U6Ei{lSf;BYWR?_?6_`qLn}W_S)FXr>>m-UHRp2AKH1_{KJQzJp9A_Sw}V< zI~F{=wQ^#qXPf8j?bk2Z*R55Z|K8EZ_J49Gv+(E6r%q_+?EP@U_Rlw^dl#+V@X(UA z%&o(zh1`fEa7yp|-+ycTK-kn1d|}^>BTM4uqF1ZXO+^P6*SvIm{jT-jrSD4oP|@(x zCHLQZ;(=$Lo{{`=@6x?R7kPRnCBOe=pYGYyw<$fTxA>MvaI~xHQT+4Lrza0@*gt2^ zW!qNo8SmM)Z+vV0qw_xc^@7M5yW6`~X-QQy4o-D5r9H|?si&vphLk4-86V%+f0 ygtxY@?CIOQVdL{xf8Jd)r+FBvzi^E5Zg>ZMV8xnu)~<2>e?`k@MqVy$Snvl9#Jzq1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_top.png b/src/main/resources/assets/actuallyadditions/textures/block/item_repairer_top.png new file mode 100644 index 0000000000000000000000000000000000000000..b868694e20796baee65db24d591f2c944945c276 GIT binary patch literal 3678 zcmcgv4R93I9lsD;f(pq1&15X#X7Pix?Ct06-7YyW$psU}i{ZGIi&N3JyKi$Vcem^A z=I)ZA)Tv^$paP}f5V4MJrbDCQqf*L{Hd-xCjI^UQg(6dQv?2%^Cmq2mOyAxYK@*bE zwmWxwyYKzq|Ks=n{r~UX!_7^%PQUuPt6eVF^u~rj2>q5h-;yclzHw8OM?ceyh8D}^ zx@MO1Eplytq5?e}*TNAy61+{6^|%`-x&+R?oB=rG}mj;65Ov04@se92<0IxQjvacBc99gig}G401QdPVf?43jvP z5wTbM@fyb<76~?Eb-D>L-c1oQMKPFHaML`;`Fsm8hGHm^@{%+~FpNm?qKCzD7mlo% ziYkTzOLMl+n;(zbwjq*aDwT4lShsGrlC&TQB*l;nLm&ylYERf8O(d-Oc?|(*$);x5 znx4QMjX=`dY(I`X&4v&+3ThKp4kiQ`nFa<)yD2B6jG!VHB67=Kw z!H7f5SX*|`%TVY-jR0M_MJ*G|Uz+}2LPNP=aLl1p7XB5eyCIm7t;|@nmWHuNKtsq_ zStt0>GcA|Tpw@EwV*Zk6w?-ujkF{HN@l$(K>_yh)3BcM5jSD;Vvfjq=tfQSxLoJgasve3D{ z3Pic|$x)DKg=p6&zeX^~WdYJGPk1P=K*&7D6M*;7grq7AE>q-CaB|bN`()H$3cf&Sck_Tj@L)i2-sP}$Q*KA2WnQn`F~5%$1KH3JHBDD+Bb z=W}b`Ja%kz=)I9o2b9f&|NQrbiwd(TG-Y?Z%WA4Rn>@II4lOKSv|~oM9gk1HrDrG< zxwfV3Myz(m^KEy!wuEXQddD|7|bu5R~&hKskq~Bq28s;$@N3W&*}Rfd-V5RH{5e>?UOrhR7YNm{<5B1IQaUs z-Ve5>lBc)*X#2WH{ycEXs6OUDA3Fc9kB7RBJbSKJ+djCYq*A)j^;z5Dr{rD5lsa-i z>+9+N#>N5Vx#1iBF>Be*Eqh;!HZQv$+Zby4)n8-$>Nk@&{j{j;!Ah6ZQhxID)2ElU z-m{DE4)>pUY-MxRzB9WI9H@F=LHYVUPh3}0>56RqR`H>uOYZKOck`?JR}DG;02}L@ K0=>0&|M)+W+4+$G literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_block.png index ef4b1bec3e42cd46cf257138318f5c57443ed928..2f0dbd1a2b4be6eb3e2f72fd49144fb54e4fcb10 100644 GIT binary patch literal 3375 zcmcInTWl0n7~T>|0EG~IkPuDAp^a3Xo$Jo-j4W7o3te?<)2^ZAK|M3)>~`$Vg_&u) zts$Ub6oQFV6sh7vr5b%8Mnl5o0SzjNBx=w^4Wcpe0SyiD79T|PpS?`C*wRL1vO7C- z&VT;PcfRwTvpYN5H!NPXVo@X#S)6H0cf#+|;JaWR+@IUiE5px1r>)0}L~gt}_%=jF zUs(@KphLxl*9zQ`-22Ro&V_7ci zq)4yPHtdqF;r5(9+@~v;Ub}``T~fh;Nqj_=%%bI~r6gVUtHN{8%+gfZ#P3VeEkQu4 zJKI5}Y?n}Slw)*`6R5ZnZ8UhPb;uf~G6 zB;D)#j>@uwgM-mQF>1R7mRA&o*Vm-8T`rTqVIM!KGBqp(Z4{Z6+*6Fo<+v~Mw za2<9}2>{S$vtf*Bb1}^@gy**oKp9m)rnUBRLk?j(iD&n_I%yq%G*{ND@%&CQiRT=K zgLydEH}W%#4SJ>&MM}mDra@0=>ZmD~Am4U#wq2}or=x}!otJ|@${m=jT6lo&BiG)9u8IHSZkj=_Y8vczekAPBW=9&`=R2vn^18f1mR zqprzY1f~vil*+fVqIA17cO+?*fejm?2iVt-~mhVt3jAWV}iea(z$F)E*F^Nw{jI zx4@)$KvSv~Hy`Q~?ViJ<1 z5CsT{c@P4SCmrMoOAL-_u-R*3LJ+0tikVi4uX8c_tPGfC(gR+EB$*jBOkAUm1NA%$ zQ=rO>`+wri%DB1hA^%>K*Ljl4I#rPy_DUtHyr(Njt`Amc`RJlfr#W-wAe?1X*bryg zBIhF90iy$N_O))2fr^x2s5`FKn&1o^JcfsFcnOd1#DaC}!r@%H|Ck8}`-x1tCAVtN z3nTAaC%KzanUBtszqVic`xf~qmXB`#hCVym@OftGt9Y02W&ej;#~R)~w`pZh)5yrS zuiD?57diFw*N@wgT`&H2U`g|`#>~8<=SsIeT|DvHBkwk6Mw4A<4llc}5q&y#=jDU@ zKae9ke|@TNQ(<(k*>Gg+iN^6Ar{CH8?BUdfORt-EG_Sb#;%(c0T4EdbG>*@IZ~4hj zibuxAGk;t@I6m-;Ke}aXKHlBDZ^y*G`)_!O+JCI6X?)~U*y+zUj~@8= z<%v`J@$c4Nh}^!=*}eJl(8A|0{26`o_ivlbvk#yC;`^=XbB9LQ1q*&mJTvh_@Rul( NX>Cs*TKDLa{{YupUz`8{ delta 270 zcmZ24wTWqhq!b$i1B3kM|A|0~Ey>&6h2b6uYW|wLZla=iJp+4*r>`sfeKr|kR({Xf zZxw*bWHUn|N}Tg^b5rw5fLsO!=c3falGGH1^30M91$R&1fE2w{cA)q)PZ!4!i_=Sk zA95X2;P`T6!T0*REZvZ*ZA-Cv`Ai?B6COY5e zM?Es1X*uosDeKCOS)$P#tGur26x~yiNY?pOmiyCsMs`p6@7KM1Y?qy>N)q4LnW($y SY4HJ&+dWqu^vRVy0;nx(){K5HXu46E6Yw}ILPJzRll!;BJFjvOa&LyHpaLXu9} zG1zG|_BpV%uPLSWb*Yj@Y^cR+@-lLeg&x53*^KGR`6yBFE2C$>nIiCliPse+>imFs zN3t1@Sq{X-5KXEy&EjDx#E3i}i9CX{G)q%-m||#>Wo25F1r9G=1d8Tpy4(`qSc-+- zqC}_X*)m1ta=B2B3t3K@VkAkTXqIAG5?PRLujzq2X}YV*9^%kd9mDnv%fx+;K(V^L zD1kC9mXNgrx29Wy2?0jsflVZ~q6MIrf!7A7^GS4kkyI;ryE2&-rjD6wjJeB4sI zeOCJ8iwjho$uYb@N-Cq15YUi?Py#?hRr$1#ksFi}@E2l~C^vTa^vrY@8^bJ( zE+hx&Dh=8)P5*dzn`xlAUnzC&FrtK2j#VIAL;1>t zTogrbN?(u>I8I{~5>bIBr7*9PKmh_Nstg}yI3Q>|SK+JRwU{Dx`&tUxBR3j;ZM~%| zTH*E}AG{zpGEj>XrTU8%YDB5on1rq~BSz6}t`j0k+-4CM&0I_Oa=?LgX~d&xMS_|# zdCTm9PDT1QZ~)r9pyNgf-LbNGu%L0z!hvmP47EU8s>jqyJ465{F=ZSV^xPgImW%L8 z1Tv%!RhDElULzwC3&}8Gcumw`M2mnj#J51iq-b7d(1uBu#p|CyRGL1u6PRg;_I~OP zis2PT(K!W@B2*P$2qL7!q1tGmqAEo;BJpTV|9!qERpS4+7@~swg+qtx8mUj~9{L=&#Pg(M6t2b7smxbe56P zhB(a@ITPXb8SQ(s?sSXvRipqz#c{RVgwDYJV{rIJFTwF0nrPiR=y3k{jpR!hHfwnz zUYA-s_}b8iO>^oN#XrA3xcjW-|8eu;Tm5gJpdL)Wyl%%jIgec(898(Ea-!|jqT!W;!&tofm5bN*9a+EY%>#W`_MO^4JhJD|SnX%aRJZ2X zP^NkzdF9(GHa&Lr;QdP;ip8-@XV0xTn_5j=IK#CbSouv=UGA>trw>1Oc(DC!Dsh?k z^TjVu_J6UNdq8dcZT1fBBKqlWY}?*7 zLkq9%Jo4_1SIlAQEB9-n{?Pk}`v;aUseX$4Xk&PYw|b|rG%G_?LRf~Rj_b<4?<5HTAPEt{o3)Sx zNtoHIVs{5gEC8@=8%Sb*T~`2rh#*vD9PjfyVPd>H$Ff}pnJX70m?%zlxM+Md4?0Rl89Bcit z2B`P`lZW2>eGam`Sy9cx<-u_r)5}yx5D~Q2#vrxUU}nRI+41Hf-QE2gB$5|#cct(6 Y55;h)H#_Wz;s5{u07*qoM6N<$g6v?1C;$Ke diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_block.png index dbc5f98ca8a9a944fbc31cd07481d289d1c90416..c9d6c6a3aae775661f6e5e1ceb3aa1f35fd6c70f 100644 GIT binary patch literal 3396 zcmcInYmC%H9A8k0$HM@g2{E8eAsz^`?X=xTD+^h64{iy2oOdf6A_>#!^sZsIEp7L1 z@1j95M9di#2oOOH8b2rr7y~MVkkddy;v+G{M2X>{ALJ2?xftUILUg*1-hy}BMWos7 zwln|vKYsI@-^{++*1BTa z2<>}&7Jay4?#FYg)q`Am4r(Ln_7oLi`IIy#ePQDym!yL(z0x><8+QPur?zTM3 z?Y2g79dzFkfI^$i1~Ep=rBDb$xL$J)Eu#v^h}Led&n8?uajl|*NplZPb8f8~*J~%k zc#dN@H4g@RhCa$zzvq^sNXZz*)b9yQZ6)OpmP65$5Fbb%PaJJdSGQrF$DJyR|G%(FhtZ&bxQf-c<8+qE{wy#*mWSUb^C`Y3} z2*Yx^*{qT=T@RUEW0tK|TV36pdgIRV4!CsICJMi%3voTAXM?&D(0npc;Yl^$Ovh)DxVe#bwg7^{z6Q!wZ=}Lp7~;>F(&Zz zqH;j5>Y#OF^bdDGV;XcWXwp8hD)4tujiWHrSmm}hqeSwZX@er;R+5O;_pH0MhYHXz zT(#1ZbW&VOQ@1Kl%TQPKDQ_$p8EI8UJQia*;E^N)ji(49Nf&?=A#pW^ML{LPV$N44 z>Y^fgqxvE+B8r-z0zr@PK#oZ|Kq`uWD27rDiYTHbWySf*6<7 zIDtSXSO8FyG!T~s0%8bCT2v!(Eskms-v$xP@sa}Rh8c+0e}SkveYhK$U4-ua++7qS zNd#jaQazGl0*J*WNQEGV0F22zhH(L6Q6H(85taBJ7lX%Sz!;P6^CBS0=%8uDG3q!_ z&$A!}rp&niC*GKh8{Z!C??ri!C#kGc6}jPVSE9;$x`O0#e|46RF3L!nGhPnTvy4JF z#4)zW@d&riXy2Q4w_BvIB4rrrj;pmMdIt6%gTps{36Af?r0dq9hx4h&Zx%zL2@^Bv zWN!YB-8)aV-j|&Ia^d1*zcj7f`{ahxC%*WjeQ4hH&kr;-9$&v-<@OGwXTtOSgL6J! zaq738fxmMTHr}`~^vJdS>8*2S9Mh8zt-kTs=GiCy>_54s^iu!9rl&sou<`wY=7S5a zPu`X~clGj-A5AH=bKt^TjWe|8e`x%6&)Tb}CmmQ5yRu5^oBG1LPIAD$6gtrI)n_k$ z?age;Ou4w|{!8qJ)l$P7#eRF&q)T58!BfV{EoYMlcO6}@Tikc~sPypF9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0eMM8K~y-)Rg=MP7BLKjzj0OqP6f8oe?b+92SL35Gaw;Q53Tz5T2 zXFQ&9baVUDU|?VyDF9=CgT%hVjBA5{!2%uIeEf8wg;2m4nG%uf7!UPug680bhzJL9Y6%4Hj3APPv6OpuA%YWbQ-d8K4 zNJ2Z&?cM*iU_*q6&<;L^0kdQVjH;YnCV(_WGri}&wURLM;vxlq!xM3eHsnG-qJ2zt-Js(UaI~Dx|iz;jTa3O8d zK6Mf-i;z^}B}ngSYgDmCQdz`aWePcl>D?#LJbQaHnO1WUanPK}y_;?GJ`3A+0PoLX zinwj&*YB4SPy3}#b6fLkP5ixo-A7(Gw?Ax~b-m<6iDR%d2ga~f?@L+v^z?ufED%V8 p=jX?=$@`oigCy*+pHDl%`~yuD-V@9`6j}fP002ovPDHLkV1jYW)QSKA diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on_block.png index a4d7eb831fc53c2298a0e1b2facb59132ac2d09c..00f4db83a2cb3d93b22396b4740f9cb65acf0c2f 100644 GIT binary patch literal 3449 zcmcgve{9rL94~^AUn2xUz#oyONHWlOZC`uswb>2EZm>lT#x`Y>5P5B1x5{1HwcU0D zrisxgCa4fe7=nK&2}YfOqWob5MPooALP!7s!33fZ;*SIjA~E`Uzc_GXi>S?AuYK?P zzCS+S&-eS@t*&1%uWa-^qbZ6itE){kkl*p)cjO)9{_@&3iTsRmYg>GZ8Z$Bc4x=`1 znnE7VTTRVDb8^0_JLw2A91TY@X_rV-RK=`}i}d9UFQkM=OMWyG1q(Il62 zt8trEyTZebD;6~AE0*hu!OW_pD>5okkj4R`GwGD=tC={H)vJ={aF}K2tVpmt&Qyg4 z>E>iTUF~?7mLeR`IS$gY65%CLjKv+#+ zafW!B3nA?m)!Kd@CIT3nK`zTjxG7ofgsOcnOE+?9F49n~;73BdhHt{i4B%I@J5G5=&P=E#% zHgwf=yfh*?u+pd%v##CB(8bKE)lSOsh+*QLP&!^$U0v@vrj;TSe#5*ubX`rg#4C~n zV1&=Qn@p;8wjUr{$90J~Lt>3smZ2(wCSZsJpvj5|I88JG;tdgqnj}k_95p397cN;9p;wWl_=Ki@zCF!Bt@)>vRoOq%nu0i8kWIiLQ2_==5JI8}ff&UxP1XgdVOYV2 zor$Q(HN63KVLmDd2GjsFqa0A=kOLZu0!imZk~kDKM4?1iR%^~h_SUgvdyiUcg|T(# zy=cVkMStjQyHSyzOOzfKD>j(?u+Cc#7%pqUzP7_tE|BsKl_eD~Xl|KnivK^ZVe(nDSpNir~K2KKBH z4wUk&=mMQ(+`nUQP{s{y5BcAdliE{6W9FlXx>dYQp)c$(TP&r7>GAh{+ z2iYQr(zruLhuWOm-6F#-l7*qUBWfpZIdJ9pnlVeD?d)%FS4WL{ zV0iDkRa3mq{b&rJ*wyQ%2$|gdbf>y zy>jalk%^J+uXl1kHYTY9?`%4~^Np)#E>CKFzGvpR7kgW%?T6I8FU^>&jz7El(a5eX zr{13MM~75?Zu1U(!3&EX`|#j}=@-XQyH2M2e*OOB)ZgdbdH(WiqjCH&{oYUaKXt12 pZu!-NtG4?auAcq#@QyLxm2tgSsuIH44dI`ox|#)vcjqj7`Y-O|fkFTP delta 590 zcmV-U0ZAqqlGg(wgWk4Hm8N0lZ$2pSSz11SwC zIp^3rKgAp`i6v{-M@4NC~wR>)f|H;g;ykG7iCDR%uOLILK+)HJuOFGl!w*~Ubu`F5OQe$4kykz2f4niDw z<{AO}eNc)qlpH93wf`4xuMXUyZvunXz#xJ z;o+i@>h*e)YZTSWhmmHbak!YbK{^y_T3NJ_x(Rzk8fOeMM*e(qlq3u-My?l=Owx|y ztkFK?;GUt*lsdFYl{IqZ3Zki~fPy^s5K+wMOjjw!$dXB*N@W<1h{$195`<{S*96|<~Rx@D0k5GP?0j-g;fm+?5d7odxm8azDAU``n?zl zo|Z$%+kslst)vMOMi-Gyvth;$sU)bWft=m%V51A_NNW@5pHEbA~k`{PIK&nh}5mlpjNl>XYC+ZZ#XiUGG_WP*x z*OwbqvsBPA?w*ciT|!ZwLOj+fQ5G}`iGogXx-79QR@F!pRkc0l7{C!ISF6?cN&}5* zTH-iaW+{Yak>XiFq-2%VDU2A*VJsu0K~z306i@>$A-@r0WOcCDhi9(8JQ(2^xPT7e zsx0c8W`2Bnt!Y3lIFj&zRZf2oa2%u=Y?a2kj3UnUCJe}oTXsUKo#~r60|Ydlu4?Gb zP!tzn>Q?Bf1!XEvIb+4-nNG`yQTYfI3JEf$F_0l7=o}@8IGT>AJeS5?6YVn-s3?=( zl)5l0@;sCq$|N$B9D#zNG!iLEWrYaKBT*Ch8eJu=Wf$oi$5P@RrQPsj8?1QIgEt5M z5GA@%kXkO3>NhLa$jY!W30!9ejI!E776T-1(8Ogi*V4TLa&U77a5ODR&{H~ZnFH9V zao0xKnXms0S~+t#c2_9(1(8yW>O~pkAqRCMZh#g_i+(`Wa^}8*fDA_P>Zv` z1)_wwf5+amh@06S^1m0U#8YLuq5sN6<@ZE6ldJviEFE2x$v9`G7=*Ko0vqBqTjWfL z+efso&AQnw(r1xU8fuQK)gd?o`;Wol8(xCrJ2s(j9XOnS^Wy*$3f0wjB$`u8cD=Uy zXy+}>cOz-Lp4DBD`7hWnh{knf|=-ew2 zYwd!=^Ly^vv%GFqXz<$8doG-KuKDyy2gz3ckPT;tH#;nU|| zy>firhr5Y}_mk%rZ}_Y;vUS0gwoeW5na6k77auAy7%PRq3xq*=B-+r+-F=KesJUM)RB>csTaDojhs3B1GBu( z$RFM9&G{USG%UWb=+=2-b!WGXKKpz2>Pfoow~s$~vnTUaiUL7b;texIUTK?iH};I+V&^)BV?8U delta 410 zcmV;L0cHNg8odLM85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OxD_*r)G5`Po9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0U=35K~y-)eUnRW!!Qg)A6Wr~vq;?@p!dIBlPuycR81H9+eQo+mL-zI8IJ7x>sW9@4sM5u|^CE%8SBcu{kqNSc#F>YG~K>+x;1SGgFZ>4q)tcYs(d3E3ZSeL+U zi#W#$`L1q}wMYYjZTx37Vkj&wCsswqBoVONDqs(b&POl5uF zt%+unaAuGMDr42qUG+z!&?;*7LM~=4sSmab>i{Xi&ok~c*Dz9RVwk~Wiv`rOksiO1 zbqUk4--wQkRdW7!7@ao=Khob4~s`F=wD17LxRFu+ye`2YX_07*qoM6N<$ Ef+!)cIsgCw diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on_block.png index b9f8e8d873df68772dff7b8f03d069d7c5ab3845..56f2e7f1505394dd970af6b4b06a85c4744ce721 100644 GIT binary patch literal 3479 zcmcInYitx%6dp);6eIx=G(vDPJOaw>Ja>0y?3R{pODk?I?N-_l#5*&0+OfMc z&*MAaIrr|W%8GeoMm;zR!>}>sW#KAxAM1Tb4n@Cf);0vtEzc^eb1-c5c<(y|d+qfH z(8C2iTI<$E9+wm|?gOeRLti3pA!!WDpOdhF(gh0z46q8IF_)5lOugdiI7X0#Ay#jUl4QGl_0X+~kB0qIlPiMCphs)CN$WGk?w8M!$%6OH3m!5%yZ zu^fqK7rVOF&suM$S5Ppa_ao}fWJN8h*oMG0?Wk$SGTf=mpop`qkH%*%)D6{aab|fj zq!++2aAAn>h(sb5aded7C7MB>N4#G;B^ohRU2Dx1Wk`mPGJ?bl5+n8!MJ!f<3kDQc z6-hJgI6yhjK~Txpw{9zzpO)x5cQc}a1A5d#5| z^)X3zBN3_Ga9m(0usj?hP^>;(S0$*hf?rX*QlVK=7I}@7p)8UjkZC}R8to5?ne|~) zY4TXwZ;sK^196-9;wQ1p`=!~025VKfo~8nO_I0H`P`j}{VAgIoe$A%=*|V68{bSW{{+ z$kOOS?EqcrMRfzr_e|FqI?4r0;2yD3@K>WAhhRpwl4F&60>)~?Izq-tIT6U6sp~z1 z8c+{hnb3<+QXE86C*7Xrg8KAROfTpgX;}oc!UZ*w2E0hBG(rgQ8cXtiD9AyDV`a$Z zQ(k96DpF0aUtN$vnNeApWHmocib2EyAOk-cP#8YQaKNwfT#l}!)|89X?PE#y9;r%3_+Lp#TP3)ledUeI8n?%2Pn&tCTcp=Tk}%{PS2IKC4D3B-58vn|dwhoms#_Z!&X0fh zQ6+{AsVNT^MQ5&kbzQ`mz>Hn7?T0DtWu-5lT6AE-y$cJ^VAiA$MxLHAdiP7k`1Yc) zTUu{)U!I*$mE|qiy#BZ2(--b)l{Q_S(}5kkbhiETS1xUN{?}<2Yq#wkf(@f@{YI?+ zS9l};a$Z}<%u{>L7;D~q?yY5$_rAEaqhegmg04r`jIVxsW1iK0Zrr=8zdn7Rc#R(M z%ho5GP98dO{>XDNSR1@@5nKM@vC{d+@|MLqzTMw>{^t2uH4t z9XZ+D_3-Xa?C^WDmmJ!&XUEn_$G;dht*-NC!J_U9!$;h6x^rn)H*xsvHKE|rNN(cI e!t3u~m$4%E>XZ|sSIqGKI+d4HgtyOqdig&QL6boM delta 447 zcmV;w0YLtj8{q?x85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OrHf!mTZ2$lO9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0YynfK~y-)eN#bB#4rq;NwN~XA|c8Z300hU2>%zXmObyX51>eFG8|l|NrlLzj$?bq zW0$Wlw*r7%gd!ji{~mvTCy88ybVQ zQfs%qwk6LCEqV+D$tut;nutC!M~}h$fs2S9)Cv~^aV>TyjYgo|uUWO7{{%;i&pIY^ku8; pD}4BzS7q7%MD1T1*!pu3egT3CLe{l44Mykgnh%jaKC5X9VQQ=}FDR(s#7N_@X(XHvvJmt~qd z9D=ywXWqAh7RRNI3DjknLF&|j zLlkLfL29)SV`G^xN*YalHd@)YBChtWRb`F3wvJqyQ?PK#} zYqq8&yCmmfgj0vMe(!U;v=81nu;iF3i!Uv#6vYf*jR0 zGOl5nq^A)ktZp|*VNVMoq%&o;rc;Co1IFZFhT(jy7gAnOQ_FIhZabAXuBi-4p)@jG z2g`D0*-X-MEhlMBqq;nOfdLF{ELOHLr7!7p*@WXZ_TVszfJ`av#CtP{X+@6JZL6rU z2fMkb6piDyq6s`_u^fw+7rTZ&&025ff}l{&m`2o_DT`*5u#KQ=*>THCmAKPfLXiZ( z$C9{35RF-yq4!P}Zj8r6gdfQ(f@Bnz}Z@0H5wG=eMw2+0s?I4X}83RZ(%g5E|9Ql-Im zkDjUS!e9Wf_`>A?U&TcoGt5s+x0wdc1)xZeSOxf3;u?ox#~ z0h^fVxNrs+pb5B2p@(o%986QESe_bSSMe!j)J=_aLWZpB59l-td70K&oHxkpfaV1x zB?2l29f75cSDCPiLeZO67vcoJU&Cnvy1>$MfY)i5fC4S593SBPP|$e)Bwcx}1s9o% z$C9r-N|WKm)?4&qC0bYZhs>871*(NasorKq8dV%Nrl9NWh*40RO(IN*i)`Y8m}BW~ z7TPG(g?Th%kzl5E-ZFcTJ<0tHv?1ZkTMT&iyA4 z71O6Cq1lCS?`M8QFe1=6kwZGI$_UW7!3%Uk;2@2FEU1zuN(n!%gFnpol$H2@9E>_6 z17=9N$BQyarUy+!wlRqVlX+Hlfy^`RzhiGk#?7vW{NIz5uTzC`!+gII72YESB(L*! zXa4A-OjUDc%RzjWQE)??p+(N7aC?mQv{^s4MS4{v55uJ6YH0|cfxXA_;Tyk{kMGFD z`_{&X^G((l+X*mIyFs(S6CqwJhe z^}z7rJI2oZ?$E104^`*(|HF(O+ci&p_T-0Vprz*2xoe1)nk$BXv*67$NxnZf^11u5 zbRUwpQjINJudLtGdS?ACEj35ZR$bMPI$l1NJLt6E6Pv29e=2?a%f5$N zZyI{<7%$8T|8nu*;GpsTZFQsbN7Vjcr%gPvaH06XU3(2;gdg7dd*T<-%KBsc@jqQv zMLg`=cWLgG9YbRq4js9KxciehwTU=<_BQ3A`Fr=Jx9*6p+Ab^_U$EoSJ1dB2Kk-rr zwdtO{hlg{yZFg>5^>o`4LmSDe+C8H?vc#zay?;FZ&&u8N)M$Tl;H&ZR@!QXZULBfq z@=FE(&)N)k5nsQ2W7Yk`dgq(x=brxaz0ckI+<~#byuEJ0XMG3lSoFQ_4Y!A?S3Uji zZ{PaKE8Dh*H-|SL8C|^X^~(Brn}@Dp-}w3);;~x0^W2y=lH|YocKyCJJ)NuD+HU@) z>vMKaTid74oZSE5OKW^D+;rF2uV3h^d!(Z20}sSY-uYM4v0Z0BXc*Yr`|xt2@8Cl9 qug^d8F}Z+!gE+DOW}@NnmHd`U@!eY+{_g#&i#D!^Jlk;V#_s@PBHE|` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_side.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_side.png new file mode 100644 index 0000000000000000000000000000000000000000..496a8e01009bd1de4c618d7b23940985f51379ac GIT binary patch literal 3585 zcmcIn3vkp#7*3^Xtq(xZ@ofk?14=I0TrQVHu2_1dt#Y)KQ;OKBn`Cp1y-SWHZLgq+ zG9#8Zh{!-y9K{aI2o3^{$_V0nm;nXF7vS6KI1G+&@wvGdhqkoiBXgHacK`h!-+ue; zUT58;siRV(3xnx!CLDv`w21Tl78DhbsVdY2Z(x`D|_y>dwx-MV;R)GT_$@>=yKYiu znD+K|U%TID*)ax4lEkna!*MjWpq&oWg(=!}M&>+(k)zs1(lsoT^gKevYIQ>t&NNd( zBAItM4~Z^{A?8PG7IqMYVXcwOe2%)NG-DK*pIN!Wid!}gjI;9>w%1ft)Y+D9#BqmHUp1brsjLuyBnUL;1L<@l z5xK^6TxhDOCLE%0tvM>x!@?$BUT3fDOlq$%s5uMtKH43gX5xo-$z< z8PV(07XkslU*i;-(*vwGYdQ@T7{Idz_#p7ZfX4d^e5Ji+Qe;kEOImy6YQw9oBb&t( zG$Wr6nU)(Fs+oyWy~T<&D%))ILf3&2BjdKc8DUDCWD#e~97}iGp^eI8m`DAJ1k-2o zmf42vg7lNnhIscvwiBXs+e(o61x>mZ36sgVp{8lew3%9VhseW8^%=*3Z6}9_^NYM9 zB0%d%7$F>o8}CZgZL~X z;|;N&Epi~j?J?T(X8qeO(o>N%3@Y-BU)qxL|j1!AqxHyPqe<6RnMds`n3{DfDb@ik3lMXL_p*W9sX#lDy|cjLQ_ zcWvFavE|&ys69^~o%{S}bLV~jC9!kUn#Aqvq9tp`TtDu$+sZa=nD3YqjfEd|HN91h z@58#!t9)b6+J%6aH?Q_%@wBCvT>i?8i4T>KTMq2|X>aZ9gGaX)e|_voj3`zX4oz&m z>9>)uPrl);XO}El)Uj9UE-n6MM)!X3GEuUA-MjG#gI8SHvik0C-rV&=_bi8x~-x}KIdR*f>>Fbcc9jVd{RXnrWL2gM~_jYsmG}e(KM5G z5~$N`>~~RX|N4y9-=)bqRlAB@nOCra9P%NV&t)x7$;YXJUIpI=!!$(}MEtHeRTmf} z+tSTs!gdiUMi`(m3`fS~2rCMLB&{GhhGS?ZMzajyIE4|FC{LCy3R`n^LupB_E!o0P zajMhz9fhWQdwV0je8hG;XjYbGn&D`U16TrheU=aN!19)rH6)Rzxu)ZrwnYXSp=x*g zaSD4{3?b))YAvq>69$aVLx*M~Ob}8*P}f2^r`ydIjO!YWvM7fv-@~$ODC>0EzU_6| z)2I%oCmF!drqiK~DSgT1LKB`}--E*_0Wzhum+5m5-GV&3+tpBg4|a1|IU3JzK@)h+ zVmTHM7yG6$&DvmQQcx&wP9qx3grbg;a1r!vH)Gq`GIyHGD3Tl(VaVkhOiQf6 zGFV?MP~FzBjtTc9LuMJo>j1?V2x7dT0##5YAVEV{A&l|5E|#@D?wYtqz-*<~z$+bV z)Krn*A-NnHe$KVUM z1ALVhwa+j=G5v&P;#_bP84#-oe=F{B7-np%FxG75QMN5Sb1LFi(m`j! zDvC{ST3v{Z^1RNefHR^DkYj=YpbDcv)L0?L@-V6ke1)!p)}o8_jbkbF9;ML?V(Tk; z(TcW){*Z-sqd={gC@m;fq*J9~a|*i7ju=I?y`2bC;s!-r6!UDu?}aX^>%csku}RR= zI&WJ&$gObSfiA?m7jnHgWw>^Z3=5j{Z4x?8*3=5LrF$&Bv_ph&Qq$V;V9$*q;&=&{ z9AbfiG!C%3paV(f5Qsrm&_x|dx&+G*Uk4GJVFZQ68zxikbN>XQQu?$`XmudG_tQ5K zj2x9?C?@j2V4wszRbYWELcHf2n5r>W)C3*Z^xyM6WhefRgVAPWzzj(bcoC9hdeC&_ zniU+V*pgDz5lq2jn&9>Qnf;5IybQh;$hIF(zch6Bp)DtrGnXFNb#m9p{!I0b#IY~;et2eJ)8=pXzBaUJiLmE`B(YJ* z4rdz%N6qK!iH(Q)+vg2_wQ%+6Yrh@8-%pHO8ryev$1A_?6a{*S*qt42YItb#<#SuQ zt_)Qrlc^tCzlEnBTsQF9=VveM>3L?w7YAQ$I<@#{!^qLA`~epbKRePdhc|4xxO(lP zIdw;dhsW-D=eerUnt1KtuJ3-5R$XQInm^OSt;G2D%pd8C2R?o=`16yhU!Odz>%9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0NzPNK~y-)g_A)J!ypUkvpRA)z&Ec8wWs)3g9! z2JRrjX{i49X6Q!Ll&;BtAuQ*@1JLIa+!@BPWJQXadcVdp&uB_m&d8P=9*^TS?nhf9 z4EKA%RMAtN74cBq3~3UgYjEVQZP^Fb9A#y-0( diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on_block.png index e7855bae6ce5dc2131013442be37874e019c72a1..4e9b94edadb82ad5e57ec0618d5d677ea0246e63 100644 GIT binary patch literal 3460 zcmcInYitx%6y6d+iefMr9s*?;B4FU|Ja%SwXY97N-9k6GwJF7R#VB`X?zBU9XV#f% zcUuxk@P{SDNHw4q@CT2e1gL?42?VMMCRS1tgdhq68jXgCghVAqQSa=lTWo0~GTEJ- zx%b@j_|A9Ey}O~VcG=`fk52M~<6P&!)`Q6=Vp)JCfZbs@Fa->IeojLO*@~qn9NjbsS0j|o zHYZ48PctFJ6M40UorMVlMx|haV!X5)Qd&?|@^XnbE0#8{Din&LI5Hd?%QAV{M2qQ| zc8fWJ>iqN&0~p#!ByVF_U*hq+3EQb|$6;gv8CKeE=tv-{9@%D_rJ(9|?B@JjG`3TZ z2Jsxjax9)-?C9DEYu%Y4L7|jBf~Y%_7fnc27J`mxHJD~B$DO(yiUiAgX<|{MZm4F` ze%y^Ay8wltgMy?>B!F4uqZ=4bq8a>I?B3~&Xv9=?t)ozs0Swo`1SHNcvEmR>%wiQf za8zMcku=kaL!1LW4x15`Fq%mspINEOjF}cTjJ@*}j)$wN>MT>!V|c=@Usg$ktE&V? z6a>I}nY6o+h!i$#2O0_rhk_)I)vN2OBx{J5p%MUo*)IT|=4c?}LIRA)imH$C!GP?~ ztq++>o6AafeWpNFQ^7h0-4mgLG)7^8U-bI`_LAMZtWNxs@rDv=y zGw5e&eBpM0uk51eDD#8UD-9jz0z2&zD+B)u+~Y9J*j9S1PEVm&Q%J|i*cm5;!kOsM z8Qg#d;mUIZ0@tie}8C zQJVxcqVuNFj;sRr6VQTq_d=E(BsI&76ZwKB9Fu^FL`+xGw58e&HM>LP;Uq`2W5f14 zL&W+5oE$(5&=4*}M&(ox5LpELkl|E8MFBMca}eJK5z|0(5`#BPI@i4Z3q;xUDJ{@w zMtJY1?jjhG_aRY1I1WKk0jF{hK))aN1(B06!+C*a_~C*XwiDmuV3biAFiO&0UgSwK zGH5EY^a2hP@+|KHk!IZgV{cT(jcpJ4cTwKsB&GXQrrl7tccRRDD1+ouw>r~D7iqYj zGgc1bvy6l{#8I}$u{3U%(XKZ0ZnsFci=<&FIIiY~@EO>B%pbn-OaAzd3|zMsKAbOk zt*p`GDXI*IDjF7bZ~puV z`{vx-d3E7iaQeJn(0KmV=A$Lx)WIvD+Y>tZ$K3LG&j<7Sd-jA5_HM8B?5I3<`EuFK zODMW!>-D5CAoN}Mg?{YyYy0j$ylda?va(C-et-Aj8wWpoIm*sl_R0HiItRXsg1wiH zmy7FbWy(rv3cf$wX^uQnQz(Rspk&wU+A$)OIr8OHP-EhllCk) z9ec3z#-V54IPy-(iI?hEinAZO@XFUcUrzh`g>7chpGCi3oVNC2P5(^ye^R)*HguqJ H_4%hLP5=6-i43h%>l|m8L2u zBhbb!YLb`j%tRd*fe@IuPtpa}Uo_9A63oxCXhGCwG8edeJ_4nGEP%f)ELF_PEGH+5 z+7kt5H{WE={!mjf0f^WT`$;$7@z6cbtx#)T1PB4oFydX6t}UTglA2uYu#1{oJ=2xg z$%L9DTFC-N1h8`E6XL3>%?e)^bDhWL5Zkx!40mi+#{0Spl*0D)<=>^Dv$c1yZpPYw zA7K56V|P;08RDuYu5>ANrQ-^wYiAHKJg3`A{{q*5o;K%AO0z==<@7bNn)y|t!7u;*PTezbCa?MRqX?bvuirm7+tWBatP`Dh@<_*r&2MXIcsR?CWpRl&L4^ZYjm4 zoHm>{R}H$jYp^4O2K$hr)614pODZZ+P{cl@D#e23sg(p>)vJ={V3?t)s)*m0pj!ij zR8J~Rwb?GFx8WB7iX!=rCNA4MM64>L`?R`rSg+xQ-ZHz(s8N9+BljStoD%wwJdj zP#sQ>F+iYAr9vCy`cf>0COp5rM8c>8GOo0j8E`Pui9NgDMYz30++5Iz#`8PzD4tVT zPQ=5-zG+ObHkcU`6t0*Phz2vEsH3*I82YxGvF$>GJLv|B6wgOlYGJo&>2}$>Gl-$S z0Bg|42|6GWAS@Et3@55AM?Q;!J6jV?*}7>AG>dY86Ej>~6?s(<$A}UZ>(Gaj3hPKU zY_|wW4$LCVVaBm?G!M1z+hFn9$4K@bth%DMzZLsU>4%B&)ZjrE$1`U6%5 z>uVcSw-M1X>K@O<4TzBlbP-~}K~Vru<|UAoh#o8>k;TOADkar>T$9uYSZLN7c%>7K zC@b^4qHq9WMFIjRN%8Jq{ZXUjh-AVMUcA4U=sYum1v3J$)z-tsEx3pSglyWL@A$ z0ntH><6@+pix4OhuLC}d6fBD|gN=uLX%1%GN_>@rL6b6IlB5T`2uU(AXgYSyCJr?7 zEOddYGVcGeH!0($)!#8;ekMGzb`_?6g^LbysO#T2w{!VJG znT10;AG>SEJ9l5ZZS%5i>GW;SKim4@#p|A+XPjuc{k{U+^~}8w^mL<7e*B90{CoH9 z&8w$r@17sLacI`up%{@CYc6bk(W$?3nZ&i!ztIQLxo)c!MFk9YU3S#Q$YTTc6b zoEdre;E1Ma7r?8Vb~33yH#`-+Y0KV@7rs7STDng-bhPx_p6BN8+x_t`!^7eZB%S)` guf(a5*(YYqJTkKRhV`Ew4gTaL+dH&_%QtNO2SWmAzW@LL delta 337 zcmV-X0j~bR8uS8?85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OyD@U$ta{vGU9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0N6=HK~y-)g;T*6!ypJtc%E8&@Bjazcr80@IHh#sgbE}C;d!2BW-v1V0LkHJMsoOO zhH_mO0HD@79_M0yj(%%@4FFI`V&8WFz_x7*LNqVjd&hAcP*sRmthJ6n5m^#u`nTBF zo0-Ae%96dfTbb!a`cbe9OfuE~=`hEaC!sP{B60&Ozvdj7M05b}DP+h`^y6QVOlc3A z6`w~t#}s!mF`Y8WF*L4!C95FmPYo;y1;b|G!I&?aoH?N-{V)VnixyOZwDOlPLu zZ4-zOL{O_D7y}{UhbbkPnizr@6+sdt5p1JSkRbSj5HN~`h#~=_clOmSwzLs-vO7C- z@44sko$s7`cU?{O(y3D(oZ|6#rdCx3Yw_$1!D!N+y%uBL zodAhF&4iFJ^J;ZF3lj#6N5h$MnY^qSGaSQ? z8Dpr5OQ|P_<}hp(q0wKFo-+kC9n%geYdQ3LQAE zu&T&W!%9G$11$kt5M}BuB$3aoTyDe-3meAXafRbm<>fV&5!K>&!meFfMpRXl3ydTP zfb}wIcS9k$O1B-TE2t_MAaSf-O;cr_^Z9AcPXiIr9PmS4021fJH$jQ`70w^!6@PAh z&`{c4R=Vpm1*#ef)-mj!!l+S}i>g52L>54iR{@m#e!wco&j|`rBM~L1?Qu)PJp#rH zwYpxZSfdgVSXPo40FmSa9K-v7q%cu{AdOgrBnVX;l}ig5tHCZow-5tlZm_|nXS_W# z=x1qs;dX$p?4rhT=7*>2bq(i&B?*^U8TjjPkHauyTj{YHErsF@K@B5gXPgiUXBtP& z;081dS1$BYoD>_=)Xui2GT4%RiffBTM>--w+D#9jAuj=y#t1<^$^zbpL^pA41hFNQ z+nKP6Ow$`v7h-%Ir?L^iMtwAp{CpI^2=oC#VR%2oL7&QV1-jB&GcHm$k0srEd@8f4v~kG9Mg^sJ8ljU z%ZYqML=1=`g$0a?YfzL}gln7ORY66fD#9GZH$cRMXKD9+MRLM2@C;mBS6?@A)3J6aUA-DC066RA&A5NZ-nfjL*dFq~Cn?>hGVO-Cu@hz9gBc{3xYe0Hy2zvToQZM} zpJimcA&#>}PNZ?WjCQpdx4K2TT_g=d!ErS=gwMe4WB%}sU-HLyq~p4^@Zo%5?zS&H zo}${SU}<>4`nTT-y-qTBz0|zwr|qxQUTA2$ZEpYM-twn!Z+l=`P5rtvhxhX@9z6oO zmp^g+?1A5Qo{S5>Z(ZvN|7wc#&SyG@u6=gAskc+_D>D0c9jor$uy%FZ%q!Od9A_6l zzv*Dx<^KDo53MYo-E*}4q3Ma;Cl8&yyM8d{nZ0`VhdU;%WwvcBEAH92cV6T5vU6MB zL0VtutIg+UC<_n7$gV#wo;W){6zti!#cu81w5hT_@Z8q(O|AVWHqTu1`O6o5$C~D^ zAG%yJK$ZpH8~jpA?paZk^89&p)sdCoPyXnXE^IH}_ubWXdf%y`^{H>K>{!+OL-PK84__agHGkIj Sic9YQrmBkS;QM9IzVH_!*q3Vn delta 425 zcmV;a0apH$8_NTb85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OsHwE>Ox&QzG9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0WV2JK~y-)byG{S!!QUFBE3Xs@;ONFe~u<;Zc*SZI#8PSd1DWjHAu*EyWJup;O>YB zkVHh_za=8IyE_ImLquSI97m`s02D!jBjW44t}7w}gNR_7Cb&DU*DFXCyNJ}e6CcNc zd7iOt8<@alSqh}85D}Oe+#MtV03@NRn5L=7nc5N*5iqk42>_s~MUc3Nz>olUhpN^^ z5~Qgq_mdzy z$WGby<@mD2biVsyW|b8Yc?Bs8-OTL7%-)8PFf%-#&q^fwxVi`ZanD9}S^3G!`~CiA zZ6E6VKvi)Z$ESqHyw7{Pxvh2i>=}>Eh(sc@TbffD_g496m#S6Nw=1gdh;5Y5#MHIrIai3M*7 zy36++m0|k&`l5Y8)OI@=PEizwoH&@-YaQZ&af4SGUTM@_l}`?j04?R=FxZB-O0o{zHBqBW+a+kIYLP(x(^ zNnxKP=zvHFSR}AnPE=VAK2HUAwrrZVb<^mtHRTW|X1Ta32r4U%Fa;Lt*vI1<>zZoV zZUMs_m<8NP7{}_Qsc>f1q@A~22n^W?we2m*WSeUnW*$1c%<@L6r70C|6Oi%BNyxQ59V2@{fQI3!mfir9 z;sH&)iaa&q&dO8XTrxV+IR&$t5Hk>qMFr_BAcRE&FqcR?7t;hjNBDXsP$qCu7QHcj z!PENY*$p#tB%`MWM!5$!j@9=I*tWv`1|=gWCElS*#)(!hEQb z+^AS9Pm~rcR-)6DW^)v}PK+33w|!j%C~=oXTsHG;!|%f`Y3KwVjVlt&n918#FL7(q zcd(0L_ad&Bpbgh9P~n26e4E0KlQ*>zZJAz6uj~*Zob;G+JluPCh7tI}3QtfBbD}QmB(BGC72-P};%vwifxVx(hhj7~#|be- zM6x9FpiyEB_$lX*Ab^&{(rCqus>JuX7;Rhzj5Fy0FG7-x4Vq3|vxWn;JPT8x zN{st|;*HC=iR~f(UX=HFl1e&NmK)|yB`UwC%1AB?R%hwxqK>LL6XYPAWmMP@$Jrt$ zBHRI^18?@dZjphClwhbiu2!4i3>-X$hi`ZZkMG2Sb?d_6+*vr)f`k2ymQ+J_(e|A? zxJ;6pmHO$|jR!JA`<^-R_o**tO+^cvb5}EGZ!bvhnEPGJ%ey}6zT(8M?P;HMUYXbZ z&HI}N>K;0>tz+i38|T)p+tkqg+$Tc^rW|OiJ8^a4#zW^mTYl=o;=^xFd3)!lEBf~A zO3gbGkuKE@Zhd0T!BdwrTV7cIZZA`8o^v`m^v=)whdvnm{Eg#>*Inv*c5w2G*B^fA z$j#a4)|VSTek8K*t~|VcVC#iw)g0dSB`%F_<{|uF4%wamy6H$53T!p&wGo1zxmgPhmv32{`36V)=f{& X)6WbxY^~oF{IzLmYE2z%T>r{HausFf delta 387 zcmV-}0et?q8m0q~85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OxA}49$mH+?%9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0SZY(K~y-)eN#bh!!QgZWdl18TfeaX|Eul#0mt0ImcwM(0vK^DQ6eda{CX1rpaTLx zVr>3;Xzvcx1^lRB%%Dzx$-3Cz8w8+&0}KItFO$Lr$Ts@kfLjG04WXIH&${Q7q^R+o z%t(M74LNdRX$$MJT}X(zvbe^oaCS-G9m}IW-^IcL>Tsfq?(ax)`GB|to~+jd`K z1?aa=qtIsjyY|auK1FubqnUT+STRXcie7Cs9TJ`mxK-%cu74nyfiVy74TvlN0FSnu h<#}uz(tn)`_yGyoYC<6OS&;w$002ovPDHLkV1oMEpq&5! diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on_block.png index 08264433780ec45a6ab6ea7afa48238ddb8939bb..86cefe682ec91de745fc9013641f6c9563ca76f9 100644 GIT binary patch literal 3487 zcmcgvdu$X%96pFd9x16I0Rp1yLV^|c_IZz8I7sOgIO3J2RNF&InBASdTY9&9?rwVr ziW0>{;2)lmmly>l5+ERGga$zkL_shTKtmvrKosR=5F#k3zr9xrwzLs-bGNrU^PAt} zn{U3ETTojwsjTmiz8;UKEHXJ<2fyX+w|7stFJ6-H!%v^|XZiL7yt$RsAS3_ijFUmyIRXCwf zo@3!@b8709IZcYFlHgXW}%4$VxXL(HN~I zs!R(LelJ5Q48sut(aZV;As8G@a16)LOn_z?isK~4FZp<)aFGzrQZ=bAJh2c9-a=%; zance^XEGUYhWDCQoMuH)q#2IpI0`H%d$!@AEM?fkiyp$*RxCa3=%zuq9+7M|J0TJ> z&6ki$m)sh50VV*9&Z0EUdKtH*oS~|e?9$CvG8bG`Xq?0;Y&bU9vL)Me!gNeKVRquW z)O|+)fHoQ}#pp1XRH_uhcB)&Ti~=AXTHE!r)0nQqw%KecxVi<>9A2!(cIt2&p4}J@ z=B2@ou5~ij?YW~UoYgxqb$d#tX{pM>$T6*Y(@Yk*Q(Hul;5aWsJl>!is+qAX+!_i4 za2Po_M7l(xfJHo0&k7R5!e^9wXY!^|Q`NQE?M+#V73$fbB={v>xWg1!tRe?>X{;)e zW?Cr(bD*bC9MfqdP7rw# zz*QI&>!QD{`zb?*xc~@UV&&nV1{w!2L#$j|t)9in#;^{^*!d)&#I~N;ojo8xZEzJ! zuY^glfu?pro+hAp;VG$)>lkTSL@;pyjbe}>QYr%oAwlCP!H0u#K;bzVb7N^&nZQL} z^g8v0Ss%}Qpb5t$P&%E|l^kv97DFxU5G6RtPUG09<=zl+d{B^s zn58tVa1^TwDisttOa%}tsD2d()gUTDd>2G)JtIggY?w?@y#5J9h3Qig$cSUu`|0~A zMpQIGP(V;HmJy`|fa^%WBE={o%OKVtRAtb?zt4AvO8g%eqjbrDE+*aOMTsPxgQj9j zZ^wc5JS(L@R99Dw2bt-EpwT!tnwZfD6^Ty2@{;NqFPL=gt^y5s_f8O9TH*Q{k@5B>p z4uAjI#%B(1jy1;S91aZQk5|05@8Iqe#`&FRFWqk4c;%&Ir{iVwj$XLnpou9 zdA%Rpcj)Za#A9gG)BSt(Uw7fn=|^@i8~EGWt93gTwtlnzlehNtUewCZYmz=a^fmeH z^RX>s%J*m=y}j|3YIa6s`pEJFKWz7n{{6-EdscoqBzSqF6l+RIdyem3dTita2X3ER z-(#lsM&{sxcLpu(w?(YJajkByX~2Sv01x%{XA%sQC@cR){M>WU#LiRO?c~snJ@nZd8M4* delta 430 zcmV;f0a5;+8_)xg85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OrES8IC7XSbN9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0W?WOK~y-)ZBs#R!axih8!Kwz*kANgR6f)XQ(B3y5Gu5IIP9+1p~)ro#-16EH?sM9 zBLJWfBp@3BydJGSD(zi=d#pF=ehabou>)wzpJE;_AOV94^y3w9K;K`00BI~ePQZS? zLJm9NG(&l>i2Au5#go+L8*AP{O#l<Dh=d6?3EP4u;W-Id+7we5Dd zCAf$tW|)W=Mf?$_MvRgO7{$b3&?x>OnixkUXcQIy!5?6i zu_?O|XN~4Q2eh!NgDEl00+nSsDk_DcC{|4kh8m;T*5$439EEpiQL$8)N#C&j%)4uc?QGQ2}I3X*bhrW2P0mR=1<#rXJ$v(rPrW*NR8* zoWyh@9!&NOeVn=e$f%%j(HKY69|=TlxzWMMvz&}&<*M9CS5c%mF3eJOTMSdP3hwQG z43!Bufjk_ieIfzEBA(4aL1rQOt?-|0Su|y7hTdB%3IP-{FedZ79Faze5*BO7LlX*X zs;pa19+4avdDMv++w7#NAhU9#m9rdTn0Uw6_9q(~(~hMZIWpk3ZfKyAO^qUyL=kXd zSaLU&l9Q(EAydW4M4TqEh7CiLdBn34;#459JaIoJL;;GDuoVO)p4FlPCrH)#2}|wv zS?SL&FHp@=iH;HXqGAk+h)00MA_Q0wAdq5`0ysU&L8R+qObNW%w*wW@4+VQRp1T>Z)gan-fLIlT@sLFE+=2kO)Wg;rd zMQ>bP7)E$r#O$pu{i) zI#xLVH9-S0iNhd@prDBwj%hJeh4?avV1^ZBNH$EiTD<-VM3wZZS!8x%viCDr5lmFX zf)-N{5OqERa8%%dq$wyqV^-q-I2d(8227B2pBDj1#s^Kqj#0yb zTAl?iP$kCwJN71I+~oF<|2;{iI#n(=%;lA+{GBKxx!zx$rK5{HR?V3#2gzARCL7`e zTjXR4x6f!_n{~BYq+dl!Fw`7Zt6k&_>^FnMH~9#T@7N^k)**-U^Y4FkArzW2E19Uz z)a`oe3D|ON{j8?Jb6@Wp7}~ev;lv}y7X2{SZdm@;B;e&-G)-rnGwgYc3r_<|iS=Z^#^sZZcYxdD;cikYo&^NztpoL!bdNNVB za;W~c{d=}I52ArrPSBYz_8v+fd1u~%wLfpX^m2dV$)Ao& z7w0wgfBDJXFSWdwUBDmT-9NPd`=JMh|D1Yi>*0%i{fiEo+;RJZUKKB3dB%4|i2O93%{uhJtXlnof delta 401 zcmV;C0dD@z8ngqD85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OzAK`+72><{99cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0T@X{K~y-)b(7((!ypWVzcU%2O$X{IZ-1#xy8!t8AU4pdND&U4?ep2_e*bfT)&M{P zcYZEu?5)8Tj{9Da#sz?XS>Ib5j_%!lJ}Us51lMZ;;Bql^A_ExqX#wzhHEy@Uaa7E` zXWI9YV6$N2`QK>^Nef$x*k&Wktj8QQzR<}Xwg7a>`jjk#M9@-Jv9~Y+u(J7HGcHA3 z+vm6|ZAmGp*>{UA4#tI+65@QWuC;-;&lYti{xvjFW~iS5W;&&8gp*Q>Y}ZM@)^QGC zgPImGLr8Z|${p*}>O+?~(+p~@XX|X7);x!4*2yC4an$L-C^hMQS88Df?|03lo7A0i vwrw7)b?WBQ9*>UAIXI5G^mtbKm+cP!t<0#{+%3US00000NkvXXu0mjfo$Iml diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on_block.png index 7ebc45f62a3f2bf5cf8c65515630b9ce10d7de00..05bcc23750a60900e2d4b53594f214d2f3d624c8 100644 GIT binary patch literal 3428 zcmcIne{2&~94|ybW)KqmK@7@qOJJziyLWf(^$t3=wPPL9QMQr|6PLZdd)Hmo-qpL? z+M$U;AVf0_1WZ6NVt`;Yfy9U=N&?6qBn1CpxIYm12SY++0tOR^Xz*Qst<#PzBA51h z_ult?e|)~5@AtjF6KiXkQ}bMn$K#pP8VR?P-+Au$@#*BgeMhgK{LIcoHrO7|6Z75g zG|z{77m$Z*dc4c&imp+Rnf5}}Oki&=ogva5&x)0~3`Bj{p%OT$8$tT!cgJZ;SA%q? zFUmzTA>6A+Hd?r2V_O_;>_f6judJt5ai zOql&nkS3lMLP%%IY7M&x69J6P!3+z$oEuVJP(@|AOuv=N8&?sFQ#g$c$0o9%ESu>y z9n-H3{T9N_1H{eRQZ%;H zj>qtv!g3;BUhL@F1Z&-yaY5mnK7pt^Qx?rAAqzvtwBn|jDsd-PLXqNmFGtmN>V|4& z?PYEZ#RWJF9UP=xA~A$T0v89O!U6Jm$-Q$0(Wt5F+F+$9V1O700Y#J)P97&pSgb+^ zPAaS-MKi55BstL2Fp1fWk))||W|fecGA&}5cqdejw}wJ7%hdD~nXubinyA+1kRQl? zKf`-L-rZh#naMjlqz^JjSjG5|v8}g{UDeLAMZtbZM~5rDv+YFevdH zxkx)8S8>sXN#@6<*Bd&?1y55hu?p~akRC^1CbsfpF+GP|J?t0SF|A%_G>b5kZWD(50CYCI$Qa3CQeflpw51?zSu zqN33BCe($2PY_f-!SEW%yex?t0~654_z@5#AV8lg3KhEYS_>|+4~`|@dz6Uo#x_{= zq65EP_J_*18wH|5qL5pxSfz`@dKJ1(jTi;B*iTq$jjv!+{4w#0vp2 z5x{`aFya}Yilnw>9y1aIqUu+1Kn;+Jt_l%|bD{#shRKzh*MEVis2lY{BZuhLQYY{NUR!6)lU3~gF%xrV3MS}yeN}oV$f7<=@lHP z_mn4Z~@6xZgu95E=skYGgS_fvy4JE z#7VZusWfi4JY8+(!)}po7sDV6ayUP+XJo&}GmUNy zH^%FBd@y{x?G!if^lvv`+xyh;z-a6$qk!5aTOOPHZcoEzsbS5rHPIU5&C}agM)t+8 zth$FT+*$t0dGXIf(|feex#m@Cgnhc{VBo;ew0%9>?poP%{U3`_d+`3N-p;GmR5zpV&b9@Mj$}`sZM(jD*_OlIJGWij-OYdT-r7?Q_modheYR;II=|Ezcz z#e)g0CbZiL#gv5^zUy6bK%92))k*bmF!lkV zLvN?Pxwvci*V}KbJ925=;%oD+9atX$^_NHE>-`@^@56iAA1CjBu0MNs=9y2vj?CY+ Rf0p|{sI|E*e7LD+^WT2?dxHP~ delta 458 zcmV;*0X6>Q8tem*85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OtDb&~g8UO$Q9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0Z>UqK~y-)by8by0x=96I}bPt5?Z)1S37EmoEi? zQUFy&2m}%QdzkxO3J~po<23CM0{H^~#Mtgq`bUu#-);+36_FV@9`{gH91a;F&<1ER z&>8{2^ZCa4yu&;%;93#7jxOhO=pK$xZ-m|KHrv!z6+RiUa_*X_Jk zgc%@eIFV1@0JW;qw?jl;#B|A7y|@SvO?3l|;{A0-9DpX`SW#7fAwnKo1Li*FX04{M z-9)q*!Sc*~3#D{CTPJ&DhIjeR&ipX4<&jR#U1{5leMqUXdB3+Ci53{$(S@q|Ss4LP zXSXcfXl!7kWwVyjx)IUG8|r2nbz+g`xcmLvlOd36l5-!)MtQv!ZyK3_$D?~YM!3sH z!D>|y5mIW!uGfYobsx<0;>wx>#}!(EF)srA0QWcHz1h)auK)l507*qoM6N<$f~kAM A8UO$Q diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_block.png index 6bd5c42c52a9b1292d86ec39f64aca5f7cfb6ba7..141dbb31880e289f82c27642130fd40cdb65ffbd 100644 GIT binary patch literal 3369 zcmcInTWB0r7+&jzHf>Q6q*xz@DU{x3XXfne&V_73x|1d;ZVk!Wr0PS@&N;IgvO6=* zOtPDZT10KF6>LPLrT8FLA%%KF!B*^xqSkA(<;P+x?+U*+ z#SR}?0}nG+ZZH_k-lrK(DUOMgr}0Y31?yO>wY}nEW0(d^o)#=S&0aZqie)U4W(Sg4 zA?s%7kkviz(f;urIb(d-Pzl@K#z_G zw=_Ex1g^&O<#IV*PQ)Frz>BJ?@&e)!;=qFQ$Ls)CINM*>@Ss!Q@GLj59GeL};=D5w zq*=(cRzk^*+}eH}CIF1DV3!x;LReDOkQkAjJK`0q!HL1sA}vun@WED$Y~3LzaQq=> z0oPIYoB#lAHXFs5HX* z;b0yO4lHwlv0=}gqG-ihz%=ZMOkFMGQ5-m4&T)zj?({ZLWDtrA%!UEWCQjMk7}ii9 zKy@6@G#e6$0~RHOoG5962%pX2U8tF69b%bd&88wJN;y%{Bm|tBV+t%LIKYb<6GJl{ zuY_R^tP(Cz-n9!X6V0raaf*%yfg!s@b9+xF)9X2=RfG<|uWKvQ)0s($YAVH{xL8d$ zo7H-3Kfty@d-OC5wZ<)rXe6If6eP=>Duc0NNJ$P;V7*EbW>QpAgvj~Ec-=8ZLRN<3 zYYUV(2KbmwPf<)o&6|kJo2tSk^OC@+)Q~wuk!dIa~_4fBjmj+M{(_VQpjeEc)pqQ9evn zZZvGvCdvpGD)$|BpFU#<+XV`HKmQ+!A$c*CL>7vy28C;v!q*QiMBX zbm-0buUllOB2^fgj;oC(I0J`|(cv3jqT@TYVcmLgI3Kz={0AKDFZAdgxeW(jnn-(3 z3#*=bZ(?SRwrPX1{QQyq!@_yJeWU)_+Gjp|xk!iGuAF{HTy^u+uI>7rZ*O^Sa_5Rz zqW|@-hmV|e&Y9-)$ak$@PJSyrzwgLObD93yrpcDw_kQ}LBC##wzqW1GCof&rKOUHI zq&-syma{)hKdQ0&Z*$lG^~u^j`}JD}&U8Jf&up(`3g+3^)X%NI99+*PzL?s(F+F|x z@#(4dHy=82_UrfG+IObw&$~wsz4FB8Q!y#~;-R0eYOhWl`s(P>(z(aJf5SRGb!?z4 xzx(@6^YAw(j!zx<=*qDVyve<%E+#Ln{O$G&w{}hRhJS`)J)JxB<6Cz>`8Vn9Tf_hW delta 369 zcmV-%0gnEu8k7T&85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OyAkciW`v3p{9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0QgBnK~y-)byHE2#UKa^886VOo}u?Ym)09p_G2e5<-PSsK?snjUDxFR;O=mDm>Fc7 z*;gNceOHuto+n7|Kn3N0M4iVNzW@MGYlXYxI1ZTEMvs*u@SGF1R*W$~A-2|_rB2pb zA8nIFt##W)NwLMX*2@<`&1~QA5oD0uWGYxA$Vc)8TylVdvM&~jt3m-e*k31 ze+p#q-EDSefVi)b>uT$V1khB<7qut^mM&-)ODjzVELeC=w_xdha0l_YU;C@)M3@MR4sun5Sh diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on_block.png index 6fc66dd6fb925aae2591e662e678ac851e768358..6abfe2e67f0ff060b47c882911c5a4ee9235e69e 100644 GIT binary patch literal 3414 zcmcInYitx%6yDZH1VKR!5n^;Qq!A)_=RLbKcEPe+=zDF=Et6NQ@8~P^=gePy`_+D)R6L-r2`=i!E(LCcCpU z_nvzm-}%nDcVBH@v2^;>Ia33H!1Q=iEQx<-c;9&`SQcOj;Pm8NSO7U^Zbd^3IjU_~u3_c~Pa{;! zE;mAAPfH}(iR20-yU(V{XGezT?N}&wOqMYksS;m*OI!xDe zI?QoY`_rQgU}zHw-^Q4}WV5~r$8GG!VUz(GQ`$-OScpm@$Lz9I)Yy&PoLh;;ag%5S z&q*xD;{IaS(8pQp&5Q~P6^wC2y%}HBlA|_)u4$)CGgIMCa|K0$WrH*^Z;g@D%)B$- zi=n&##h{BKq(>xxS;WyPhL>puf1dE}bV)Q}YKGoZEy@6fPcdOxU}T0JC5lLCykpu%Yy8-l#QK4z+2 z9xJ`|r2^GV73&yrPoR+)LXr-2PE-Mp3lfBRL<7XADkq4XuG8U)H!E!e_XwD&*6Mks zVU4OHvaBRA03t~M9K#DhQW+f}NFx>@2|^8f<Js)G4>8#V}od$`}jBMp}^|t#Tn9&|bhbXoi8LFj3sa~-njVuovW6*VS#3-rFcOXoOn-plJ4=sC&~DrX~;IJ zI8eFI%rT16~$t7NO7LP9SSUrcGBnRq`<8M4b4kXFi7yHg^r?xJi-}vRGkDuB5Iep>s-|hQ%?K)q7 z|#*tJiNNOv3^_=P8`s88gwAZ=aU{Ka%HcUHe?NP2h))dN`BeWQ_3NuI z9K8H|`}JdAZB%yuvGLQZ&#i8e9=UHn99Dl=_tC}LD|fG7GUKryzdik@_s=KZxFWV^ I@rIZF0k4{PZU6uP delta 473 zcmV;~0Ve*|8v6r~85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@OsDrWQiV*mgE9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0bfZ(K~y-)Ws_0T>M#g}zYyYTd~m8ea=V?X)75AL+y{r;)}NP>1`dYV4DG$+?p!VxRFzT+W(Gj56#z3EiCJV>7Tg^Ln5GGL=X^dR zB8Uj?J}RZ3!0Wm)O%uzqAns1BmD}w`L;%oQ17O=W@;({0)|jRV5uw(~mlvR_qsq2z zhZZ6NRYg^4tx-zB-M<=SfSJ)+!`%<`vjsC7VwO^duls;Kn*`l|TSN@-0gyEJ0STIZ zM2!A_K{XN6YOQ}Jkd)1gh#*G~e5bJQF_V6mCKD5EFg(yvMMOr>>2wkOC#m6f=_(`1AQ3Smq=oH*TKiq52-|x2@J1>$;Aj z3h;WpxL&V3pU+V=F~Rah_TCW@PNx$9^E~HvD!q3ekHxL P00000NkvXXu0mjf?H|jF diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_block.png index 181106df0dffe8f92cb4d49a234a9b8cc8e4a233..049abf4f12a44fb26733ab732a9a77e5d7145480 100644 GIT binary patch literal 3416 zcmcInTWl0n7~V?cRv?IpK^|}%L`!sb&RlkGbb)QR&^2sn+J&|+;F*~-yF+(prZcnc zmIs3-5_qx@D8Uen5=}^qkf=dIq5)#m2Mrbw2@)~!!9)y+Xi$8>GkckCv89d3WM}5g zIsf@D-}%n}pWV~hv0>r-W%DDE$ih^6vJ1Z#2lw1Z@N;BuPQb5uPJ5phi8MYQ+zpX8 z4ll)xpUq6K-<#g3Xm%kAbz4QzQo+H}kx28}k^{AVS;X&;lZn6} z(VOlhT5T5*LKILM04yQOQAXf-NqT``0Sjm#(hQ(jRsn(%Z27Q6S>B48h9vSd*K~Z-wunF@RPCZ4 zC$XoM5DHGH*7B+_VZi7TbZ90Df{@CBx)#bgMK@nIu4^>PqXM#g56d#4tdp~S+soNg zs1AoG7{Jh`)1i$?eJK<|6Q18Th{LD?GO4te8Fmoeg*?0HYN%}xySbtkjpuivaXe=* z9gByPebbm?ZZI+-C{!}15Di8`QAcTY5%g_0W83)}cRFh*5-b}9L{pDx>GqJfDu|&v z0VSc2;$%Q13bTj<8HQH?gMZHlPf!s}+q!8C*NZX~!)F*#;W>rnCWvAd>(GbO3hSC; z*lq#hH82Y>i)hEnl0>+&N~@i>U2GV8$JO_zT3b6^+c5KZ!0X!3LZsSS1x6MGij6X5 zchhMlWqCfdG?YrlNgQj`Gk{A&fh!vp3VMApSDM?!^ z2CNL`S2n0_Ygos)doshQjHogcFGzsmAum%h;&cibh7KgCO1fA94|}u8HF1uB`FgE^ zS31_HsRGN&*bRu}7{xJsjFL6Rpb!LzMM#EF$592e2-IMgV6YM6WUaF|pl7~V=@eOj zFPskWRh`r~&G`86X3NBD!IDHktP1?yILBd_v8{4nr&&Vz-lU0<@hVOT^&@=~M{oif zhpQHP0xyb(Y3fzeQwz*iTX}QMGb zMHPvLE>fI;5QX`OX|Ag(rOB!R1b_scmnI8l(oFo2gVCmCz%+{<@FFD1)S&6eHS0J~ z&$G}4qRhDe$KJGzn^_I{_ojTvi&V~2m2^Yjn~ACgt%BtGV0V^}F3My%XQmv)XBh<- z#A!<8OcHm%=s=tOpd~WMB4rrrj;pmUd-L#9uY?i zhfZHxba&4q>&Cu1w_(wZRZCujA72^VbY{iYBU?WD_WQhW`Swj2%vsMi_N+YAx${i> z=-IcD`wpJ`qwxC3#p3ZeSaA8&;NsM?UpBNycE59~TlvE1d2-$Fe;(~{m)$wop^KZ8 z_Ef{h)qf>sT{^M%r?!#9S?L(Ml3J7)nPc8L|Mm9k9~`^AC35)EoYb}C{!cET=YA;8 zTedWtZt3dd6IU-u+qDmy`c+|E;5k8gXkSj?W=_w?D$ zTi?AmyAco_ zHFFkXsAFb0R(|D$3#I44Y~j_n6BtI=fe>9MVXgYbXA#{3mm_HxGibB4Cx+8hOa`52 z{UvR6t4jBxS=gdy(>Zm{b`~ekJFzX|HYIeO-18HW*i6SPYMYI-M%cll-EIl?<~x$$ z`s!x?D61par3K;^1P5a9>-QbrpjiVtJpQ>yS-|E+Z;~jR^JRZqKj0rsMc6yw%3=lp O0000a#{H0low2{EGY-pBUPmNuepdUvxk z@4O$+JoC(STT64pv?+6@L?V%CO^t~Z{7w%(lPALWj)6`IeyW_tb}tf{dROq75ZU+2 zY-oIMwzm0g$yKUmXQN2B(>R*XI$#}%EUU>oNZW{gB8@vtD^C7$>^Mo7dYoJ@CYhvD zhda&2UKg+JZEn?iH)@Jb)+{HM`8Zkdt3o^Irb(h;;%|(TwLw6l zE!jfU*)AreC_`xs!x1qh%1VMD%S#E4;TW2U(JVu8oXSY5$P=Z9glMjAsHw!tQY?6j zlbycrs5G6+<)S%0YP%gYt0)T1a5TqJU_p63mXGq3f0T3!hz0F2Hfhi0QpP*TBA*Frm|%gq#m>l%$SIEyXc16wwZo-tM!xN~+IFVQot83+1jj`gqI$h)>2}Ur9Mn*n zfD_2aaWWth1uWv3R#s3M7XFq5-%QaoY3ruZQ)$XltkBBJsvxNxbDb%$SVuk@(^%J3 z!*;U>*1*i74oo{%2T6o0tJc{W+l9c89behsR9DyH+J>2d0Wa0Cf@rF*lUPNPC@#tt z(oH7SCd>1YrQxPToP=7Vrm3qs64S^q3`%3!7$r!8NXaq-Ek?$QpoxO0mrgz%0TsnNmcaqZBM43hBH-F+9V8e}k80RQ9&oH9;d#rqXMWl@1=Y zw8U|W!cqt;BE_?im7=i*g%N`}j1`1*s4Ad^3T_}J6l}yeS?+8L=$Yv%cE&gc9*_fg zN|V~h7#|*9XPK}T97zPkD#E`OG!9^fScSe8GmkTE2@{aI<_X&+A;8;tY|Yl$c;pD2+r)(pVwJ@<`MLzQR|*YcWOo#$VG5^Vb_b3hHGbua6=QmO(4g~m|B6hbho9KPKXdra@05;>b@~V94`xL8MBmu zHI8C+L8oMe!&D5hf-dP;)`LAbB1CK}Bd9DKn4x(66NpN_wN7MpU^x5fn*8|F{jA}$kX488BvM<<6^Wi88F782fPSLGCF8FcFhV7RProL zfhaKU--$OSV-|q_E?jR zhV%WWPp_)lvUlM5erfg_OJ}kB8t$BVv|M(H{`h(QzXR;9!I@yWxax&sFjX3Jasr`8*e)+{4 zyEq7;xqxa5nu}^HrK_gediUr30DSdce)ZY6E;)PS2i0VwYG$FVFFk z9!TH$N!O)rA4j1$#Xp+aWCtcYdq>~ok3vx<7Ip06u%evu5p45+4s_jJ9PHv?A4f&e zUG(3>K8a6N)7re$o$}Ex4yvuFOAod&+2-V$ZPhs0 znVp?H+Nk7U^3k)0{9B6)g_3;?(v4;)($M*o54I+$d-5 z5?zT7B4*l%2nT7P&@@X3Vvq^*d?d1fU}=`7Xn|sAz_Jn@mO>m+x=0+&RyCsk^;<#M@TjtiQ0ief}jq-d66S%58o(`UFa4-98c*+U#Timh9&ZW@H=5z1zd z8zph3#S*fX@78ciFk!%`JhUh#NP8s}3{}OqvwG}IA-JkgD1)-da2;&R__kKsbWJC1 zj^Wzx9uWXTn@IREM$ILg^+PyrOD`^?1jwk?PO{HJR3~!G9$P^zy*SM|)D6|lIrUx* zr2!}oT@)ofA_2@Ij!rVXL^Jp^-@DUA(}bz&T3@9p0~kKZ2oldqj5xv+vsi^L9M@P? zB+az55YK_0g(*Z?Mv5f-nU!K@#*rujuaEH^mq?u@IiG>+490qKV zDWsc7NNtAWLPJ4q@hFLF4eGiog}D&NFenUUQ49e^;CT=Ug&3f!iXf^As|l!BE*>8@ zl^&0k-uU7IRZRu^7*3BDRG#A_B2bW~0aoC{AR>nu5DIY|t;%u;$#OZH$7~&I1k6-= z^|Dg2M@0^^tSB-7BAgY+@F5^7j0O;-5sQ!rp^B^WXdz)YI3?&U#3)&A?DFWD=_xh} zER8QL2ly%t>K>@AsH_ZFEkpxR;57hc7y@C1;RS|+Av~!Sz6xH8DN;ADrJy}htM1j- zSIS}qTIc6O6y!#NN^znTZ?PhkEH&$+&~;+OD7ww15vIgV7ID$cF*P>_ZPb*)JQ`Od zs4nnjkM&5<1VGC?2SkpCfak;ztI%9T;FQsd8C8jIb1}-e3>at9Jzn@E85=Ye z*?I*BDtYFoKol7F|HK=YaTD7^{=Fz~^CT5?swg+qjY?E}j~9_#?5)ni(M1|fb0*3` ze3p^$hB(d^IT7LZ80~p8Z*`0GRHOhy#c{RVgwMdc}lv67&!e5UwvX=DslYC-oxqX*Pfs9 z?I%s#lGd7&+g6{cmtU;=?W5E0d>G|7%pH1i)rDuDemSsx@i(o1EXxgD+q|hE^ksU| zO9PF;`e}*jJERkluT}>Km%qE*LTkRBdui9;ln)&pn< zetv!87%zEW-x{pLbAR>FeyW8iGu{cSp2#H=B(!NRkR)+`^?-8@pz{JIA8pE7PVJ); z)0(E4Ab}`zlTz#6gH2bGB#J6UwWE821d1xTW^?TvcpAnGonxAR)rdyk~O3JW12M+Yn{u&+C&(aN{-}T+W|UEOLalXwnE+e( a*ZKt6d%GD6e+kV10000R(DU(lU=XsP9cU2N5ipF!3ArAXj)xzk=~C3Qp0_gousaxK1-37k)$@ovuxH) z;hfdB&BI;W+Pn2_{kmdMt5=atB^4YLaDd2CA#eL?DM^+6s_+~(GZa}i3Hp;%a~P29 z$##$_$HSx)V`-gbc`~8II7t*`c_qoSJj<{NhGS`-S6NAo3uN`8Aev{GYG-;)H5R-j zsaz1aD#H|u#aK~@IbI*bDT>0dJj3%eSkV5E9iS3z`-^KH(%9EM%MC2YCPR-%a|VJW z1({Y#D7cYZ+pod|fH5WHGF*%eODY>0dSvGgc=>X0LuYUv7qA`pV9Q0eZq5lDKj%#1 zI_e%50HDogqZkwBQYb_r{GfFZ%BTV|p|#&V2I8$J;fdVw8v7xJ` z;}sChfmJ|#m~rhsii~DfO*whTgTRoTP~VKpXVOUuYK>Wzp>hf*i-IZBaaO`K%ZnO~5?G`q4ofDMFpnjvHa_j>10gHJ z@s$N?I6C+kOAqNfl68}(5o_=?7Da%E3q8Q@XZ zB%W6kjz(CC!)P&1D>`S=7_pEMRuD3vs*n~cxPg>VxDb<6t+6MhXMUj4nBZBsKn~!l z4(gqvf2@0>ZNXgd6d4k$0)H219KZ~*%55E13Fmv#79itSk^sQQdV0tAfB=obRV%$2 zCdCJu`c-*qL4DPyytQg#q%{Sxx{xqw7KsXNuz(N}0eCTvWi6o#yoUKECR8SHQ4zgK zePJ#x2nMgwycuU{B_WzL(ome1bWTig0*V`=Q0J@cwUQ!p|60o0qqbRLZ9~;8y71O0 zAF?brD$*+xrH6|Z8&tK~nt-m;BSyt-F^7Q?_gTahGv6_TBJyx^AMj{OkzgiG-mwR< zSC_tvJOsNJ_WUGedQO3i7Bm?+By!!nrI%^T4BAF@hlt>$CXM5x!TUqR3$m!mn4?Xs z^E79`8k7|t(+R|hhGbybkWmfddm!SvSyAO+!(?mX^C{HWCvRGocbcdzGm2o~|IdCS0B6ql-F`=1iA^aF$VFL!4rZ zoQ`mZj1Ijy54uH$DpH1_?zmcOf-`XV7#+UhB|5%i8`iA{hx3c;4!lhe4f8VT=I&+t z-ux!ne(u>hGk!`4E0!EO8GGIG=cH3JX75gqw7t4#J9*xH^m6m)Xj3E8zV`~z^~cWB ze|@m;RN=brjT=yK+w16PLn1Al?ud<`PmrlL>S?PHGlM}bM9_zU9 z)aS7~pE{eCQ#;RRHh%c!rNzXx&EL;_qWQ-e4TrBV3x^Mm9Nl2?XRa9w=QgfDy#G#1!w&88_O-j(_iIO%&b@W!`msCqpNodYtgz?j3s-M%UO`aQ(z{B6 vc;!y<`o)i*9(ZxXtQYv-clKUA;56)L7`=RZRx2u&|M_HE+tbHew(R-`qY`K( delta 573 zcmV-D0>b^(8r}qu85#xv001BJ|6u?C00v@9M??Vs0RI60puMM)ks%j<00(qQO+^Ra z1{@R^Fa_Saga7~l9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0m4Z{K~y-)eUo8s(?Ae~znQgb6Gv$)^(L)A4T39h1Gol-({KUA89-`^)T1C(Es2|C zy)*pSc#|N6SC(hT_M7*A-t5Tdi%$+ zOASEuNG&zD{UQSZyn6AHOE3(7 zHgu-2^?U;oK)Rf>os0lbNvT~aO7w^=ZSVA1fWiOS1>1oi0gQA#I-ar*zA`+4p5(lA znZEUQ1XzuM$35*s31bIDz@H5U$Ck#xkeL`p@>E(RonmV*@%VHHTjthEEm<~peC)z` zZl8pMeW!>(I1PAzbkajYr%Ej~ie?XjgiJSjF;l0CuMB�w|qgPsZ>o5k2lDG}08B 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 BX}|yg delta 488 zcmVi5QXncWZ6vxH-A2rRI2zS!P26XW>shx zg5XPtqM=Dk5cEx=VA74>nYl>{Ct>c)oHIZ7hW$<0--h?A@NyaQsf^dj@ONW(EqIzf zQtLFS=i{HnSv?y8jA+ltf*GDERh`qM$?w}TYY*$DSoMbRu>j5?StP_1CQz)7Ur%KJ zz1@j+LI%GN=YMq75k4PXNwG4cniJY;(^Olj9M(exEZ2~jA!cJ2OKdnW(bdpCgS-X; zF|{KICPzym&=!O!W-W=y0!Xq{^@B>ai3Aqx6}-Cl(?fjvF|uz~_oAKJiWElMg#9QW z0jJE+)jbRZo6PGRzn?vue!LXXSYc?%Rb9T?YMyRfZDHB&PHW}!ixcbyl;_*DyclAJ z*$8#LB|W4x(V|W`DqZYlnG3K*2(ZavHz$Q%uo;Mt7ab^h=#O4q1 e_a34kpN4-MS?Jqw6#m2j0000#G^Pfcv?PQWqhbu2r~zzZ)FuW9iZM|M&fa5t#g;ZAo7>&l znQy+wZ+_o5b1x@b*DRdBbbcrlS{QGMwUPHC|DIP(p0DodmC5UlTuYZ53N5(LzpFwA z4?Rd46K1N@>r6bUAv+s}x}C=1d^Sgb*rU?8$F!pK#gQ?ZGW96kAtl&E zt_k;=En6JCZcA$lZP|oWovyE=YV#UVki{OP^4W~#YWXN#(5sQQ-_6ieLB!h>r5k*M zRA(YdHQ5fPhB;XjBaufap52`CJ9vOqKP#}H?+3c>XI$; z6{UMUFQ+lgz`#IwKnUAT55uXd%CJ1c^MFVIchK@+9$4=3vW6ITkz?jO)3zvIBTU#E|AUj+Mez9 z+B2vQhNl=H&?XXrjcI+!W&;zh*W6FSC;>99w3`~tVWthccAtZAb3bu&c{v)_Yr~Ux z&S5$c4<>u2F~eMcWJ*vtZ_Xg|C zFjsIlkp=_Qcq~ejSi`2NYoaRfP?jK2r3eOwE9h)2Bq#=8p{N3#B?v*$;DIRNNLoPxpT>MG<5wo4 zqFD51)P*@o5Oh8bctc`=s)z=FX($01aiYQrP|`)ALRUd+(M9I^u@q{L)?)gx4VJuE zhc^fQP=#`%K~!8QfE=~A~j4PEC(jH23sUQ8%)og^-bxwhdAKnFMU5FX81B$yeU zx2=BcRJfmm4kWu5cHAg!ICho_5}NXC3g&Vd6BTI7^jmsqhX~-LXSCzO{_8`;3lT9L z!5lC!;sK|NI!Qzx0|j!TF6%g=M_?J^YarrMtf+Bh!(_|F>%Tx$T0YbZtsYGFe&z;( zkp%@}MU;V>#u30F(t;5I0fZ5hbrBf?RHh4N+Dd$rgF&-0V3tMqc@dCgX3%u(m=zqT zC6)C__aa=8Tku$L03=ZGqBRIZei{!0C4(H$RJ8~)%s=7TM zYe=owvw!cS8*kwjZL9x$Ub`{!((!Z0$7_!6dbYM>G=6aFrF$B8zj1cS(a!Tbzo|LU zI#ze(V8_I<-B)9`p1E>)^W$7Q*jl|IIkXpakA_dMy{E;G|3Eudo;-4RXei#E+PN{g z`0KZpE{0c!$F7_?Jo1Y7`|jlWbJf+)$Ci%me|Y3)@#*FzKdim1Kh*tY^l};+JhT;}_mH_|xwG z56;K7vTyF&zUx)-shW%3-teKn?wqhb8hNh!?z2^_u*!Jtz_%L=!&?8@jvwn@um6I+ q_q*X`4-5}?t^bri`OJbdRraNwzrOeOC-eM2JMre$*t?AzUib&{iEtSJ delta 437 zcmV;m0ZRVK8rK7m85#xv001BJ|6u?C00v@9M??Vs0RI60puMM)ks%j<00(qQO+^Ra z1{@R{8EipuD*ylh9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0Xs=VK~y-)b(7If!!Qg*kJColI&I&0Ze~mp{k=LKhkMGP$LlO$bJwRXc7{kR76C77!;XQXGuYlQg~95MQFX*A9H(l=N*~D?(EEa z-}n9Td7t-rZ=dPjxV~}Tee)ubNMmP5GL3&11mC%{@O|&ToQQw!bUOOINM!y!!S{~H z!58nv4;Rc#pWm12QZ%~|g}SYxXsO^}>qw+|ZOMV!R^$^Z%9>W396R{|Ntk+^>=jaU z%1NM{*|FV4J=-^CwC!6pStr-7A(~4Hc2Gb*Bua(6P6ycu5KvlWP3Fh zev6Yi-**&>Di({;A{VvYEXByOOwlaGvH)8EZ`kr-30U5WnujFvG}m-|)3%7fBUJ4{ zKThIIDZFVZwk>CFoF0lnzQN8|qqU=M1{}a&TRvP#zVK<$Ktc32mL6?b}|? zp2Bt5Js|*wHkArvOqxrf5Qgylwjo?b6_81-z09zKs5J8IL03a)-n0_N+z23hIY zqo#^1E6WUkNEQIc@B)xE#sCP?h($<-P{&mTv{0}coDvKcVw|is_679J4^|puER8QL z2l%QE>Yt{6ynB;n;<;c+A|O@;{vNDx7-k%++}3TDP`)o|Vr0BZ5@LN%|HK|FK;v-L zN^ixJ;$fP4Re4$mv(=}(xn^>tRTi!B(n&_Aj9jTjwD@zHHdG3h{@2r!r%>)u8G%wfv7rtS`J!Sg!g{x7K&jc zD2OcN0gqJ)ND?ka)l?nu9M1{51~pFOCo5)BCBDtYXwx!ann@3M5t3wT&~)UQbsVVY zS(pM*X59Z1Z(7F9Y!CVOqP)$MRMx4A+)y_vQRO{ZL9#tqo#ms8GMVPgl!N#zqu>p3 znk{lB!W}R=@MhoY78$5W8HT#!YOM*MfrH2J@Qq)><2$nOx^?m4yyg9+f8&Gwwa#Q~ zX63#Y_A}{^=ml*rJ&W_Un6p{Ce*Jcf%`MxgFPg78B%OU%hvvaH;8ymX?7}N1Si zy?gBC9lt!d@XuZ1A?NCI2bOJl%uOwuGizbH|EBQhk`ue%`l6v-nmsVEYxjlx8K5jh z`$tYUt{P3}<~;t}&dtZ8qq95uzdb(k^Od>G>5pGYF8h4L=<3`eGJWl}^Go92twl{w zH1L-`Jijyf*+}=5Pu47-eQ5NZ`=9>d^3bv3@4r63ZC^97JaP3)^T?*teABUSjQIQw ehc7PrqrpA*WLLan&XwRVPG{T39cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0c}Y{K~y-)b(2X>12GUqpQl(MISiW|0T7DBVUZ$sh?~G6fKKC~SU9dYO|aDR&^7$} zzsh{2cPS1cM`+j|GL0(?4{QQ9TY@eP0kWw%)Vw|HMk1bFL4R#2a z7}-2NY8h5*>kw;2=2;E;GBJYpZ9gq31+TZ9+s|6hBwE|Dcaj%>L{clB)e3UHFzA8I zH5C>L*$z|To)Ab%8dOTbgn->{TXs8CE~TiE!W&8$kx5E_%CY)zaxx*P!N|V$fVB;6 z&XDt@%}`{{@&p;Box|kH`Q3002ovPDHLkV1lAy(_8=m diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_block.png index 00d90cd81563c51fe6ed9654d813f7ed05d94c51..64152c71a390f3a7c9e3022df10127b54add073d 100644 GIT binary patch literal 3415 zcmcIndu$X%96kh$fDnXecq!}FL=fiodAGLtc=gce3}r>kfS1-jfRBpK(@Qvl9qRnCg8;1zvb* z8h-duPd2$tiRF@FW`a;PWfaV1ENmSJEUe5~P+5;$LPl-65hbr2I7||{8YS0+5_H0< zMk&3n%SNlZRwR|K^@^yHm5YdlISD(+AQuw3OxkdyT$IfFmGHCIOp!$1#9bdHtGs|j zQ=);WHf=z1pV2H|;xvf1uN zNt|h+gpB38HJl<$7%(aaEs6=!UP*aFRq^etb~~L9t|}BtqYN@!2ir2ft(7ue(@B{_ zxc0jT1i;WH5`K(9bID}<5RO~Zfy*cYGN`qa?6eToh#a%sR!~g`PP3v^jpH_=emqAo z9Gm-tU0oYutk*N3D3sHOF!g$TQ%kD05p+#EX`1O0cN$745-b~}i8*U@Lp8I`T(5@W z02G5Rijp3Y0A>+KCmCL%8T^^&-RXj9!c=vwv)q&c44-5KiRUow2AEbfe0WKq=^Aq->&$pA7u51`6ufa8%WGZ7Tx=ul~V%v9Pv zR(j(L3sf}~?4v(DRpV7nz>9_!BRt^4JO^Z2!+ynx97cSY6=0;~t=`tLM!WB3pd6`U1w$5S} ztI!5NA0jU|5>yHkrFe@KsbsNPAB3(WBSyh(Hia-HZnB6AW{#=3S!koGHq4`8MS>bK zdDG}Xc3Jusv?1QTknKcC%{DWHzn}@%B%o!bbtO+*s>4u=JA@A>Ib<9McHA5ymW%Lm z1TjEE3JVyOS3yK%5fJd=R>LZas1aC#_y&lWB+W|<-Z1Hsc>NcMiqog0pwWi#-cQ{^ zF&Yh3jYAsX8Cn1eiv=ZucmeQYB*ZWx5(GsVte8QS_%;`#49kFFCf(zOPm-ZQQ<1Hg zaiE-MehNgMasN-eVHr2FJ>=hu@-|OWUZ)CjL*1xEh4)wi$y#r9=8rDYV45>h4&t+n zgg3-tw#bnPx5sGDn|Z5Sq^BZz7|M>Tr6zm^_8$GiH-7Pt@5sRG*2ahPz}3~gfxxJH zqecsJ_n33NJ-g1%f1iH$1X;JE<>NyKUYzydGZQ|^Y@d1Y(pE0`+pj;% zeRWNZv&XF@k6q&aepm{eS^IP)|9kJ0)2F+)MaBiX7e~)NHB;Gl;p!hh^lenGv>Z8k z!gQ;@BzE^U@7wax-ulXG$20XC-`oFr?bb0;3$btQFQZ%IA9klcJ*@MO&-`oj%deb& zqvq6on=a4TN$B71shzwj(9+kjCvoA~&mOf}AG^5c&U5eVJ)hb9(7Bqof@7OocisQ$ z{_hXIe$Shy`S_WQeMg?$arBAoBVTOEe!Xt?cNKekmTf!QRdIPiYxBI(ix7%Zn-C#cF{q>30 Ltcbn6WL@_^(~)qA delta 455 zcmV;&0XY8G8tDU&85#xv001BJ|6u?C00v@9M??Vs0RI60puMM)ks%j<00(qQO+^Ra z1{@R~84)&xZU6uP9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0ZmCnK~y-)os+>z#V`;>&rF)4qKF9Z3lvmP(2f7UbR~ia{=$Q|5=EOPl@Xd$eh(RJEf|&szA^`Qh9h-T*6#zIMR?L<--@776Kt#xv zQM5h-b$xz&7kF(|U8qpVmaAx? z5G1gpJLocN8^0?%vRi1$eiK)K*-|Y83EgwMdTU#P&ZM``1M=kCT#}_)s}_dkL&s}L zrZROTbD4R!_nyGp%F6kNc9~h^7Q&pZOX~+ xnfZNin)dSe`)sKqTFsWfE|Z`br564=J^{qc!4#YMvs?fG002ovPDHLkV1gP%$esWI diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on_block.png index 28e1cba11b15c5a1f83f3ab9e34f8402bbe3ce8f..aff10ec77558ad630f6e21984a6be9f55fee237a 100644 GIT binary patch literal 3427 zcmcIne{2&~9Pcm?z>Ey#5Bw2w9)@hV>;1m=&UI{S$5yd(jv||Y;q~5Yd(z(B?rv*` zM2HCqCK!RpKhuQ>7$ov5CLqx`O)w-HoH{W`3^BwQjfr3ai3zCqu0L*_u51x$*7o|| z_kF%U-sk&yZ!dRub=1y(aK6vytBrO>dhmCh`<^=sf9~3ymhjg+v$N0k`R={neb@Mg z-&l+ve%9i>PH*f)dRi)tkHG>gG+V49OMEL{nbD09oV!BA?CZwvrE#1zZI`yTdd|6il2=A+ptV zNc6_KiLhZILh>_|$}k)eko~MA2*F?@!7&^|GXa`qD2`JYNfCLX^dhl03nrDG$jXv0 z{3}GJ9miB?I+x4&bG+ZMQZy^eGR<%_$5GgVvWIjBSc4acz4 zMipppdXfWN+E~oHkr3(!Ql z%Bi>FO|dae?UFpTfmG=!qcvBlvm3Tp=JNIZ6;wFcDCBE`hiv+EpeD zQ53zZScnyQ9&!naONtEMej!PL1Q01nWrYCC0}%>*1y%vI7$SZ9TngHwbZTyHL!~HI zqkbUO-y3L9pSsK=+pzF+tQH0H<5vIg#nz(3Y8%ZYzEYzC9JepP{=&HdR z`XI6@!Z(2h@acstJ47ZeBTIMoPQlb*Jng)6b;j^E?>CNrfH-{oY~X&Erhrn|iGNK(CM5LsFU2P%2y zg+LS-_y72tmT@yXL;lUUySzySohr%={ZAz-{*DwYxzg>4TqLJ2k z{qDWvY}c8Vy4hc@*eccc|1!7l*y+0cm*;mbT0i?MYgXjb?RB*sJN6#Q-Rl0fzrJl- zLvG(Qw~n8E|Ja$W%W8IAKR@cfxU)l8*Vwcud~~62W6Rkqm#>|AEwSN3=(*9xi^6F0 z;Y&NmHeCM>yzu*rBae<;xN^|$d;Q_rzMssLb9DJzb3X3>>+MVO-sS^K7I94dE35|@gK+9t-70A>i>L4+PH7k;bCRx@FC}kB`srU%N{s-guh>c1Djhc|A%`p}+J7c*zKk9_vq>Bej4-t&$6mVZ*SZvV4u=D7a` NMcca~$J#c&^fxLVb5sBT delta 567 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 delta 418 zcmV;T0bTyN8pQ*U85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@Or4nylH^8f$<9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0VzpDK~y-)b(2v}#4rp*pOb7k4j%}uI1xuhD})foq0}8d)-K)vk*X$+?U}J1dtMd+ zxWo<&VCVnU;%{cS#K^#Zhu#_Cu!Ylz|5g$w$i@A-ZxOr$_fwKKB}``T?wot))t#2v zpL#!>x)}{v3wknIfOGGd8D@6e(aj*_xOAfz;AD2#T*4(J{UmUSrRYrOLwh7W1#-)J zjG(zqXo`S&rQL$jutF`-C9%bRDV6VLzgj#pW2Ig9m03-G)M=l6bdNvgV3ayl{rgnt zn*!x|lrHVSmqZVH%R$O7=~X6cqD0G9;4}O(j!|ePy)Dr4yvF@9(QbM960_Z=2X!iv zQp$%rBU(9H%=Tl0Oyz{CduCP=@whsh)i~8 zXU_T0fBF9J|IgWpzTPd%mp-yIl}at|>CX4V?}PDo$s)M#KTuNP=YGF?XP8PYdno?i zlRA2A4Ln?Rii6Q$;dz64l{B$DlclQ_AEZ;MwoO%^&|wyFCL40x9DnWH=RD_FIetf` zfD3*nD>>b}12(X`w@7ynQ{Cb>ZRFaj1}Lboh;Y?P*$s_qj<4x8;5i-^c&;WA4d?jw z*dRAp=;J!QfN^RXBZ{%aW%abEDvG9U;3OU3dV{+OHh6GX9bpcC)Bq5MM;kX--DssbhO$~V#(!lW}$8)(@BQd>^ zD93}R^$;q4qSg%?FacmfmH2{~#&JkBL5n7G{zy=+8Mmmw%B;fNCoF%d>xqYy>|kXfa};<(R*einKo0cBmI;O4q!G-1@wrtw_B zau81zM~*$m+IVJ0P^{|AAsWvlqQ21?FcNt|(euhp?({WLjEGBFPd>*(tZB!wAS6jQvm}cwQ?rmp6&;znMiDj@Y}>M8QjIm&=RGX}jHSpex@ubME(*7grPh0lZYPdyyy3+FdnNIQtF;@0 z(0Zb1T&&FE8^g{lbX^!R>T1VI3@CA%BCd;to*j*mfVB?+kLGO>!ko@~?kEdd-1kX9 zVE1A{nB(oht8hs{bCJgp-!D6~Mq6RjwHiA_0w+JGosf*)9wJHB6jNg&vKf_-Xem(E zy2MbHh>E3JOtUo7g!mSS#3EJ<5jITR>~sGGqDJ~?iMT@y_I}|Gf>9(aXIUnLOhwfZ zH6a*X*EFP9mZ|7ewh7Z_3ue|%e3yfv^DOS7JdU9g>m0xfCarpbS)oZ`3oytGXpT~p4Q;Sm1-Tda; zKil^GboTV`m#^>f-me_}`QQ)xC+Rzn?cJ6C%{d(Q77o3A`6B;e<%8A8+_tDO~vU;7NMlUq?EYe6i+C<;4|Ge|N4p{?Xbue!S4O Uc#-;6{CB0Nt2ckTPhc}cYYhM}ni=MK21!iQl!-N1>U4J;2bN{Q zwry~daCbbPPmqMp0C1jXp3MyIj$s(EEK3r(P?bb78LMn}&qrmE{Fb1LVHi?{mO#`O zsZp7uYW$VduL>^WR8RwiUiXsU1CRYhZsiXq z^Srq+rk{TSRlX7`NJQZMeqXNi%vuqVY#OQ>o1kh+YwcEdZECg6-SK+8GHx_8?E8+# yPQs3-HZm-_<4y%UU zY%=rC`|->(&&)pGzkSQfW%n#gBoZt0eYpYny)F7KSqS%+4wO^yv()R`9V8OV?})w& z5{Hl64G-Vj#ldi}uuU`EYLb|)PLs8&2iA$i`i(V@7(+B z_=1$Pj~FyUNrU&8LG){+`z1_Y2ctrL&DUm6(`VY8Mf|MgXgH3W0|^1IFw;~ zqJYd`p`XdRK4nr#9vM83nY5Y|Qj(-7YZ=UAp5xP;z$1(`KBdVb)4W)S=9`u_klWmh z1#cO)9EP68aigQ7$x$)s`Xx?KRh8p0hcN;R6pT3`sUas=-SUv5f#KU;XuA#*c_g|! z9A;R^v{6FUi`_aw6D9zRs}YYAl6+KB-Ow~*J8#&p)PtJ_M=P{SoiG4fA-46(Zs-PO zw}b1rdqx0&wor&;%$iHJ8ixqN-VrFH3COJ0L2=BZ+yD*SVc(#=Bar6mRy9F5K&SDX z$8a!@2Zy%RVQkbhqbORlJD5g2v8ktJeM&;tFS>4}#hv~ZiVVg{o>{ZYc1(9P=!$A+ z4xl*_(hM6B2?2{lz9>iS zXnbRVnyvvprqfff&g&^%M3SJ$NRXv8QcQs$OA$m>G*n5FY0KLqz6}~dD(zmQtW5A| z=qZdxHks4Aj`25ulF5-r3G+iDz)=vf(VG^Q~R7svrz z%|W~8=%4Q1>DVwAm}MejHQ?U?8V4{#ta@9&U89x3oDIkXjU-a-J-cW2fB;Ry)hfLQ zCM5ux22FX|L`u!4ioIcWq;-|>hM2YxPb3wYJRn3Q3nKtn(bI;Ab&A(>kurgchUj(l zMFm+DO{^nq$vjfil7)y)WRx-lDJ_UZHYKsmSKVtPMefG6)U`+Jv!mL^npy0id*XbU zy4+~QXiSt5Emmr>&1QQRy3UUn4Y#9Z3Y56PB5s%kt`&|FpZ1i1M{|k<*D-n58KHh# z`X2EK>|WFlGOXphRVH50Oz1Mi^D4Gcr!6<)n9Us`hLi0WCm#hy`Q^@VyK`{OSL4# zE1*oeB4MPfs)C3?WFlkLNb8`3f1mGJmH0m{#+Z`xdifazM^77l` z`}h^P()-1s$Ce#>f~U_41+5fBxgSC6mV|xruGV f`=?I*xnN26k&XAi*#-Y^5{Z28_T2GJPd@V((=bn4 delta 535 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 delta 562 zcmV-20?qx$8q)-j85#xv001BJ|6u?C00v@9M??VL0Nw!JDf*qRks%j<00(qQO+^Ra z1{@Ot9&Bn`6#xJL9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN z0k=s+K~y-)Rg+DQ6G04xKUXT%`5O+vW{}`QtPs~=!HOkkfD`0METho~*o}~YOr}$* z)MH_H!bB>?a{K4KXWMpv52$w-M`#U7f!_V4bo~dnOL04A&&h{_C%$?07PAGALDi!y zqE*2%&_Nw6bN78qYhd4gpxc-45S4{}02MD{N6_qQ18@T1s4rld`=47AIvV9a<29gD6!@x%%Qwjt-Fjki?(ms4afsSd7vGU?1pi(P;Yw3cE6SZe|%Ol zw+XGC!1t#44Q*Ft^GFz=YHb>md9zgqMr$dQvF})}5tQ9~TqqQq z8fAEtE=m$CL0Jzyw)L77HLP0Bs7cgAD+#b$^54hiMUw zQms=GIL(3x%ZMbM51nK>7=lVY42x@r(nKbVX@J#ChyhwcdSfV&{JE)0HEgZb`6rWJ zhWNe}SR0j1VR>P4hRWBaL`mj>Hvjx@b8TwRyf2Lve-h1{X1gmS~h@=fDZS zMYXU(NkoXxLlBfL0K9p8Ho%c{FhGDHTtLP}1rUpeVq6(Ur=f^YPH0pxsS~9NR$xpu zuAtNY!$w3T5E==Ak~wGpc3vzJg=z@7GJ#ysN&^PxlRvj zFkb~(lK-hf<{y#Q!pVP5T>yg|Oh!tU!-8P|WpiLaz~}J+P|iZ-GA>LO2YwU!|AqQc zT9J4dS777`%cTGPVE&ri-&TjWG~nN80Wqc_%j=SWvX`M6$=C zxs%7)92l99MY~udYBT0sQQR%b#K zV};r7cH9?DzmzLij}L+iniqYy-a22}Rn|FUwe{sMM({q58%Y~q2wuiY-J2cGnjJsP zoYon-c9GqvBNef)kGFMKCKX=9n%auq3v8##?$(dH8#q>$3~&4VePm*tb$)vt5jSdT zo$X8g=nsA>p=GaYJ9EeEgm+vHHF?@DZg62fC`yJETcb~Sm8UDthMoyBI8GH^YA^k$ zWpd}OQ;>^&Oo3Z&rr;TWN1Lxp;H~Si#$eed=n?3;#dNshU+$*7Vo1($+qmNOxol?{ z(E4Z_^Xg&aqisDYH|6CU3m}KHrDdjWO^`xBGHa<>Z z^;Yl2-*+lb&bGPUMCQA<;MtS7(^(E8E}>%KVIvmX=zrSmN2W(j~@`|M3{Rr-haCYxz5zf@Li~RBAeN%gWN_ zkHb5QK5bMUZuNn0#`E*a_Ow4(=o!+rnPk6{SG%kFb>-B`>rJ|frMCG=cBaY}pmaMG z=`22QQoJeKlkRCR#X~!b3#7T$k#Mo=#)s4QQ$OIlW%^QWq^ZTP=7#-r!tL9uYwAwM zY%gz0;J694ef`Au+4IK!AL+r>A+vIq1z(c2nkwZii8OTUTDqm5&<1nYPY~9`$ccsXK5= zidP(oTs410oXwLcFKny1*lBr%xxVv zDSEr@;*v+2==p*)S@AZTYL7A6ZSIFw-`d{Hi1wSYvOhnoNT;9u)E}N3t1Ije3?Lh} zwZ}TG>Pe;1_#k=C!FM4^+M&7k4fqAamG)POZPOQB`}DkwX7#Xqf!x#r+TW7LIIZ7u zY*L7)>#Qu<3;6q$RkwM)8+IkT#YS!28B)cr-R11x(Yj=2nCr0?pzGr>#vx6g*Fkq+ zcg9?%;Jke6cf1v=!&Vs__hrbWJ7p{p=?q> zeQw3}gA~rRkH_GjkE%7kKi>19TYiI!U3{JGy!B%$sr3boxMP@ z(@zXC|V4P*cS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/leaf_gen_animated.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/leaf_gen_animated.png.mcmeta new file mode 100644 index 000000000..4b88a81dc --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/leaf_gen_animated.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 10, + "interpolate": true + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/misc_barrel_side.png b/src/main/resources/assets/actuallyadditions/textures/block/misc_barrel_side.png new file mode 100644 index 0000000000000000000000000000000000000000..ec2b2e14c4f86c61e7603beb2d34eb9226a8bd77 GIT binary patch literal 3520 zcmcIne{9rL94|sdz#$4Ipn|oi8Dg)mKdyHz-1xDZ?1bBnampYDc-Ow}y4|(4?Y0{# zOpVGCi7-Tsf+FbT4@HG20gNQbuS6pzfF>F>Mxrc>5JWMGi@x5k9lEi_AI;sheee6e zKR(~j_xs*;#A@c1jlN+tK@eq;>Tn&tkMq7)U4ehstxt;hHp;4A;t<4`@!oeB@%*NV z_~Eo3uXpRC3uMJi`=DwjkS~+Aurxu;oRzVl(u7TBhFrrp4>k|Z&JV>ph+613B1xG+N-&eVd2Fme=Iw_M#cNKYe7n9Xj8 z!k*?rNLxja#jrl$g_IRkm7<*0Y^SouRfRz*ltzZ@U|F^(Yb8zBbdu%( zs*BT?7{Jg*qeUD2`jSo;O*n2<3l1X>NWaofyv;&P9dgWOTR~MV*v+YhXdJf=_2D^$ z-prO!H#M zFF;}Fq7dZ~iN-AAL7Ww2z~awz?-%4mqo%5BZKa|t&GK;$O9-;xe~Bn&u?k%{sIaQY znrWvY&VinW4T!Of28t|ZR<1Ntri~3_@A%U3NM&WrHZ?tkC!D%@bIC|mrN~O6NOL|m z>uxkEM-0b>hJqsD5QSs)>AETl5@0!yP-sQdSXvSUl}?BVSB|1dlB!5RRJFqTu&FeA ztn}9B3RE=}tfS98MFTAF53+Os36iHxqoL#v&_GJyn;)t{DOk`}YwNg2z*MPL&np#c zR1zY`NfJv#B>8Ec75ucMuo{gZKpa96ges28qlJvsV3(j*h#{&lSnts@)tnm)Z~$Mp z9pEd!XvrY+ebe_CI?e@0ksh&f@GrtW4#SLXWyfNA2Bqr5I!4CHIU$zLEV*<7mN;f{B2_a|y)FWW3IV zRpgr9fVvRt=XsS&(46K6v=s2NmVka*R9GRv^3bmee2K2C)|`vX;2GmXvD~=ZA~IfiOUpmPRubiw-wrGP6OuApiP1q z(0S8nL3WAz7PKMWy^!sMD9tw0WU-)0*Ce53rF11rTc*WO^E*TlPHI3q4s5wRL>wO! z5<$e$8d5l#RdGcJB@WR6$O@{cqM#at1&IFw5gW&yi^UrzC^WBs0#QDFN)j3k2=D#O zzX(RwcwHxNIohbJn&LMf1SDo3Ti`-w&87c?y zSw_Yi;vie(P#U+#XiuB@Z?{OVi)3LaIj$Cl@EO>9EFQk`OY!)Q3|zN1KAbN&(Gn+! zVXGqHIq~xK>CRB?ffW-Tt9^A;^_a&x>yon{CKo<>_$g3+``E`12IXI;Z|)sgW85AT zULLW1#qg!cw||~KcK3UFd(CUdE;b+A^X$GRf7gzYFL*pL_75)RC{JH7ylGFRlLZ%<@-4 z*6Zg+tRa%u+(dl()Auvli7o1c!)<28F2bzX=I?r7%-nHfK3;5hH%7kjog&O zz3xQWhT75WR`cH2?0eTwf}f_3jEu!^d(qc(;fb~1KD77A%_Cy8{>{j@ z*AH7))%C%;plHf;Uy4zByFqt6^XeezI;@!WkqJ14z+quV(1mS^V! zFuA28_St8hTaKT4>hoLIocp3@*U3-z_P&h8&cAi#mhE>7r<#tu5Uprm-Tp`S{wvl_ R0p5SCNL5XE$J`Z<{0W8KpvM3J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/misc_barrel_top.png b/src/main/resources/assets/actuallyadditions/textures/block/misc_barrel_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1b67a9c98bf08ca5e66c06788664be76ce390364 GIT binary patch literal 3690 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 J_tJHn{sdX0oD={6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/models/coffee_machine.png b/src/main/resources/assets/actuallyadditions/textures/block/models/coffee_machine.png new file mode 100644 index 0000000000000000000000000000000000000000..1d0101a6bc34b6c4cbb48350bec188f469d313d9 GIT binary patch literal 3063 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/models/model_compost.png b/src/main/resources/assets/actuallyadditions/textures/block/models/model_compost.png new file mode 100644 index 0000000000000000000000000000000000000000..38bc3b30a016ed5a1b6ec5450a19312b15567be4 GIT binary patch literal 6388 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 d=Eoa}-#uKj??l&zS?)i+X#KLt^NZH>{2RL+| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_front.png b/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_front.png new file mode 100644 index 0000000000000000000000000000000000000000..335e826f1c808da509911599933338cb0bbaec87 GIT binary patch literal 3631 zcmcIn4R93I9p6w}A_~-+L8MgHB_d9;x4Z9l_imS5D9N30;$ad_yv(TO?e5#$n!DX| zckgnc?U;cu6+b{g=?I95qYR*^IDWl%j*NBsp-dRH!;E65Z|{r4CL~kq z&fVVbd;jNLm9lE3eNeL$&RSy2}JWa*-CG+Wc< zj_~EBSokeOC0#coGfYoUkFUq?v+OR0lO%~@0RsSyEoi6LbYY%0o!Mm%VdSW`k#P;n zBt4H%v9fN6!kHFJNM|Z;O{WAC28_wW48!?YucU&ZrdI4SSvyq-uBi-4p)@jG2itNL z+f34OEhlM>;=0m(S^x}fELMpzVlL@)C4}Qfa=45VAR}5k@!kw#I*?;!Z52gwIL+DR zY8D+=X}QB1v_ifKk}wGnhJJ8oI2GI!d_D3Sp9SaR+) zhN)RS&ShQ=r2!}mT@<1`BGH&dem2hWGRxslgLh|(rZG!1^xkSyj%LL;hdGBo{?kk` zi#6!NF^x4<)-5{?@f;Xw*oByk*+r3+nU!0ulx5? z(kgP2DAK^k71E8xMNa)7VWpw2P+Pjz2y8h9=MMS8?4!oL)29EKUkDzvp3d6Y_o4UCLaOhT;g z={&s$3(zUJ%B3&Blj2~SIwg5(fnBAil+ipg(s+JY)gRDl7GjV!79#|C9nidhf=WR3 z0|kL5##1Kjq9}T!`a+!G_iI3*fiAGL6yPx%6e!T5%JBit4+V|)SNSSjo0X)1P~p79IuHQ3Ti=EhWI-WadDQ%iXaPYS-k!ih)UC^ zCZXAd@ZQgSk7C3C)Ub*uw5|w{76l&AiiZ5OB;a>Z7lB_5j#SKuO8f&CqmIddF(%#P zMTI1zgQg+dsNz61&nhX91;+h<;*H6;@$Di1y(oX+Nh;`6QEr&;DpB!0TtxD6Z*>-q zF7im4GhPnjvy6;4#4)zW@d&raXwRGVeYZ$YMG7!f9aqau_zdhlRu13zrE+{nCSJET zKAeBuO3x#Rnq$%Mg81C^sGYM0e_8kMo9{_1yJdDKSk)jSwqLa z`t9%w!ygR{%zG-`z4<47k(OF>ADH>#aQEgpf4H$}%b%v*x|*!reRxtIS^K=P@q!3^ z|EUB0dp_&kws^x=SABls8{(nCo%K;T{bwz&EZcoo{TevEz3%nBThZOScD2{-+$GPr zy?J>4#K#5({`Q>NxoPu5Yksr6@zCBzXUg*Cdv|m`-gx}AFNr(R+4oK8>o~aOnTrpB zBiUIeuCM!g84GMhmOy>_QwEI03k{ZIV<(Lp{WHBVXDcU?!k4t@F9{^k3g{Uo^M zi`*r-Z`WDZOKX4h@x#yP!Z3L6*C#I8x8vKVH`G5enW&3IH}rSNGpFo6e8VHl)F=7a zXaABv>D~6kb>T?+_PPHI9b0{L^&abYM^6>pf+_m0cx@crccu&jnmHz=TYuUyC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_oil_animated.png b/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_oil_animated.png new file mode 100644 index 0000000000000000000000000000000000000000..d73f92bd958015f784caa17ac14014f362827c7d GIT binary patch literal 3599 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_oil_animated.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_oil_animated.png.mcmeta new file mode 100644 index 000000000..aa7d14af8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/oil_generator_oil_animated.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz_block.png b/src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz_block.png index c17cd4b7c6e189f10e43e13097fa7ef2b14f25a7..2ae03caf2a3ec5ed9664bb9a11f14e5e9cafbe32 100644 GIT binary patch literal 3662 zcmcIn4R91!9bc$zfd(2tI*5#Jw;z*K_V)AkcGp}2xlNixFA2v%1GdV$-M6_dce|V2 zO>#*YbeJioHvLGURZ2gkh#dwo0~DzRX&q!}%@C#PWFp1Ub~3=AMx_qLPN%-TFAhye z#@e0S-P`y6@Avar;R)Dom|hr%ZcrtSsHw)QGBN^4Ll5AYbjoz)Oqj^x%BbykQv{wh z@iv5s6~05fE!v7lEC=F3fF@O%X7P{|U<95Q#br24vouAAD266kR;C3x$l>{iK;9fp zmt#tO-WPfc6G_jrWs2(V?hbTw0n2Hp7)g>Snx$BlL>8pmV|pM%n(iG11O>XPW7wWy znYfP#5>}@dCQzig6w-DP)^zh_LItBTz^0f0?WdGA)YPJ#-RY#V&NY>SDVT<)=OSCC zXlo}e&vKL2B+$j-YaF1`Mx#X^6ULHG7hSksT^C9tUyuo{-FS};sTg#vPDh1xT`0^u z3fZ_`3|_70G^Qi-;$+XzCzc7?YU#BSlkNjyMo_mJ_$ERDnCKg(~7K8=&!u z`wUaFy4^}Yhx`Pn01t)K)D7CLz7`p(;zPeNsR*>%9LkGF+__b7gS+T z2&p`ygTj2pQagQC`tx%eRI^lsaWyPsub0aN<)ZhLSR`*Vn_f{XdHteB$d%g2x!PcC;_0MtbAI?2nK}&{EZkU3Y~2} zJyV^z&JatZ2gw0?@{`t1F@AM;wP~QWU^L z5mGre0of|bS0)6J6TL~XAQR*`jZKiO9;8Vr#OowTfFLQT3?E`R5Y%|C1S^Z03z52h zE?Mo78w@|Uo_rLmU`H_?JS#UcP;(2V`kNJMM84aYfUeUcMh><+2@xf(vx#$NuBCh3 zz=12;5s#)632M^dEwc+cCE?q^0qFFCjvFR)$4cYH4UKyi4s1JRs9D-lU8a^lA&TWB zCiUZjuIrbGpL{j zzID*$y!obW4H!1FtWjAJuNZhB#tbqm%b#x_`TeVJKK=P;-dS|x&ePxN+VF7g@h?7k z^y8OWEAFbjYsq8EOAGdWaD&pg|HOd>3%|Rl=fuXAV@EIi_0)D(AKpIr^}(B8AN#PH zn2D)n^R2^QTXx&7b2sn$@Yt=`$@fnGB&}%uJujTxG<50c$i>bhXE)>c@>y7U$HCD* zUw#O)AL!oSh8l|Ui+}d+yZ9PhyW`ZBKK^7!+3||o9^D!Pz(-t%HJ5I{O-Zox0iSP^#0x# zMpDAV<=FSXQaNLJleBbR&H3h+BM%-N?f-4XXOyxl$68kMJ5JS{HxEDB_x`Gi&x+^z z_YaPbTSEu>&hV#(#um)`_Tb3gZBH@6;r^7!S4cD6R$x!`otZXC6-nxBjhWIGfcOnsM`sm|Zc30NSi_N~hV)UCM|2o$@;|)Ig?%hjA8)~q> a-SA2%RR7N4+)e&}e2sO@%8zT;Z~ix3K;_;5 delta 566 zcmV-60?GZ(9M1%hB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j0005aNkls}=liw>uh*fWgsbvst}f|M^BL zl}aX)E|<&e^@6tB?bGR06wOkq0vfEXR?F}AdpsVu+YQIza3DlbP~_O7t_aWPbF*QwOXwl+wC?LAR_^%SS-?Xp-{k>29IfQ zOFEHApfR7%F(zmv^7;JfbV7oCE|*i5V51j}MzLG1R;3Nnfj|HpedAuN_WS+69u9{C zPD7%}q!^mVF7B9Y_q2tYGG33XT} zlL^8MfG@X4kH5$za#)gorCypaX=o56%%E?AlsXv32LfglZ0|4${{R3007*qoM6N<$ Eg7=*R0RR91 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png new file mode 100644 index 0000000000000000000000000000000000000000..5e8c8b55c64134a9bba978b7a78a6ff1cdecb69b GIT binary patch literal 3760 zcmcIn4R93I9bZt}0tG~@&=l>mOqn3;?f2d7&K*c{3Axcr({RBg1kK*=+q>oNb}ze| zD+36dUnh_W66j$}Lmtr5gCFPRXfD6r5F2& z_AnP91BpTqQA?T)u&}u_C^bhVUdHClMLkIYI*0>HM3eEDW(r9!mhvmWXSo=xAgdx)CNQp63aYCTJRm7P#4@Sz;2`%o$k^K440Qny^$| zLv4>@NUyiN7|b+XLOhXktC<;?AYepNOc0cVv`b1E%2LiQQE$Xj!DWd6F%SouWkOpj zXPb!VmTpG$AzbIWZwdgR4FqyA2F)cN&xJ6pq6Sz-29QCm&0tdk5aqzs>kSDMHNZ4y zWUDc)a&QCB5e$dsxxtpI3^CU3xv40SREIFNdvc};q0j)Lr5izAk7c=2mPHYzX$Ohs zKdfr9-e}IUYsd@$KG6bR%q9{JS;UY*iWNu-erDTuGHn{rWmRb!XiDJ}6Qme{WCe!4 z$rQ3!7Ag+e{18!#};jv3hQFDxuGbVZH94zqkg z0qQR*bW*(2iPH`$m2My)_%+iKH3|5AUJTaiP*quQN+i$HoD&yGmlLOCmc@BG#NaG& zDx}1+fFtGXc%LrS+pM(5rx&QKOVG!S^kkA|6xq$La1>NW*95gR;DIFtkS1K zWXyCD&VfBuH}^mRx&c?V^!ad7Oh{8RBToflIP(-!=MIi^h!;tTaVa<{vOF%65FwFO zXq@GMJLHlWIs|ABVJj1KkrurneF2JN7?}>?w8D`%?_w2P48d7*N)+p&7?G1%W`M7h z*K~@+t!qhXk5Ho8wKZk3SP1HJ`JgGe5kx6HQIfq_0i;{HSsjF~BO^w7d}9PaO59=* zr_D@Vu^L4K%nw5z4J#7Fkjd*>126`ppAZcZ?q0w!y_jO?aWuD}QA98z?c{L4ur$tbtP2lu4AdyM#7m^&a=GL|iy2gj zzv5z~VHq&Yq}#m6kz{DlWMHTRI53cBxfIY8@ufg!N`TunkTnyD(d-j@to3)i+;jxTIXZ7 z%k-Ppt9AXo)q6L5b|&%mzVnZiw!Lup@wyWNvYjy8;P9${{kmgx%j=IhTicPIy}NGT z-|l(yfwRq%_CNdYD024QZ?>Gh(v6_4?a8)%;hpj2Jr^VT#Ouu`qLp~X4sKuEx#UQH z(Tu+zJbLM+qsZ-ldh1thSIbtQ-2H6)uOG#io_}xc;b-6Ij6OGS?mOT5$7v?->D7r7 zpMHGyu6dsP&8^FSPqcJ3{H$c$;wgQ*Hdogsdt5KPzcu{fqN?b@8kGOwT(a+@$J&p+ zvbp-ode2U}OZ#Ea@#@M4pD{Lfef!Z4V%hkoT9qx6FIVk;x$~`4oedL^HTNKQZ}cFi z58a1!PW5~8rvI+JqVL^s%hDeId*vSz)pe2l;=fE}5pB=0b>FM$b!?lm_}EVuzev?g z|LyDv71MUVv`krf{{(J!aP{Z~2T#?IJ#WAB%ad21fU$Rct_AAyTjHl~D|=&M|I&#q zwcRVOw;eFIth5ditDaLXZQPy&C%VhNcJI8xu}#fg&5PE~(2l4}o1^E(jXJY+_mw@R z$-BIi(EI$D-;`Wi{`qH2@9HhC-pdC*Y56*Pt#$ovQ|?>!gQI;FtB_wj;v>8l?zq!4 z^ADv*@-Mny<97ade|vZI<8>!rUa@}my@x#4+!tPP^gngr6QmmN+Iw!RFzWr_@vE2o zwH=j@o|a!66Zj7DDORxSWS=>$;=HeeojY^O+Ed0Kqm|P-^6ogp&2dbvJ@9zm_2Y;7 azgx{Z&K%iyJ>ULM=`SkvZ7Zn#(SHCb9~lDx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_energy.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_energy.png new file mode 100644 index 0000000000000000000000000000000000000000..369087cc77135c41fd39d4bf2ad01822aa0a80ba GIT binary patch literal 3735 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�Fw3d3K>4KtmQn0RS0AWz#}LYLH97 z-iQIBFxYC-Gv1jS^szL$P&q(Xeo@;v^H-+t(NvTRmcVUd<=}5YH4edyY-Puq)HIB@ z233TNnRCKhJkxgd3@SiZ;3|Y(gOXw*nwt6YR14bkPjR(+45S4>OPo(3X@F8D(+DBJ zD=f)-pg-!9I2Prhin1#cQjsfqW9otoN{!4$NmlXDq~JqY15w~1y%NLw7!G)3o-5Lo z)tYmWx^^tt+9Nioc5Iov7cFp|;}4!KHzJU7iIVKi3S}Zctd2t0i4h~GHWh=264%(o zIWbdLtQ0U{O*`VzxJ7~*(|KL%f<}@1Nnilfy`W(R2*uD7xU->gOUFSn8CRt&ZK*Cz z&UXk0PGU?uCg{30L@ej$qkhPc3Y1uqk$IW)3oImkfZ=7Y4E?en6d?W#L`;O{MFurY zr+ED*5arV+#emihQSYZdM=%1%$O`mxB$T32)ah+%LR6Arloog(L)y=yJ^ktx zkAsoMWxzN|w|U`^WNgr6XsAUTDCU{t0-j~uf5+aqjGI^w`M)PATc>j6hWczJ%Do43 zNZw`d&g{`e9IfU|l!NFjBcg^lUW=SS;kFrVYtuh(i?pjq7KWnZYGDYSf$c}<@Qq%a z<2%&QzBSO{eE4GcQ4E{3I25dj%zr%G{O*$DO|FsG=f2!W%3bQQL)*)r{GPJym!%iZ zX}49yPl9=080miCiPir|mAT@(r@P8t*>s|+?8d3fYyUF&^d7h+^o`%Vr0$s6^XkCS zkN@<^Q1xxQW)FUK=;vQPFuBi#MHZZ>zU6n)KR=CNgM*20?qzRS+aXO~+`3cQ_13^0 z-95wCVbd?oz<&LHXUUt5@bc>6@S@VpJ-7U1!-F3U)eN89f4uy)HOFSpUH8=Xhc7%x z&G{8oGG*!Wv&%kN{`IYJ<8wXnCD(WFIEC@2UpjN-#o%vuJn`h7#g*+HQV;cmu|}P55McOw9yO%BdS_S*jLoIil@jtfX)VJ?yO=dJ=S;r$ey)7?Ww%=;JFJ=tG$OV|NiVgwf8yoT=%z>o0$zQz1{oXe03;; zox8Mg5$w4?UF#8CaR;0v{DANUuIk^Hd$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_standard.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_standard.png new file mode 100644 index 0000000000000000000000000000000000000000..94f2a1490e927dc797ee291644163eb3ad324aec GIT binary patch literal 3753 zcmcIn3v3j}8D40qaloQgT!nybHkTSm%--$m9=rBIjL(k?oU!Z!Y*HR`yR+x5?{1IX zJ)iBW3IUNExQQWd6H%N>M54h!T)>eLLcEhYiCYmKsUseZ3p6DXse#ajNCi53FHCA< zt7%qud%H9L{Eu(G`DSiIRb_eBBhwziFf7Ym;i^WzKQz7*$D{kE&Gk0)lNqk4(=cq( zqsDg}_M48W=;5mDt<`Hi3wc2ant`bJpt&g+M%EZsG_NTPga)YNKIoT2PSfDQBPLuH zou;K$59tY)znC5j4ho0%j8lB97vXQpf{>u}7$X_6)_q}@W11Wog#jkhv*@-m@l zswnZ*uCin-^yW0x>w1{CSfbIWIm(z7)o-CVjs17#;~~rgXs{OUfPJtNCGmfwdQROLrXQ(l!z+8 z(ngf#lc{Pny&B%fa}2|gd3vxeOCyXmdLAeWHpwHH8a-*#FkhlVpew3ZQ35IMRHabF zY1&NUvzN*tQHg3#88svaKo`)V(_|2dKrCWNFU9gCg+2wwolKZ|6j7F%hni9Z#ds;2 zXKCI_K46MiECL;jYAg!8q^LoF=0FYtKeU8HeiNRaS-wOGC@Kn!vSWs}yGu%{R7H{l zs6(qRpO3psOKcQpvk|nJil^)G@a~YNgOC8-E~g3AYL;b@7bzdGIygYk4hj%H$dZJE z;sipJpo6y24hD!~YP?GkA_gms@rea0DgyFxKRucwA#0-~LgHACu-RFG0D{O6G$)W0 z>9hGzl$5tcs*E%O1crJwvJ#O;!Dpjsj-v5S?cP|dfXf9|IZV)R0e+|+&1T%^iZ>y4< zV4&6|BV@Eh61Jf|br1F+0lE)Ys`O$sDH@`wmXxRYz@K~y$a9BB+Q$J>VC)h>0)(_k zB7^`d(FALS4xe3MXdk4DEQT^67YWfD(HEqw3?tG$f|jf#!P!}f0EiWYO`upi#Q>|w zGDCdDy(Ut$JiL~;_V5+5QCo8|iyF8(oev(D8y*OWi4u&(3K88B&GImG9UCzcNu zQQ{$sIANwKk{$&rEcPQFjVcnB5tCO!jZhtuei*0#?OssToF++Cf_QpC z0qi>+aNo;c@Ou7@>#c#oTYtHHeZ`g(VXP{&4)U1=HSz|}u{ilL`H%pJ7>pi(`)>l~AyIZ)LQLu90>@%+3_s8M?F2G(nP~V@uWOD0-lbgt_ zNThjv?)1iA=EQc)es=qc9cL%uZ>raRe|FNrD^~3Cp5pD!jC;4IRxQcSzjLiK*PZFh z`LzF^=kk8;U9oj#MgD7*TiX^4F1^@w?7-eVTi&?z=jVTPFXQUQT=#^*liO#_>RGUO z+($2b{<*xXLz~==VX>Dy4JSG~cRn4vaqG&vCyuRZQP=jpGSQcV6_kCkqV3iEg(ZJ$ zEu7WTPd%3J9=~V#&che(99+J$`l-c>GmpHRdG~PDrp(*UmukBG{lD6_?TJG@(Ipr5 zw|O!Dd%rl;Q(iZrtn0TkmS6lNXW;9@XQz7?{%gnX?~TXSL0*r zm-T&NpSIG!{n(<0FDLDrQ?s{VOX0qb&9JUPiA-sqJXqNK;hM~R>CCS)u+Ql3yx50J zT8^&s<=WRzcQXTjzuKN9F&p-~c70kDjMkP%f?FqFf8o?~YtDDgs9n~2^yQhoh4Y@* zZaw<(r5Vq@e8z*t)*q<)sHl6++wWbU`@|cunZ4^y#m-x&+8)msXv~^9@YaU?SJvP3 b-JOCx^OM5ww-0m}eWWD*v;)O zK}?_Rzb6s*-G4rQIBujfUMBeiS+(*Zs96dM74tT>CWu8#iZ)bNB9By1r(wpZq5j`c zq@l&Aws4Y7+Knh{G_Q70>+0ocb@fVB(x@ei$wfsOJIEsslEr+^bmd}vG zWXZ%^8Kdg`fMh1wLN;0sBE=9(t1Ju1h!o;PL5N1LAOQBO9LRYq8#SQ%8SC$ z98H%~@vADa@UIw^^*mcK)yoIJ!mF!HbyF}B%BkwItWMk{AII55tRuN_Y`HnupHZshQUn_AXD zCYl;WP7*~Lgt$_=$)ubxT@RWnO2lInt~F#BnhbeO1W^Ui5f(*ghy;m-qAJoF;uS$; zqg*tsRM*EXwaaIvzrMUdHA}@lPNj#Ps3PP64JBTu!${C+g=ICG(*Y29UIpQ(UiG%Z zF|bC!T&-6>D-C;86%hbQ;&4JznC3YlOiL=K(+IK%AS6Mk;i`OE$k+`|3Hlo`MpXwh zK0R|?<-rJG@e9iVepME=k28O2`Wn-~y#N&H6RQk=E7mv+GmcdnYcYx_mx&t~8MmB- zSUb~x`V1DJQ*c#Fug6VsF-_fyJT<`1%2Uo*JUY^f1X-1j=rjv)%QO}v1O*+?LKsDr zh{^*6fklk3OxQ(P^v3jsxG>LaK%s#iW@#ycy9N~)rbU$#A{-CHn!wliDtRrZ$eg*B zlJ>~WhF@DxC5u+HD#(W{$&C!va-&p#vm%YE3>%}+bz;OQyY0>*Oo=mW;0UQ< zP<=vwL&j6)(+Pzwo?ullxMci@sa8 zZs+#4Sx-#)?eh&+*5`7+JF<1VeCg(cg-N$&SFL{&v^!Vs{P{jzck6b3bldQG)^j~W zYu?(^v#oB*&F}UQcfNc7(JdRB(St9)IK1fcbyHukcVuQY-0>@7>C{J?Hx-}mIJm#I0h(H?ws=w#}T=B`6SpP$&$bhS2MNB`Wh=7D9A11l~* zy#LcTZs?o-rzg+7Y2=;BL|>SgwsgTYy|0oR&K}s>y6Z;^mmU$WH-5Ol8GP@Z46*00 zZ>eqnm~rS2gHvt~FWI=~%P;ft=Cgiz&ju#_nKJbEj)O;p%i{Zf|Kt9{^1Vk+Y(C`N z+FIC%zPI-AJ3m~!=Hy7f_4vU;|EFJXj}^QB_U7^29jQy!r5<}ZOGHP8hd&-6clUSM zpG+RO`|#!!CqKVw*^Ykq!2AuZy(wpK@6i)q9Q&kg&WZ;dG_n%4hUiZ|Ty{noYd+O;|=b0V5|Ke?XZFa*K p&t2blfVgA|v3J$w1JXaI|9Z>F`VD9x=l?gCXj&fM+Hk`y{{p72<#PZ4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/player_interface_top.png b/src/main/resources/assets/actuallyadditions/textures/block/player_interface_top.png new file mode 100644 index 0000000000000000000000000000000000000000..04c3af383210dd08a062ca5eb658452ae0a3861d GIT binary patch literal 3608 zcmcIn4{#LK9bRasoH~ltlrpx~WkCgTZ{NP%+uPmANs}CqOM5g8M@iaZdAIvES#r0# z+1<-sVi}mu$kalMV2V=;jM70%JJL?9bZj$W1~Jj;fR0l^u$EFqEU0u^l~Dxy_Wp6$ zgk);nxxL$c@ArOxzW2TFy}Pe<$>M9TzUgX;qOMIe$J@y7^}!vQO1|&k)FqLhtDNQz zkD{)*F}SBtTer<54{w;McE3IObyc&oVWit>94=%XVog!?3knX>y0K5Eai?j;n6rP} z$Izx8W0psfAn7#WF0;Ac#Y_8_q_qBSP0^VJchU6)l{m;^AJK(u#`4rcj4Aq6$#c-m zF?7+y?~XAIK|s1a*-AIrE~ce0U^M_B9aX}-B#N?pCk+7v9Efr}U?Eh2q(%g~d@&@N zs~c)td{H?Td5bY!zVE0Um(S~UOIyDtkspiL&LF~-a#o2`cM{Dr-wj4~i&T6?KJ2Xk%MvvaP77xt1g zXIHB6{5E_E&q)j?=GDQzX^b;A=((&YTrkHm4SK4kj@sm6$wmW`=ZlZHpV} z#KIr~g zO`;JfQ|mRzN+%w*v;?7|@GQbggcbO}kH#A;MgT*M6@+wBRX_`sxFIQ_U?IksN@IIK z&rGh=7=@%DK;(d2;W|?FzAVUYlD#5>$XdHo=#45J6ngyI`kDCM;uatyT z+tYD*4-ueCa8*igAd}(|ntEk9N#n&RFQAAn3N^lpUP~!*SFWX~ zJ!-QV)YezdVkz#a=0g|dMnzg_qO@SKVx1{Bn`6**a>OXP&39o!i7PDPl9^{4ejd5F zp_A}vLXqIcP2RS8v0IbAgIq**FYJ0T#&GQ{U0u+$Z_~(eGNx9fE!S)5n2?7HYD@;DV=EI8e*8Y6^6basQuq6Ebdcd&qw;%1?QciaJ%28}8#uRCkX#h3&f?KU z9ZPd2%RzFMQOSll(H1!g;SLxbc(Xt078$5W5r&%MYNd&sfrH2D;hVfvkMGzb>((WQ z^LeNLSw~S*4kzLbskxhQ8{b{mP$c1vTC=iwH~rZ+v*BlY z=mY!zx_0HQp&2ud9ewGgjyd-xW(}_R!>_MK^L3YCAu3^s!Z zv6r)Q?wEh_-nH3-PkoPDuzJTqV`RgcIkDrb+kg4(ZIA4I?Dh2U(Yrrd9sbJkSJdCU z(>?;J`9B^x^mz1^eIF!$n%#Tk_|1E#+0*~>#Lr)RI39XLICSFtu=40_jUj5!nVa@2AARQi Y*G~O;+feAO;J;g9;ga~C#+5(#5ALbgR{#J2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_glow.png b/src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..4bfa4d8e6bd8715e7f7ee8ce6f3d70abea043e32 GIT binary patch literal 3871 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_glow.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_glow.png.mcmeta new file mode 100644 index 000000000..4b88a81dc --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/ranged_collector_glow.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 10, + "interpolate": true + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/shock_absorber_springs.png b/src/main/resources/assets/actuallyadditions/textures/block/shock_absorber_springs.png new file mode 100644 index 0000000000000000000000000000000000000000..f51482ed718d45d8449a21e920d10aa7c836deb0 GIT binary patch literal 3499 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/single_crusher_rotation_animation.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/single_crusher_rotation_animation.png.mcmeta new file mode 100644 index 000000000..11fb1dfb2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/single_crusher_rotation_animation.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/single_furnace_front.png b/src/main/resources/assets/actuallyadditions/textures/block/single_furnace_front.png new file mode 100644 index 0000000000000000000000000000000000000000..47505ed93f20ac3e61272a40931c3117e90b04a4 GIT binary patch literal 3493 zcmcgvdu$X%9A0W51qvFhLJ-MjkqXkiecs;f(kql+p;Zq{AJP*3V0L!4-SqBu-Q8ZV z6{2E{#i$4pNRWWhs1XA(kn)F3M9_!{DhdWgULlG?AVDAml>pA(t53-JB5HLVi<8EsWJI|MQIUhg}C*tlsD zemG+^G`UTY#}#PCd_Xf*&N6lrK7YOz1UMyyKI zYE*aGsJ?4q1MF&pvPR7*C(Duwb`V1@Ad|6Z+)*Wh?IOR4Ox~a1G0~kL@^jFC3%)-88*OhEY0%@D=B_~%v=$eaVG;428>Api{X5%S5nGQgE>2^-HxV$Ymh-v6hm>>!M0q^)@n6f(`hva zah>b#7XU*WiR5Aom`f~{3*op`30y`7kO8fohE5AHb;vQ>ZHTH8IL&FxHUh3`H<)HL%bnURiX_kbSaQZ7f zeOxNtNJOcLJ1&SrR1*$SxK^KGXo`k3KN5I}Rs|s7^hHRk606dp069%&RUxRR%f;iv zCT#au>5We>P|bwcM_+nEfJFfTM^%x;(=aHCG>~=d60ku(3_uNXD4Wd_wt+PQMDx9R zS!viKR3)C5WsU|&_R|6<`e_+*I*kB}c!XpCG+dQO3kAEuDFJUGhNx^~lSj{Jd%7{e zv-rYtfUnG;<{|p~x*OvLo(rBLJz}Ndug4mPVaBmiZM8-cMVrC~M#f1eA?5cp_wT_1 z)CX6#^a?yF4yLJ-k*9f}CG!+D$_GYTl>rNdfKIbOlxdB{2mw*&Y0-~@Y5)qniuf|d zQzq;pEqa6cLY!X^G+w27-Oti;K-6iV0zWN5P7H7Y@N1%w=PTtkog#DlT2k7hR2yDx zotZ4^(Nnp6$dueD0H!AjdW#ilRHoS&fUd(MM%ryhE5ekx%_2^lIi~J*02@`bU>*%A z63n28A#!k1gT`?{;`R{n zLQqtLh@*7`d79HijSk8@q62^vHAzE3EeNs@-vSZWz={foH%vAwUjGE5%=E!l5N|P=ACYlo{FSk$UClPoA4Rfd(0ia@k{Rbj^cRT+W2r@@+MbE z5F=nsxT0akniY#eFYTRMd?O)DC@liZUTPYBcKYVMvy#sp+r#$+ejBwCb&X|~O%AP` zSyFUqR8h&a=*444K0N>DeXFnD{N;@c(+)WA6cf9av@L&Ln7Uzq)y(PLXI$m@g{x%Y z<^vBuOBOCa^v#8jdft57 zoA00N+IfViUaS4E;i1v9=XHNS^7BOR>4|r>9!-=@y>^f-E^jP;VcjJws5L*?*ti~j z`SI3Ah_}rDpg2dq;ca-*Se_E(rkB;sl%HN(*VD%n9;oki~ z`Ks=-yBAE^$BZxUX(~Q?)R>ecrN_e*t7IlrR7Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/solar_panel_side.png b/src/main/resources/assets/actuallyadditions/textures/block/solar_panel_side.png new file mode 100644 index 0000000000000000000000000000000000000000..fce9a2770494933da5519b02083b1be468142404 GIT binary patch literal 2235 zcmbVOdu$VR9KRt>U?I$iWMNA@4m2C%daw4@p6kZ8PFA5~mI{oQTY<)q=mMh`;}WVpM+<%QQw^B6J+o>w#lS$G*5si@WwB;zUbNJHAzWFbiU za@jZ2nCY3q32NBFi>e=3V&MoxBS>L!EW!&lz(D;VAS+Jn+U`yal|?5u!{#A9kungJ zD;hO0t+CQ4G}Z_X5i2f23u7E42m^yhW8sjZb1^3t=jGtod`w_y9AeZsu@ciDI@42y zmZ=&*Sqq5^BuS$M4hzLvt#iyG5YcGV5@jr^79c2x!$FWVLDM)y;Ch2%@G)G`$M!S0fG%iq#E?}5H5qxoT4y*h zs5Ie1IFh1O^kkS|z=#+hAt(!Jx)cYBLJAkD(?W6MqCkKU2m{5?A(l#EBSFeTBy48YKOJSiLZ)DjM-Oz1{=J#-@(kb9zaUqb{CUZAUWngGh{q0F(SHxaH(1H7SX zK2;6%C#tGnGD_1H63v|X?Dg-DPD} znkva5_(JziDn;GpWh~`jS)8^|ak(B3=T>xsR|Md8IWZUS;)-mN=S_LrLiO2Fivh_%D zNzRW30VI7u4JXX#s$@iY4U`06W*^!k#QntUeEox^KU$$BG~FfrzdiMTq$k571bHO@ z;QCKsrZe%pCXzzjov--20jp|194^)7Ftta(o764?6iBVXJ){Rea}q()j=NnYzT76@ zb$&9sWTdnG%Y*Iy*0ra0=5ConmVWo#*ERF@(7=1KW5vjf<_}kNHqG)rUV3W;F*y6H z7Y5C`vSI1Q31hSA>@#b(wEGXc<|(y~n>~)`k(_sCf4!t_!{+Iitu<`B+(z$H0CMc+@YiN- z9<^j$=1-L!$B;c)-Ls#TmQni_qe$l9G-27BIbG{+=xy~!ifdE#GK@ZVm2ItK#JbLtDr&j5%?6yLUZyi0-y--+%7cjgyYhm;A!d+hJ+EO}y@xOTc3Zwu4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/solar_panel_top.png b/src/main/resources/assets/actuallyadditions/textures/block/solar_panel_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f744ce8866167dae374a1f4b6b0eb9d864c99ded GIT binary patch literal 2243 zcmbVOd2ka|98NnxvA|f6KM+Khg<-fhd*s}up-0jql+?C_wgd(CcuAKW8?xJ`jRPWz zRAeY%9TX2nR2)yJf*oj~B90?4Sf!RKjKHW&sU5IfMFs@lCTS?hHDxjNZ z05NI_j3)>RG0|GmsMnj#(-4ZF2%IqCB!N*BLl_x@4vGIzXe}hTnG#!W+!nmEpcRS| zWND;K z@%k16FtiRw!p0r7`27hJvXWB;-G~R|j%e9g69jk(kfq8H4|1xY%<-x>LB<*atRjV+ zlH}`4R8gN~grc+rGO0`q2vS&{+;0M~u?n!DYSu8AG9BS0^$bD6|5Wu%#GnpI5ZyJm zK}jc}V+=+{r@sXXOGaQ7_P$_&XWUZA&q9YqKkET_FyKLvL>L*Xj~+a$hHEdh0YtQ!Q0ha5NM0fWKBv4F)m-b`U6t=D0+ zn})oUPDevM1_KBB*q#iDupwDre^ynM02xhy)9VO>8x!2XjL|whi_s=v!Z3^Ojr+bWy̗H#$7~{2AxizIE-=|2xv#|##oLuU`C$Qn@AmN z5cIlqTYi>jWQxQf|eaY7FgEp3M7)t0rOyjrV3K;w_aJ7nvD z;u4=9t^knq9yJ`ZE=z7D%!WXg2WIxZJ%Zm&yv$bJTl#|)T1?Yz(*N62|3`W}EPMqU z@Bp~}1`mW!q+6RYAwK`1f5%4Cl%YXo+4#7QSsnxefqe(hyw`Dme zty{64lxCA7SG06{hOC;2&WTJTUdTlZ*+1mgFW7sepUh zf5+Cf{{74*rFQXx+b+(V5TdOkhnuxsSNvUOD(Uz;_t z=54R{%(-(7J4(H0cBgDVGHm~-wm&XhY3}H5_sp9&Z?ZV$z0Q^U#%q59?Cx!Qc6!@ay)#d|dMwi)X}*lM6)atx`q=er^`OIA?mV8Hw{la?)4!iS=vwI- zvG#R<ULcXd+I2rD?atYqSc2QE5>k9Y06 zxV3BI(Wy&{UG-~h#anhCPFaypl@?4n7`m`m&xXIeaC-idU+B&QXO90G8Ss{TDMMk# sdi{;Z9L?_QpX|u|xP8(3&6BQcy7rwKtr&-{Qa>~7Ifb^*vKKD@7x|VE$^ZZW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_side.png b/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_side.png new file mode 100644 index 0000000000000000000000000000000000000000..860cfbf06b5699ffa786a15a81041e006bcc64d6 GIT binary patch literal 3737 zcmcIn4R93I9be)wC3HkSR6Z2CUHJ$fd;4*_ceh)PnB)=?WvvV6BhOLXEf7V7XQ9UoA>n!~tY21Re2+j-)Ycd2U<>QVq255UfMbx&tDFRQ3 zST$ZE&o+pc`^)eG&49SeL6Z_qv$$JuFfNYsc$VQT&C(R@rWl%JS&?>$yc17d1hQtx ziWu+}rEH-uFHvP#x=2y6Sj-V~Iy9q_Vgx~;XqIAG5=oF|L(~FsGHTwD*5HGtWT?8O zYEj(Q2trz&#U9U};8B)52-)l%-L`S=K@0 zIUCfdti{a5b_}Tr&<8B&C2S&*h(%61$Z#Ufpx;vaNhd}9nye}f!$ldAVS_9qGH#K% zRur*V1{N4oSe8UZGa>-3ff@mokkX@-1fE%0u|NxJ1~QDia}Mt>DJUp2G(`=g0W+{N zA1^5^a4~|*MY0Yi;jZ5=mPAbpL?u|_^AadlhpNh=EbzQSyFDZ?K_}^UaSG{ixfqi7 zcqB!EEYCVU>G?iQskT8KyuatYXp z=q1vfw19YV(Z5(6#>hSugiq?W9aGO|3_}8HthhRpw5`ATA9EQt% zDniCgI^h~VvhmsxRDiC+l@2`*EsBX~YNpClKB!E!!s?2Vkq!xfmYi;dqyZ<8GK~-d zoWhbE4?Q8bPr4+Ab2CoB%batV zu7uX4i`4aFNz@*(ShZtoNO`di)@J;{6Xiw(QgWdrJ6WMjq`K7+=sG@PB-O^MAfm)| zk~k@5YKj#D2F$BOJQ}k|P@_7pMeCt4%zYgg0PSATFujCgXc0V<(72`HK-a^nl%OqD zAC*%(L%Frko(hHgP1fh+@(NfZJBFr+NIL%bq0P6oh{f*G+A zf62i}V=`cjMYnm8A<5{V$z zqU5(PiDZ$Tor$B1I8x0SF9*?CMnoIp7+d6c3b)N@TbuSpw@AB+Bw!eJTupbOGqByv z9KO*<=J*byC~pmPIKLqEPQ+HVQZ`kKLlk;k4 zQ*-BY>u358>hJfw-o@3P+E$ylZr~Tyt#^m!+*P#a^5&xRnDgk|q9>b~r<$L5<1tHC+dUCE0&&H{Oy%bzp?~7`m_Gd=U@Ap zWBYg4>{>l=?r-^97oEI)=!t_pgXiadtDRgD$v)Edl_9!!s5(1qr>EsY$Gg88oN%_S zoH;Ua^_B-JvJW(@olNz0?SB-nB?h*=9AuB)-g)PwP0s54?!Rx*c9$-_x$r=RZ91^@Yt@XR-Mt_Ps`c=yA5-){b+UUb{@GdkK|Y@fJl-`Unnjeq4% z{D8f3=5%}f@Tqs2Y67cf?)s>|ZsGi!UpmKj{OCJdkFDB2mw8iJf9OQlp^tXIz1Z@; zQ+@p6@3USGY<=V7HDcSX*e91io_A+YZuxtUJhthD_gPu_B?X$G;C^4NA-f4 zuEtL%^!{5}UDCf7bez2Z*c@|KM-Y3`z3dQ8419CRyb}%VmF)}9{bd4npe*O&<293} z-}LJT7d>>}?q%N#-@pCG%XWYzLxG#l-qSn@d-T*$@$~Azr%IZ;a|Um`*v0Idd zO}~87cNlE@(=!9w#le>Htz8{i{&?T-2K-(9-H$nLEj)jO4cB>VdWGIT-&407lupOa z1l9&V={7Iu4-IW-Ki}Fp`yWi-9{l@#+;b;7e%S5)`O3D}rd-K-_l1Sov-UKV+J7EP M3QK+a^EWsB7bAKPivR!s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_top.png b/src/main/resources/assets/actuallyadditions/textures/block/treasure_chest_top.png new file mode 100644 index 0000000000000000000000000000000000000000..be913fc816dd4ab9a864abf11d621597e862bf31 GIT binary patch literal 3705 zcmcIne{dAl9bd421T0ch&|nAI*&xP&z5Q{!cem?ZLXwN*gu^tsl)#jhx4Z9h+uZH0 zyPM<^ZJ`cA0TmKU`C%Cyht5cZ=)ja|N1<_wQl!Gzlu;7e3MfWVnn;u?Li_f9aoB`p zYTdcp+kNl*zCS+S&-eS@t*cqQV9Mk>CSw>jB~%@(MZe#1z6BG}eN#uwgMKC%)k`f5 zyZO7$cLKKk*G1@IK#erm4dF$itS4MR(Ix0gCJZEvVg9nD0puoV;}UFCwE*$Ym;OND zsuCcU@L@V^RKl2A-EP9V_Qesoy-5}nqO276Cq<+n0d0UM6LHNFlK~>7S47XwFh$@g z5xXfslsg9ThHwpDshbe@xM)(QX%_biF2=)gKHof?rCFMyy%a-}EGyC;k$2;ni$K;) zB`Vei@5|UiZvi4^+lEL{t*x!DR<}zx8!1K*1d3)UmL-t{X|-uKNRpaWoYfG7mTanq zt?C-?XathpYzGMBX*z_2kyEQ#8JG}YR1z2zQ zS)7f=vTNZrJjbydiRTvEYIKyf&dhZ|!K6Bhs56rjHN;920$VpDx*pGRrzVRc&ay5V zFIl2$ir#A7OkqV9qq>;@Cn1XcymRM|hbk*;Og*Z`(S%jI zpaKt7ReBh~;~`lWlX5p47DJk415JjZV1Piex>QvWC9ecn7O&NGSYF)Jul7h9$N5{fL0*s<2i*Cypo6Xu>eZ4kKrVi z&3f~IsiGbM;`v$~uN0(FmOLyg2n-3Jz>{u<<4Hkgq9g<~WFZs)P>@#+EkvXSxdfa- z3=rAD28W*U=JcSKrO}1j0lG4amX0xhZMt4lQ7(|v4zbek*P$MVU`Do5V>N0L#v6hv zLdHrv;mMy_di@M)K-b{PhF*@6Vj-GZnf6ox8Z%FEwRB{pB>~W~+Z!cmzzL*6BZL5l zGRX1JCwXNzD?!#zIh_fqNH@JvbwP%AyA@U<*(gt=gmF<4NPs6jGQ)WpH{cb{ou@0M zHSHpG<5*I?N32$z*xE8))WHXH{@|&0BLX>{DA_4is1TW9bp*POj~HpStucrwaf2dG zi&=WqZUrVRZ$vyAvq?~+Ir|Hs~#j2qt`^4~@I4JRqpr_$|)`f4Xi zzX#Ju-segXbl)N{tmL3EZ8(S|t27CD~A?J(NWrhnZn(&-{881jy**&%cWb{=zw zZ}gHozC#Vwt%(lj%$k#5VAw=&C|DjT=~&+R<^z2-(_Sm<>u>-5WYYX?(d^F9Y`!#J zI!}E1_Pr~QmB~l${OLt7^a@#cc9EwT9P!L-+1J!@+dab-8$LSi3SJ8Q?bOA4-+%bW zX6@z6mv6sNzQQ^XeEhKoR~{(n**g!zw!bk){`UOy=broQ*+VZb#8w~KcmJNIS^ddd z^i;>-{KE|#9yb@1v>`aU|{(RJ&dzph`h zr+>fI^WsAP@tfv1FMB*zcE{P_ps{S(j!%O#Hf;U;$g5k{^lu8z**Evf^F#ld^ty}< z5AUpD?;a|^hWvWrMl8H&`k_T?*DqFne5N;Y{H~L`zqRTE0qZUsSRj{U1#?w@eQVEz z>c^O&!sp)JwAcLEz~QI1{rfidwVj7s8ZYQGXZ6H<+v+dB*`RDX`rapl-OHsfRvrF$ z^ZGwOvVYbb|IdSkMq>WCX(#*pj!j$J`PAxO?$#Mvk=MIr%J8a*Q}6Y^!`*a%oG`e5 z|EFtTc%q-V^sCcMXy>H(h2PD@uC6Vs>U~C>ZXc2_JZzu3W$MtC!Mm~F|L6s3_r~%k zd(N%%&uOhYb9h_HUAzB5{-$C}CEdmz!g4w)LIq_E4huh(mOC5oCi#L~OdeNy% z_0J-7p9u|^U3CNB`<&mfb=Qs`oZsPF{_^hiudI820$p^mJJ8$N_V&`=mV>W$Tc2H} ZX0I-MsO^`ZOn3eqhN>0^yDL^a@*l!44k!Qs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_rotation_animation.png b/src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_rotation_animation.png new file mode 100644 index 0000000000000000000000000000000000000000..f7bc0277a77206b0153f38dd4f31af36fa623322 GIT binary patch literal 2242 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_side_b.png b/src/main/resources/assets/actuallyadditions/textures/block/vertical_digger_side_b.png new file mode 100644 index 0000000000000000000000000000000000000000..ad1adbb0c657d22e5f3e2a9602e820d368d7291c GIT binary patch literal 3670 zcmcIn4Q$lb9d`(=2u-tyWmVMD)wpy@H+=r~oxNO8k~^9!IhKS260Mndwx91z?#>t6 zNiG>$r+$bbZ7YSAi466F(p81gZd66nLKm@4Vp~cxT0s`tm6jCIj*oyw)ln+g^L=r2 z35nL#y7SrZ{onuN_kQp9-fe7Iao?@;Z=a80*sYABbL_TwP_hSNI(bR=|ntf%V|H6@hhWex0xdF zjEU3bC+gjRczd`7Z!|54iyoR(X`02ol7|s_-sf9_vouRnw3lLNl4WIDlm!mYT?C3| zX}a7NSeA>0-uy(&aZ)lx_4W06`Z$kiMJYy-B#LG!mL-t|Y4;}`kS3G%-FXiIXsecy zatt$xyB>jJ_Beh5WtuG^kt(=N+BujIU{o5UD8@s(C1ngXwP2U(vErHFno7YqOu(dL zBU`3mn~Ir^X~)cITo<~p3xJ>vhYK;L%q5X1gs`1pFDfGk$duN0q(23zHfWnYmI{Nt zD9yX`)!0rOyoTp2h9mRBV8_s>8SD03R}@Se)0nzF1=Ez=XhGnZR>U;pdG562QN&r+ zL*q4TjHG7v+4s6N?Wtu^s@3?n5YZ^8+L+>v(Wk`mJFr3UX zGRt0Pidd`x2h3=!sj_Zb34rFnNPsA$QpqTR7iLy&G~=d)0;BA>;`UHuV~b_#MjUn6 zZTB_cp5XjYBY_SedpKBMsy2 z0RtgpXOj?%dpfS~K>~CQu6*hBXi{uMQ#&V54Ir9(iW_xPBds8mRnDuEG~gvtqY*-Y z*IAMmpil9t9IHUKmU5K|xyXv%w7wuCaGb^}B&!QFDS3IF1PTyHQDt~9!vR6#xguW~ zuh|r-8`qN29=XYIYwOQtu@ZI{^1(B5BLg)%QL4LGp+@AIjVb6lJ7Q$r_QfEg#0?g4 z*333_rw>@LK8koWqexKGCT}Ktp;eTA3RnQ`UeL1rgl?G$ys)5g$HYM@6*trjZK>X* zmfIl;a1ztTu|e;RA!0cnulOKC>QH4#M&mWoC$W(90*2Q_4f-@6$V2=Eh?oe?%M98u z>AZOTFA(LXPmO_O6r#PK`Vz%(oFdS)=p`8m)xo;*1QbCdy@I4DipD4kqfS-KluG;+ z7o*O|fEgy;&J-)_#*K=bj!d zq01+}w&&<8YI}`pylP;CnhjURibV#Dj37w@_BQ|Fj}X!z2p4^E7ny<^W0KXwLB^J32n_qq4OZ zCw3p-7$E9ONA@ni`Sz`_v&y@#?$;wPym8^p1;MHycJ7MzujkDJ-P;eW#opiXyWd_K zsCeeVM^E_Pd^Orv73}a-HaswPvi}c1czLYh^2Rmq#V%gHpmc9;`fzk~n$3*x|!NZ7`sn z*55I=qU6ten}50GFFRN7zH?_q!?sPM`=1B|OV8K7{Lb0WK1un`IC5l8&)`j)n!i=H rXxFZ{q~rHD%){y{KmQ|tXn5V3($i%R-&N!O^9u!61YT-b`_O*?D7Nne literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/white_block.png b/src/main/resources/assets/actuallyadditions/textures/block/white_block.png index 8d329e28f9900587d61605b5c662f96d5bf3f0e7..126b1d75deda360214f7942da36c9ab0b2bd2599 100644 GIT binary patch literal 3276 zcmcInUuYaf7{6KtZHaBMXcY?UR-vMEJ2U%#&9x@EvyNl_1pWixoFY^YnQvd-I;HG z-}n9IH{Z;i7$4i;x9NdRg+ifkbfi21zgx5KowvdL%~R6`{M;3d98L;_&G%&A4TUr3 zcEH0geswaPtUTqoVWY@+SQEu&BLeF}p?_~PV(yGcrJ9)XgOdE)mtV<}&r9+ly@D&z zkeK#I7GrU6ajfbt&bT(0_wJGUn+^apM9QRQqaGwqvn0209eB=~6q~FFcy+g#K^^%N~T>ThNfB8V-m#_E7(*BMwB|(aCBAbTrzlzx#vuj_jP>1TS=Zy z)5uYj`T6;$l0>YFgixg7CSxPNK?&fyUY+P?S=dL2^q9KAb0b7#WM$=&$Cez_6(0TVV z2S9D5lKWUOmPR9Yk)*?OkVc1)6|Ix%LL`(4k%Y6cD~9JF%w64Vl5|2W@wtxSV4e?7 zeQ%YqSg>Cj0Q={ z0#}TdOETnI^nLDF*wSj4aKxFeB8_S;vN?7UacxVd*x;O+-SOqnoy}C4jc+ed9=d?B z6rQk5h7Hp~)Z!}gs76pt*K|Y;!b#25JWFR?v;(mZHGA;7% zpt6(+t4;qwsBu6u_-eI{`%O`wEc?Jr(hkDt?K!->2MW*{domD3uco{o`i zY93-WrX#~8nn_fqb4~5RYN576RBoJ0tM)h}ewN!pCyImOg*+aqRc;*SwkOKX7OUWL zr`caYuIm#<8+LwLfFy3Ph}&jK=%w>476VhDqcw|!vTE>QFel=k@FNy8*u6xYlw>as z8&bZYr8JaS6xDsVC0k`K;GG>Jr&C_lPr~MIOc7OKMO%U(Pq-8ju5o19R3MWPjT>B8 z+=4Z@B1NQ%HHW~4nHR7BLQx0Xoo2z5fW2S2iDbB8ikg8fqE9RrW2Fv zt{_-nDVY^3@hwiqT~h&TOnRn^TqLWL#zpM+XrNbTc?eQVasQ9MH5IqMJ>=htyTy~# zs#EQ9qx`cHwcpEaCii8lvvqWFR;oGc)gYW@9M}-o*do_cxHCm(XyMInky#aK(a>{T z?KZ&~ID51{LU+6{K~QZWbEAcSFgSJ`nD|>9=~+&LqCj=ZO1k~@zw`h&wuwbI`iavmDhg! z_~P))Pg|bZdG_>nQ-AJI(}3&xcdI>CoZ{q@Y3$fm-&Uh{YRetR%>p5_w132+5e5v;j!|kgU=uP8*f`Dp8x;= delta 394 zcmV;50d@Y&8JPo+8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01FWS01FWTe`H^g00007bV*G`2j2@66%Gsv&-J|k000Py3V($#3`BeXqZL5}H$o8# z-Xouv&y%1oVv_01G_|yy=NZeg#26#ibq#v*ob%56zQ1sFZQHgujw8r`kTJ9Gy{E_? zF?>xLWD3CRy0S(`u}0y~gHVMUISq9+AvZo45bjPuP+ZOAxXJ4lAXtkNh@7zUbAl&X z6Qcf`Dm3yIY&26q2D2t!1_ECMgo-O}jd|XJz>|dVc|k diff --git a/src/main/resources/assets/actuallyadditions/textures/block/wood_casing_block.png b/src/main/resources/assets/actuallyadditions/textures/block/wood_casing_block.png index 54dc99a5deedd138f4cd89d8b7b7345df4db833d..30c7b31a7bcc56c02c268465ec0b399cfbc608a6 100644 GIT binary patch literal 3590 zcmcgvd2AF_9G;?4IfDX`VANrtTsk}V?99-mw!4Kcx=`CCY>g1#&b(;{c4yX^>2^yI z4=|#M3WiG*`NIgf!Fbo?Wt_{_r?~&g7qCx0$)#_#ueGN|4HaZwKbd>il!!|xV7Cn4z zL}P9&a-E`DNgvRxIP_(bDP)ad6_uG3P!~fNkHaRz3=qdUUnX!v3lQ^#2pvfUVY5-Y z#D)z^=0w#ci&a@8Drevo83j2=LKonfWWscmOn}JxRnW6HOc8k2#9bU9s=R=BEK-LD zEgRyZk0w=`W^uplV?>^pq^oh3W@(D{Qw&YAtU`;5z~T89fuh-(uGEKS=3}8>0ixM; zQwl}3wzm3OIiF=WQH(6h6wOjBOCk%>X)|4rAx&pO!9xf-s%@lP!!mKtBZylqZh%0U z=1NGWif&CO4-*26%77Hb_-L=Btf8hB?NTjvA{$&&DVTssXu1xvWs0_`X3MplW~&d^ z#pyEwAZR0zVvJsMNhXUS9JeNo%E$xKtF;qtOF^n0I#!FV!kRQnb3&mS$E}B_@f^T% zWL{kC8hRgVy_qwLf*GR^Q*Wkdno@!`1g>RAEh|yrPF(>-oMnA9K4rdPYF4W=)vF=D z0EU1I1B6E;60wM*qYSUm4Enpu`=oQG5lb`lwo+4uWVk3Jc${OzGfWYSHQ<7NjWt!# zEjtO&9vDf`1gVtSMBv4pRf1N+vQc1^9alOY4hHLNOE(f|!l|ECjfZQ3A|s0;$@-XV zx{-(yHXRq3Dh!7L1gh0%7@8spqQHv`OEMZ@NJ-)~G7bPw`hmvDtilnU!ZmfGU6 z(p#TvP|Z@2kJIT1B0xdofYeo$N4W74@}@x&N|0Aszs3Rp3*P412GR(SDD~=Pr6G@M zTx3~UW=H^Kf#euoAZ3-&NeF1jLMQ{Ep{hJuD98;;33!bdAPR#qkDiH^+@PPO(F@4| zdgT{2_A`HadY);Zy>K%o!v=r{OA; zUWGQrK{R#p@>C6)@=pn4M(;?+Wk9Q(Ungn6%cMplgaEIzBriZI?pHZB4%rIIQzqmh zCwhJQf{eg%8XG5BU7$(X&+8`s@&~oW#c^ z$dEczy|zXjEy*lI9nJ8Xs6k1SKmp>vK*U689x0b1&;{}OClKYgPi+Qf6GUe}bq>Xd znm~&(54~bIlBRhi35=|heu32($mme!P`CYkzk5~U|F{^nUk3EE=^ihNBmFXIMwhWziFl+~%6+)#g2qTKIL4#}BbcV@3HN^hDoP!6KIjDilt zevZh22)D;*&zp6wN2I4BSr|&LtA!zS2lgI|mv8i=czuT^>RTIK&M)3{^TQZc_F6bp z6`is=Ss$pKaQ(=WkDO18yD|3hg3aUN*9^MidTIHcl{KG_eDUbByX5M7_V(->wR6|O z>K!|uk$!%D+S=IRj%#1oI;Z}k^=n@#ADcctdQj)Lvv=R@H?8}B=`_@J;!EQS+`O??p2X`N34(%rQFXG4j^6K$Bo?3OF zXJgM@%kTW{!Ri^Ebme)k3?;^gwnXg(>*q}yvzInsy7j2re*Q;`rY{^>hG%-(GT$D% za?{}PAHQLnt?leLrI?_dA@-m2zv2#r?JsLHompv!}Q8m zD~B7wgMz^MFYlTbh`kNJya2mJ@1V-?u?rezt$FjwPp5KS>n9#O_4}wj-*p|`yyDW( zw%x&RCNdA~>DaQSd+6M7d3Uno*-u6sI&{P1L2So{{S|?l?Y9qJy`ggR8;6gSt$qUU zSthM~sPp&_tDJWiJ+~1yK4C1pRh|s7^q#Jn>59%DU%Fx2y8ZB@gt(w)f delta 685 zcmV;e0#f~k9LxofD}OE{001r{0eGc9b^rhXAY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ;Qb|NXRCwA<$jeU?K^y?!`OVDE&dzrGu414((u$Ty zOi1*kCoi51DEylm4|+75H1Vi{2m}QTZ9)3l?LKDb;en+39e+RA+1fnV-^-Q3$bvP} zSWE~8z<{(tvverM818n~=+Te;m#?wz2s}qM13J4jk&wB$(DVR%{WI;jXQiTZu zK(i0$8pWUx#eXR+`Mk4I8%LQzP!MjGWJ=1w_p~vLJF~|amrH)55>VIUl#2p(5eC5iEqe`|&GtQ;!kazn);Q7%X)h1cX= z2mx7Ml7HRqRUF6FV)_5KX(Tnuq=Jpk>b>?tL3mQ-gD9g$>nyfL0}#Jlp1o@|M&|d$ zHEA{~2$?X7Wtwo%d722hJ5_#y1rx9NMk_gHGh>4g0|P4~BP(MQZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QOH&5aDwQj?N(6O+F-$f{OExqx)ip6SFw`|nGcnh-ut+o2O)@r4OEXPNGBmU_*=)h`oypbA)Cj1} zBu&@SAlY0u#n8k+*V5d?LN_VN+}J4D($K)nAX!PFxWu)r#Hu_aH4nSv-muzi-oUQH z=t_(Wi85~T26nN@*_<9K#5i#Cbxs{d6+;7KOQU2HV_nN6LrdKhOOU4xEe&p82J|2m=EXi>HfYh(~AgpZ{PW$;Pu`!m5Sa+b2$(DERP6`uU4b zszDO-Cr*s`Ji}vagkN8L!^FgghvMRkttKcmxH2kMT|PEN z#Bt&O|Mh?OlwCdj`v3n>?Vqd?Gyna6|FUfclW_Y=uCA71Rv&Ns)V^>&h_B|CeuF&kT&SS4$qAzR!2dO5p_ zzg>-q$NTpEd#o-Yq42C;Nv26%a8XoDthC6UWcI}Q#s)sKfDC5m?9aQl%E@uG%h**t zIdPnyhi6}1#;J>sfBgTyzh3^1`;pAdnQd&s!XFE{7AO8nc=qS-@2}Z4Ov@@Ib~4!Z z<*v=m`N7)p(NaqxO#Tkz28Bgt38}%?XPAjj6f3Y|V0(8zdPl-(F_!!Fx6>cF*xS22 zDk(}!PER@FyI4J`sZ%`s&fT51xvMsCq{+nX)dB`@lc#f$P?}WJ%w}y}K^@LSy>`}z zSGD*5|MR=ubA24Eref#Wbp{O+d3Rf_kN^LB`oxWEVuB~nlniuQvfRjEj?K{nA6{HM z&j0_vVA+Q=Hz%v@uW!%PYhw%AtTJ_-oQt^LtSdR)n>Ch+GccUBa{WC0v0pO-5O})! KxvX6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} D|7Iun diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_haste.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_haste.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..0e486be8e9e166aafdb9dc99668ed6e7edb69e63 100644 GIT binary patch delta 928 zcmX>h+ay21f{E9Bqm>-9nXy5Lfq|8wxs|cGwt=CQfq{}jMQ(wWZ+=Q3Nvf@q zk%5tcuA!kWlG4e2%$CZDiK%9mMy9%EmIjHsrimsgx)zoe#=4dk7UqeT#zqEaW|os* zF>9$!z5RB4B*wqW_rke&dZF?*HKF5oc86672 zjwHV7Fr6+KE_Gv%rfH~$gyQ4Z=Ecu`Zsy_n|L^aQ!22FIl0~N;JJv03XmBIy_KgqR z1_nQVot^jhoo?Ed1Pg{VLl>M@$kw*MUe2z*;%`@D;_<$H{~oIw$Tq19E{ckYl@{5P%$_*k*uZBNkiqPn z{dw0`IXRAY8M~?{Cyw*;@a(J0ICb&ykN^Mo*UR5=Ka!a_vyDwy_+ug0;>2GG&;I=V z{WZIWX<4PjP6pe)#6k}(g)sR$j2jddnI)tKU!P$nI#KKbqnp%@`uvCWO}fznohNUn zKXS3RKNI7~aX{$f`}phYE2|%S?%DC^-MP1!!L6kRU~(R8zNrgax7Ir>6Fhh>&HHGa;@_CU?VWEnshpC% zmp!d@ZtecLwT}&qjUVU!s+j-Pp7DoHmBB8T=`Vu*Y(DnyhWzio&qfV-7BW2ShZ#4l z%+Z?dWmn%Y!HMgn42z=xOPPW@|3agGdJOOWR{y`pKJB4VOxuB#wOR9Tl|8<+#zgxp z!}ZeG>#UPhJSVZ-2-|)&_bSWAG6!?HO6B|~j0yrL_#EUapD^Cd{(ft3nnIA5rYeKH z-Jf=*tBvP&7QdS_GkSLVw?-IqE4B!vt;${XHf#4Sz1y#Yon2g50_MI7(KlfAdd0+=G}-9N>rW{q z4xXh-cmJ0xS#hQN^4@PspJEzp7Q`@gKRnG)zf}K*q~+X(>2<;kK;Y@>=d#Wzp$Pz5 C&nI&L diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_invisibility.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_invisibility.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..b5ef8c32ea9e8c43db2b1487ab9ae83c29794b0a 100644 GIT binary patch delta 951 zcmX>hJ41eg1rx9NMk_gHGh>4g0|P4~V=E(bZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@Sme&612P3{sMG%?*uAbyEyX%ybhCk_>e%EzB&8ER2)QjEyG0 zWY$(OPE9f~G%`xlO|>vd(oL~6vDCFlGBwaOFtju_G%_{>DmC70!SbES)zBy@*}^!* zT-Ve%#Yi_P#Uw>H(KI~l1+?tEt3o_L7q0(wJ@|a)J-!?PE9p7 zG%&L;HQ#)j%a5sEcK3801_mZ}PZ!4!kIv*j|G_|#jc3DzRgSKviW@gBTqt*}{^z4} zb5~y%{50QQ-f~Y?s2?2-5_VK3|2xFW?ODKahOy;^uXJz_OY6V?|G$2|6{^4ffBpYnU%$C`Ht$||??%eG zH*2G%UnM>=C_OT(+nB{H-^*82$nC_BUuWl3{?lPTyuaSQ?uxMB0nw?)j&+M08bquq zOP%oZ*a3l({7YZk-}Lmncx52Nu=&RI{BLi{^CcxDB>w%a{?X9*@ca7N=9@N2O32w- z6+C#Nc}MK@NlS|vvw`thzxjlAN0*_&pTD0!9DE(l!((0c<*U5?!2=A2;tvIEIt8vi zdUb2T16ga1-*XxhFFld9mXL^=eSPiM4-OVjK3r6Gx2sD?`0&*^xKHjlFy#LJeqg7x z&ik~9$&48t{lOBvm)VVWvJ005&d9`Mb|wV!6kF=J6g2MV;o*tAIpY@x;~dt&$eqj7jE$Yt zY)$pU13ES|8W6)3E80jV%S(xf3rKMOTTc#KoSr|`# z$*irCm}+5SWNu)rYo3;BsGE{xVxencZj!2NX>4GeVriIcnQWfA*@EReldFZHsfn3c zikWU|qOqlJatTvlBu&Xe- z65&7#qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} DRmvyA diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_jump_boost.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_jump_boost.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..1fd522d9199718a5edf7b8fcf90db5ab4eb11e41 100644 GIT binary patch delta 978 zcmX>hyGee61rx9NMk_gHGh>4g0|P4~Ln{LdZ37@_prlZdTVUmzpOTqY>5^EIYO7>q zU}T_cXsC;%baEfFg^G!>VX8$+nyId_c}j|IN|H&MZc?&QvTkacg}ITDk+DHqa@yoq z%vvfI1}14{#+H`4W~qsWx<;ucmb#WE25Gu!2F6LrCaEcD76ulZEm*!Yxtg1$B&C=o zTj&~Fm;&X^P0V#Ij4ac14UNnU%ncJQEt3q=loX0fT+2$V$}>{)usiMztIg&O>?(|| z#JG?s<0fxl7n_{T>7hc512X)O_=8EDMDH7#NroJzX3_JUWyA{09R`Hl7U=RyhV3*x6}FJbZG${$Bl$ zAB>9spMGA}Tm9Y0NGMxQd7~o3<_OoLw{G2;(x|9pW2L3l)tGqj(CqE!;u8{n{LKEn z?QpxK#5`N;%3pUZAIUnEaOgyxI9B$6fw{T8eeK!v@;p3Y*Xq5e8yXlG{Q2|s*VWnE zd3eJ0*;!+EA3Lxi`FL~tbA5qqt$6}B_Gp@hdPpcfer;a-?B`}4p8x;;{s_G9apOUk zSMuYd-4YTyVY`h^)FdZx>@t7(%em}~z`+8BGfDCLZ*IQ7H#Gt1n(yx)GPAYa-=BBy z#HqA|iZ3q?G)`V#5UrzL|NKEh-mwD*&M2){&^mVD!}s%t+1JM#8oar2@p}Cq7G~xn zF)hv?To_j!y}H%$pmmwRH%sQjOHNvs85nFaTOa-UVPnCGhl}0&YW^HJ@Zfd(G8r+Z z*=Ea@aB%$vh2#DG{O^F&>*rfn$Ho2sKYdzehJoSV|NO!3I=q+Jji0~2U%x*7v9Q6} zh-mj%wq#AJ3RIIbMj%?&sm*iM%=E7YE}U*1*V}%hZe=jh)nNP4&YAIyN*K7!-e7a`OFs#UHVAudo0A r*W1Ohg?oW@hroeU#hZK!L>U++Snl0eq4s7H0}yz+`njxgN@xNAkZX<< delta 782 zcmdlae?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} DSPLi> diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_night_vision.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_night_vision.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..4709be1165f01d2c22fc21199ab4df7d3848048d 100644 GIT binary patch delta 968 zcmX>hyFz|~1rx9NMk_gHGh>4g0|P4~Ln{+QZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QO{jnj;cEi8?6%?*uBbd8ct40V&tEiH5tlTyqrQ_WKh&65%* zzhc%>Ni(oCNHa1_)lD`_GuJgwF-g@;w6ILkH8QhIwlFnMu}m_x*lfY_oyj%XC?zd5 z$;?zY)hO9aH`UT4MK>wYJVn>g#KJ7q%skQ9#4K4!p}54gti-B3BQ+1ZZTbc zr=}Vk8khlnzWFwnA5(pe%uYWB1}1S&7sn8f&Z8mz9wLDf|KF}#Dz5E5w|PgNdh~fG zR>=xMvF&r4E7v!BFSw$st)#TbS(YcfEb(S{ecz%9oM!`1Txfa`u+w$n?s++D<`zol z#(aPKTHt)U@tJeplj^1)|FHM{_rLeP|9$p3&`WdakNg!sZ?_~ENbt1os86|UayDM9 z|MjkQ+4pPg0`2B!uty|DuCrJ4bjXb@o~*;XBqy?sQR3J!w}lKDQ5$!JiikfF51r-Z zreyD%P??#wYbooEt!DePrS$(i-1}?MUfCIQUcA?z?i#teaBjbZQHwd#p#U>zAs8P^GqnR+rE-yR$3xsg2vJ*6YfYYU3zzF|K7b* z?#b}gxBsp4x@miH@>4@Or)}HU$CQ4u^vRh2@hEp}th#^ao<9mMpTDtg5c``gV_l~< z$E!&H#={Q>ZoNA4GlR6L0?|8wjs+sWAz6z6*Oyk!0N t_er6dcgF#xqUP8M;&-^@q7DQ;G+)Yf;JMCsjkOFw;OXk;vd$@?2>|JciE01< delta 782 zcmZ1>e?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} DIe#b% diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_regeneration.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_regeneration.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..194dfdc7dbbd49a4e3dfacb0a6e69635d99392bf 100644 GIT binary patch delta 963 zcmX>hyIg*P1rx9NMk_gHGh>4g0|P4~Ln|W_Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@So!4U$rlOjC7}&6CV^%`8olbS(@Fjdab-O;VH1(~`{0EDR^V zV%AczOf~}=0hBf}OiIx;GciflO-xNQ(=|6YH%PHGOEFGNw%BaJ@`K4GH64H_WsXzmiKLYIyyMm+cpI;OYAm&@U{NklsPA#eE!w< zBC@H&aCc4LCE@VuyK)Ow?p*)9N`k@4x@I|}!=zQK7>?=1rk$zt&E@t`o&JecG=SUp z-{h?aUWb4DF?l(If${IZ(hJ1a#jRY=9^|?G^xKW6xeO+<$1QVG^lz;bnzHy}zkEYd zVe#j8w%L#N-L|{$B4aUoN5f-jhx*?&Ds!!q@_IcP{AH#jZ+sfh5TNsH(}8KfEHBHl ziHR>?mUh2e`1+L}e|ggx(r4GeVriIcnQWfA*@EQ-2po;? z)BeosbjzeHGnQqmNbXwSwt#?=^c<@}B_t7}TzcGc|JKt!q>RStqG@PGY$cw*6}ERhErq4(4)|%K1+i6$DQ3ImlH$VZ59D{np+zg&;3YRR(#x zKkZCc8_(@5em7@k{@&>K*OKS?Et~wZW#=BP^{2GcO4q%pU-jyWZTHWleKTf%mkeI; zf8(#i>7iTnSUsY@oX(PsK7P&cbd#Pk^Y3H(Hs+@!X35QJf5zA$pm=C=GRKibnPdGA zuNtNJG)8o9jWFg`Y!OIXmAmR~*6v$+w_gW4yST6f%zYK2Z@}vHiitI8veA{-pHfO3 zJWG}C{x4aw;!5}Bz2B5R#WdI~h+*h{c$%Spss0T~%ef8H>x3DAz|+;wWt~$(698S( BCnx{_ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_resistance.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_resistance.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..5a19fdc02d966e073f0d39723b9c3556fe12f1b6 100644 GIT binary patch delta 925 zcmX>h`&Vv)1rx9NMk_gHGh>4g0|P4~BP#(q;>m?@X?ymKJHIX$F?M z7OBZ8x~8cnmb!_C$ws=#$!12WX35Fs#wICB3dJR^WhGYS8L4^L9ruRSX7dJi6-HNL zTu790lQ*!7P0r@@P$9;Fo3C@~Fsc|D7+V@8n;7d_CK+1lrdXPo1H;MEP&dsmIW^VT z(7?>X)O_=8EE$85kJfc)B=-cyuQJ`40w?Y&;t#tXjCeed5H4f)AghpTGE| z8YD4);>3v0Gd#9N`1Qp%Ozdo2xPwJ$-W(mJLuU>hP*CN3C@#L(YJx(8E2Co7dsa^WXpXFWY7?3Ae9Qz82#aQ=ggedD)c^#l)7L_4m)r ze16`@;Lq>xkKJpP6Z=C$q@?xZjvPqXcx$TTGihe$3wu4U%Wq0{<85P35c~b>?7YA4 zbeWl%5AUz%mp3r@^RM)?TbLR1;l=Lkd~yX$LbOi3eW15WSZ0k7e&RyN{j4CW>1`NY~V8s$Y6HP{=93eoE%5Hj9t}} z6UX^^c=pw0oVxh<$N&HP>*epbAIZ#|*~TU;{IQU0apJFpXMg_w{+eCGw5(EMCxdNY z?%Ld(AFLf8EwvQFyq*5Y#oqo* zj3dVZp^xw5udlDHe(bqt$D?=W-ev~3x*9wd5a;!_ev!$M#JRRL1Knw^`$4@-wXU%ckcD||Nm4MDI8+G lAnU^MVAF&g_6uAL40#HV%f5@=+RwuP1fH&bF6*2UngEQkWcdI9 delta 782 zcmew>cS3f81ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} DIwvS! diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_speed.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_speed.png index b6ebbcc9b7e39b1eeda5ea052eff70e48482a9c0..6aa7ddc77550856d5f7aa1e3de2da8cf8ae69c19 100644 GIT binary patch delta 964 zcmew4g0|P4~11l3#Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QNcO%2SF43jK$6D`w{bdxPiOmvfyfa=T>%?%BVO_MAPlT9bT zV%AbINH$7LO-nP;H3ShR<|c-^mMJMFx+!J`i55vIrpAV5#+xlzelWSD8YG&hq$TR6 zSOASRw=hZ6wKO(O(KSx9Of)ezOiVFOOjS}SE^#d@u`16<&BN}tH>@_BH?XTPx)S3+ zqKuoofn98JHm9c&VfSsm#;MDw0`$M7QL>4#u4R&;rEZF)iMg(Yp{1d2nqhKks2a~pH zH=i+QYg&NnvjnFVApJ7<61wN*}zqg}?X>dA@Y{5(AS>M~9xDsIS3_Uc-20UUaNe?R#5 z|Ns8FxZSUwe*IscIkSyT`11e%2Bk+X8PpmS|NHm%m#H1&Wt$$Cj(WM{+pd|J{b4%t zLq=3!HUB$?2!TN94VzYG`^@h0;C{iN%zJ15_JV`cbUThbd23v_Xuf>fIt7-5&L7{` zzrMa_??;umn8Nbs-?pqgq%@=zRjWA^YUrHGURF?`&DF%R^anVrMTmf1Nm zq&tR$ty_8WOwR;Q|Ffq>MU-;P6nM_evCaJSyPTsg{Q1|{_5Xze1s*cJ;8S8Li1gUT boWaU4Rb<1X_^DPV3_#%N>gTe~DWM4fOk8_| delta 828 zcmZ23|5J8?1ryKfjaG8ZW(LL~hDKJ#23AIf+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F!zguS&2!>hPoz3X=&z02IeNFhKZA3 zF>9%q8yXoKnkJj;8knS{=%yH(BRi2TWhuv*&SZy|MU{_&u zCB}h788>+YyV&GxPERGm?%RBgQa}_Gx82)&dQz+z?mETqpJ{x4erm#x@9&TI|8hITr=flQN=n+l z|M#!mI@T7?u)SI0;$nt0Llum3&0Ajyf{p!S6#JGY=j!l5f%j2n(P zYc|Ye?q-s(sQGeYV!!+ZnTB-@w;HDU#wOni(fM}Z(W`TBGlN@Q4IcAMbo20LHmEiD zoM3WBZpL1V(~L8`_tvWUefg}sT_Gvq$KTh#O!M>ayn1j`Ago}?@@G%ExD-Db^DI!8 zD>-oF$ia)j5&aJipW>Bhm@03a?mz3#KUt-TNg^&SGEQ0tQVrcW7BJ6nPNzopr01VSXQ2+n{ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_strength.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_strength.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..5914cc705be0c7fe5d918f25e6292ff376760403 100644 GIT binary patch delta 966 zcmX>hyIg*P1rx9NMk_gHGh>4g0|P4~BP&xAZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QO{QY;J%63r5I%~Q=Sbd8Nn(sV6MlhSmPjna}V%?!*8Owvpz zzhc%>PBAmGG_f#9(M>itGt)IrHZj+=v`jPCwMetHOg6HxG)uMIY|iq7$u-F=+0Zn_ z&_p-MEYVmuInBgKHz~=?T-P8a)gZ~(%rG%6(NIaDxWu)r#Hu_aH4nSn-muzi-oUQH z=t_(Oi85~T26nN@*_<9K#5i#Cbxs{d6+;7KOQU2HV_nN6LrdKhOQ4@E3@r_H(+rbS zQ;iJ`%q&dJH{a&+W2*o6`rJMS1|~627sn8f&g4J;!9bFYXTyY5id*iTiF#sm=;Zv* zbsc}7I-htiuy4!1y*A3q8=o0Y%-ZN8{GWB37#rK?q^JISe0X@C1y7k&ao*5iMOVlB zM>@#~A1YRhYy6n-!$9>GW8tx1QU7HmB!1QTS>^s{ZG5Qse|EL~?0N}_d9}X`-d-1O zsrVLHEa;}3bR zqgS^UJdm~K_&ujF@zN7nYYB;{+1J;8{or8n3_U}OI>*rgc`s@Gy_dac6GGoTS|LrT4r?tIop85Iv`|ImJa?W^`sN(dc-eTL< zZ5tnoD;#^iq9LNTfc-#I$E}8`zOl)-LR_L8*d;O_{M*~gy)DO4MJ<1Rr|{oD2F0w3 z4Bkif*T?RE_O@636)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%oS151Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*An*_`DEldFZHsfn3c zikWU|qOqlJatTvlBu&Xe- z65~LkjGMfHU2JkTr-uqL4%~d5Q-^W0KerlFz11tePzDCZW=|K#5RcBYlkK|?IS3q$ z@6-Ow>vYScEHjp6t4Quz-{h6?E^BgGd{Y;;ZmoA%CV22%n)lH-#lJCy+dJQEQaL4i zFMC?++}izfYabgJ8$ZtdRWbjoJ>w6ZDuZ1v(_aMr*?jEZ4f)@FpN$&wEM$1t4>N99 znWHt^%dWm*f)m$C85TzYmNEr*{)I;W^cdd#t^R+HecD5#n6?8eYqRFxDtmlsjfwVI zhU=xV*I6g2cur!u5w`tm?p2nJWe(v?*1=Xvf@hj<-OmOKE*WHEQn#~et4RpeyRQqNz1tn)9Zv8fWXt$&t;ucLK6TI CaVMkz diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_water_breathing.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_water_breathing.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..2f4e1e7288aa8c0cd8e8fdbafe986ce0d7707fdd 100644 GIT binary patch delta 945 zcmX>hJ6V2$1rx9NMk_gHGh>4g0|P4~V=F^rZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QPylakC$&CN}94K0&^gsF*vZcL6T9bk%^Iop~2)= z%vvhRCP~Sb<_5;PNhU_dx{1aniMo~s$(FjQmMJC%=Ei1b1_p_nEm(dqxtLp;nWdSh z=^B_@n(CS+nwaS(np+y_S|lf1Ca0OD8Uf8wQYbEQEi17q&q&R~?zT6qHk&uFt1!9} z<3OT}o4kQtY;rcIr!o=l+kBl;j9-bA3DoMSlJNfBk%R_})GL{$H=Z+}*LG=I8(VRMGzp z#>)jC8I&HG)osjTmha^&D&%(J$FH+@t7(%em}~z`+8BGfDCLZ*IQ7H#H$4;m7y)51HB8?(fgLcj8o9LdBOC2O1|Y zFNoGrfBqmL@7RF@XOz|}Xw@G(@ZtOU!|dzh4GrGhxOlz(4+}H%k(d_e4=PR}-K(>k zo66rPyeVdD^PF7%CLtjsH*Wj2!^{sS9Cq)Q`T3)<@!)lSU&|^PV4!_}-~7A7LRa_l zg@hy}JHJE|ANezL_Sf&P>-9fi($9JM{))n!?A+wT`VKwk0~t5|dcfDfD!8?tQG52T zV_Q~sY-!*#xOCueHMe-q%_a|@dv?O=zkVh@<8oq{)=~d|SKZm$(*BQ*ik6q>`OntU zX_9Q;kr8pr(cjsixL~PjldIvGryB$gvi>tNFi1&Fex=M(Am)<#bk?jhXEFVdQ&MBb@01Zrd(f|Me delta 780 zcmbO%e?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|2a}7Tsfn3c zikWU|qOqlJatTvlBu&Xe- z65~LkjGMfHU2JkTr>8Oz?%RBwQ-^W0KerlFz11tePzDCZW=|K#5RcBYlkK|?IS3q$ z@6-Ow>vYScEHjp6t4Quz-{h6?E^BgGd{Y;;ZmoA%CV22%n)lH-#lJCy+dJQEQaL4i zFMC?++}izfYabgJ8$ZtdRWbjoJ>w6ZDuZ1v(_aMr*?jEZ4f)@FpN$&wEM$1t4>N99 znWHt^%dWm*f)m$C85TzYmNEr*{)I;W^cdd#t^R+HecD5#n6?8eYqRFxDtmlsjfwVI zhU=xV*I6g2cur!u5w`tm?p2nJWe(v?*1=Xvf@hj<-OmOKE*WHEQn#~et4RpeyRQqNz1tn)9Zv8fWXt$&t;ucLK6Ur C)+dGl diff --git a/src/main/resources/assets/actuallyadditions/textures/item/black_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/black_crystal_shard.png index 8c6a496b5103886f9a349fbee3804ea6916b99a4..cf7f16add87ae09df2155915b2372af4ccedd32b 100644 GIT binary patch literal 3735 zcmcIneW)DO72g+B@C9ws)GC5Fo%lyvb9e5&^F7TPlWgpJ#!Vi{roNbhxpVKG_lCE- zGntw9b`w*-P@9M~L}+OnL5OIf&=gvVR?$eKsego)R+@hrzd#WUDuRd_te)AgywrVp zi>(8@Gjs2`=lssOzjMx={S%vhc**FMqlH4@lJT+f7Pv3Vf6Fd{|IK`*3b%{nvF&N0 zuyjTK8!7zy;VVGc4y%*dWaTE0NA)5TkuQs_dJNKq!s<1xnDH5zDZZQv8zuGqr;n;i zC`#(hW(8N`^>R8K+mpzxdp1@1o*C{6bXruz>M~e}3(GFh2W)<=m{tRhAnW2)G0kywV|II9$jDb}#95sWDHu;rP$(!Er$mWaUH zQof;U3*JiVbe6@QrZt<*VpA_h$&^N1*VQo9C`BNF(%p@WwNN8n+0#&#DNn*U3!{dT zYh->jo0U{R+Hs*C_tiGiZkQloT8qURDdOCvwxHmBxp+3IwT%m|$(pRoMwWss>B~Zt zDwV$YK(+OHUpmb;%mJdVZv&;%>h4%-TVxu|CR}cq1B)wrz|w4sJR6!JmV6IFccnleb>aCA}8PmV%(s} z)iFha3F2}}UDMHf>&p?J%}JH7@8p+=IOyo_hNnxLnt`3`;5wp#p(CFg1UVdY-(o() zRQ9xOPC`g=R-3OiM|s&dxu`luEql}JF$ z0d2n99;gSXEYGi!O1guSIaO=3ok5#oxFE~n>dtRpWd7{*wnhjc1`s)4yte(VP`Uts zWtzI#9iIqWvNl-`A!=y{h&6v^`?)iDCCf9^8w*q5-0p6z*(!H+pK77fPD+pQjte|z zrxa>;I2^FS!-cY=wmB^!Sm$AFM=XtktjQ9&b_ycAXjW(oflt}o`Jvk;_9?{0;B>Ey-cGzYLuqOsY_}4c9aDUJiW~=w01>nl+{*G$Bp>>dyEEE-od99qaZS^=Y)YX% zcF;usYq8Hc)Tfu%>ltgIo8_f4?beueY^q;vt{dEFP;7!zbtXn77MCeoSBupJn#f#uM;n1d~oLFbe{ zK{k{gly3<%WQ$o$H(cpE!|LLM+T51}83NQ0A}#PXfCGYwO(AqCnC*XASFe#{VOU(Z z;UKMZ6M=sQavaA(fgMQ3iJ&wXfTXwD5st1CU>K;$%cbEXhY1H^IH9;EXM%ElVcX0K zbZWw3#G+{jQhm*sWV`AdbWq@oAYe98PlPkc7C3=CFh;~fn@C=_@u}m z``F|J`b3ig>GgGVm>@zO(g gyl`mg#~1wcmE+p}XaDd}{^>ZrVN?0Yx}A4_0cM84Qvd(} delta 296 zcmbO(yPau*L_G%^0|SHn=l_X7im^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|AXMsm# zF#`j)5C}6~x?A@LD9B#o>FdgVpPNs}RMUM@{vM!^WQl7;NpOBzNqJ&XDnmhHW?qS2 zUTTSgiJpO;p^-C7_8Xw0DV{ElAr}5;C)DS19Z}$Mss4YtW5ti!t&wgUT*6n~jhC)4 zIdW$6Th;{&r%1i{EL;A$zDc-`<(R~pXDQkV7RNZ&ehvDhkzn!sPQw04Ijo8-SE3%y zsaD@`ZPAoV3m$w`|4(UI-RpU%`5GBNUwS+fp4clvn+=t2fhS3j3^P6@6~72!M4E(tsDUC%S8Gs;+PR&X{a$=dFFv<+%EeZ4Ar2C7voo{y%6GTd z-L-v*C{0TR2_UFMt0I&FQjv;;6hH_e)Q?2vA0W_wphzJSA8AAbZ55)bQd>gI+xv<` z&#^`6N_V?E^X9$Zy!p-V%^sQFb=T&NAKaMBr{23nvc7a?inC6@GA@yF%SQs*JQea8Q>iQ(E;}Bk@`Vwe8n~=d4*% zm9|MbUr>u#KxL*pt&BynRIEHk9Am23Zk||%;W)P|6jQ8WTO$}z>S4<>b)|c$5G@vg zx4U#_Hx|4V)VVZmdYZPhw3J`c^HDsj5!ZD!Of^aoSfJ!UBV{erNQQeJN;2Vb*i6Hy zp=2JJA1$N>6_9qOP;d6#Hj-|dAYodIH8qmQ*_7Ibg7@v33vsO-TyRa+WL-AW1Z+v) z7P3?>_ss{ot=Ie3Njkm=h`MtdXq{9JG^Ms%CecF7<@h2*9PR;2(%tfMYSu9v%=?3z zb5R;4bI~eE=yzX{iZl#X37GXjoEgza@m_~Bq?ifIaw;G05uG{-gCJk$I>LUS zGl>mp23F78R2;${E&zWHZA=J~1Tng^)<<(#58$Tav?SzZE(`m{dTv4c9aD-X8j2pm%-qIo6n!P=qw~ zZA>O0HWA!JMqnDqmIg;mI2c)`8@Rg3EE4d+lNlfg@9<=J)L4}93Su=`%%G6UI4P(> z9Mu)pY}P{F-d);aLv-s?e?uy1q+FJtRg)%U9IoKN$|!vZ%KtImnv7eY8V+LIJGw|( zc0lOJfcD=C(RnX*GI?jVHtoXe4blQo)pc>bxMeaog4^s$2`db?tuai~u(uU9jQP|Y%_Ou8DggU$BUW^{0gS`X@xcEW4nTD}O@ zUCIp|xju1`a3KQ@aR~|tmr^I#a!h-@zDzSP1H)j*z?dMDLdkP5F_F$}hV8&`4J_B~ zi#gZ=NkP8!39@~|McI-d8d%I?y5UOSS+6fnsLg#zkRiYgA<}}`1{4Vsn?mSPFx!8t zuU;X?!mzk*!$DdH>4W(haJ+CV6xe}eoCr#T0Z4kI9pUIY0fvDaihO4H$N|wr7>*aN z$(f*BUp+Rn0-c&RMHaP901fbcn;OUupxq~MOmPORPA~R)>gI~rZN_xyr(K<=ZOav> ze;`@A2|g*Z$Nskry!5|@WCN;C4Bt8rjokCyTyDeYWT{x0IKnS3x38OqHsQ@jpMQMI zq1;yg#+`ScJ~j2tJDi`6+v*YA7~f8|m1m}PGN`u*(urB`3Pbg}r$ z^QV{2oc;HEHf_4^(#1Dld*g<8{o;kY?C9pv9Z!uN{@Mfo_~YMy7yX%4n~R3w7dP75 zwq28qzk6tC>sHJ9%;?Y;&p!P7voGI%X6&oyZhifY7fwF9?}y43R;^a&>d*bAvbVVR z@$a8F@uPcBfBWfeQv^Tt`ByKVdgKQW{`RBiax>GjxhhN)z)6a9kb>1z(g_HZ%aHrhqhEtJyiMB&R_rG*zx7%`#x#i_{iCZ rmzRHKeyQr-F^~T;e&Nu^bGhdaT{r&h)4_%8lXG%>SLxV}>I44)PPXCW delta 296 zcmX>vyPau*L_G%^0|SHn=l_X7im^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|AXMsm# zF#`j)5C}6~x?A@LD9B#o>FdgVpPNs}RMUM@{vM!^WQl7;NpOBzNqJ&XDnmhHW?qS2 zUTTSgiJpO;p^-C7_8Xw0DV{ElAr}5;C)DS19Z}$Mss4YtW5ti!t&wgUT*6n~jhC)4 zIdW$6Th;{&r%1i{EL;A$zDc-`<(R~pXDQkV7RNZ&ehvDhkzn!sPQw04Ijo8-SE3%y zsaD@`ZPAoV3m$w`|4(UI-RpU%`5GBNUwS+fp4clvn+=t2fhS3j3^P6{b~$UxW7 zP!~z*b6rz&gEU?9RFh;~ixe{hT>~S-BqL*!G)wcul*zA{wNy;Z z(vp%*EX;IGO-(Fy%}q^AbdyXhO?8u!lMPLh5{(m+%~Cg8uzY87HLyrDGc!-N&`nED zOw~3}Vy#Gx%Fvt@uapwM#WgadZ>SM7YE?!=a6cqYMV=W+L&y4zo#|Np-$%qZs2Z3zjxjeBA~`!zK_ zJi5!=C_m2F;LV?kPY+!3-P{&6cimXw)F0KKulB#l```caIY|pcH!v7?87y9K|Ln%h z>;M1Hk*Tl$RQKJ;V9mKZ;y3mP8=tti_|@gz;xg|ofhND)^PsYDQe)!j#hVR-=NUfY zNt9@K-oy|*{WI^||Npb+OxmM%IT)p`lxANn~ zd%Dxtl^YrC`C75`+bcun!_V5&7pdF3b|q&_S$MgiK~ANQTcNv;R((vCa{9D`Y|NsB@ChH`axwNpjT`4%x$#L7jpk_s-<|oIt#)rwbyEllx z;o-S`Z~n7+CZY@HWw1|}WoyenyYu-U$BPX3p)Om&hoL-;q9 mCH%JUPWCZnH8ZZ~Wwdn_6->1~^(T)32s~Z=T-G@yGywob-!^6d delta 731 zcmZ21-ypvsg4xW#IK{b~$UxW7 zP!~z*uzY87H8V0wHA*#3)iq7C zFw{*nH8IppGBZfkO|eWhwMaHhOSLezP*Nx^aV;ycD$hvG!|u2@tTvlBu&Xe-65~Rm zjGMfHU2JkTr-uqL4%~d5a~?AX+tid;1_s9WlWTcr)O+%3wu$q2|C?@LkRy2K>y~wl z3*`?p8YIlmzZ&yJSkZaY(NlRlee3`I58pEBq0qf!2R?K@eLAaLh=)i2+TMwkpJz2D zK0iL0UA@ZKNJuv1iQClU=9BAps{a3P?YHrQRz!nlza;D5yguLE|NcLJ@?-M%-P0Qr zOP}pK@NDi3JNN!o_5SbU3idotNcgejbJO#qo@{Mr`Omxf*LhhSd9YLAz?G*p&cFZv zms+l}o^zw2!G`SxcOU#Xc_3l`U9GJz%+geHf9_np`5U+LL+U?C*1h;yX51N{WAici#P&i*=m+CY(3a;y^Z0g&R>_VhjH5(fWXt$&t;uc GLK6UdejS7W diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_black_quartz.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_black_quartz.png index 460eb1d7a88d19d377aac4f72f104e0c97863ff1..074bb40d839c766cda31b945a86e3061869c9e7a 100644 GIT binary patch delta 676 zcmdlWJwaxICF6;WR#ME|MwTIlrdFm#Rz}8?1p+H_|mWF)`G&OfpZ=HBU53G&D#{G&43f zoBWVfV{#~4je@0ZGr9zC`Ca>VWQSbAr+=+pK;hm?8V~9oX+R3~7jwtZB z>NA%mF4^($|NaR^iykQE8#+(9p0V}RE+-cGca0Cu@c6&_y5hGzLn7adpYMKuDNet7 z?bdouonsuKcboOT@+Pe6N{wV-aQPxy#BLDU+Oc3t(>?1Tui%eNmdtO2C6|hHa5!YLD|fNWK%N(6J0Z7(==U6 zBNH>-#8e}5U6UkJOEU}0l$6x8q{*5rS}KN?X_h952FbdK=H`jIrb#BIK$eApu1RW| z2~eSlahi$Y=5m&MjFT6#)oc!D*Jn~mGXxr!m}aVLk!E0|Yi4d@u4`dwWT|VGVwz@d zYGiJfWSlbDpIZ#YQ3c#VlLI(KCmV77B+hY|2FxPPW<8!8^=H(ab~7+Aig>y>hFJ6- zootxbVj$oue{tS{uOZ7^7Ai>Fi(-NIqiO z-mzfovQ=6=hEq~!IvTNiX+EoDTd*#B*0RKT>3hC2e5tKBsbI>veaysHW2u1PoZ=%A zAMY*R%C@gf(&+@l_TU(v!vztSqaN=~j}$w%Gf{$}%X!Otr`y|(>o6Fd+GO*lO(5d> v*9!-}yIWbG&|C9*mfxZ^+0*`f&;7%4NTk5%nsfgX1|aZs^>bP0l+XkKr)%0X diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_coal.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_coal.png index 460eb1d7a88d19d377aac4f72f104e0c97863ff1..9a6700af3e53dfb3a1eb76dfeb29c21fc490ab5e 100644 GIT binary patch delta 777 zcmdlW{at2)CF6;WR#ME|MwTIlrdFm#RtDyiclHMcM~(ls_QG1Rq8GEdPpPc%w2G)PM{Gd4Dx z{E$^+awuDkf~Av_rKzQbk%h6Ti=m;bnUjIJqlL4Hlc}45fsw15#pdm7o=mQWX67cz zX&~EDk_~hXErFINni?kS8W3!rR0cI7@{Xr%hhLeWQNiyt*w642+?kE{-7r+B%qNCY?ahum)CVt(ATB`c$(v2*jRGkc%!e(sajV%SzZ zt#sNieTGeUe3oCHoFsDgbWM_tT;1xkX`AQEx?H@|66di0KC3}_`S-20TN^ZH&92*j z+EtyUUf~PVrkvz;>&5podu?1>^Ubx%Z@b6(lS|AQEE*$9lNxF#CTPpQG`;w8TFCRQ z0q31no@ zV{YeUR@|%BeY988m0|Kdhbe(phgZLf`SUyf4+GEdDOX=jV_wMs1fH&bF6*2UngDY+ B75o4I delta 604 zcmew^vq5@-C8N_uD=B7f1H%vlGb>YLD8ZC12{z|8*%+2%59kXXAx(y9?y;XGipw|85kHvJY5_^EP9Vl zHq2`=5O9^hIPbvMkYz557P;IKR`|(g$NT-G=md?G6Eq5+3jO5ro7nn5XSIm5<~ldy zfBE~|=P4~cV*UKF?$>yRyy}FWovYrz*WQ+Un(MK}zgG&SvF%&G@l;u@XE+(<9ebT2 zB=oCL5v#|wD3=xirg}rS9>Y8Dzk8qXcc_X`Yia0MFy)Zt@l86@Cm4ftb}$GeAF*uj zSg>{3Dy<&FDXB9Zjo7_3pH;FgSeHF(S>n9(J>MC=)Yh9+Fy-7nX5y={R6uY}@ezrS z_ZDwu+t()Pbb?`fa177kf{4pekN2iWik;h;D8bO>yyd;q?QO?(7>rJBvU$@c5OMwM ug#+K+t*lSzt$97mZ_%3UX@9=w{$V*JQebq=x&H|R5O})!xvX-`Xqy diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_diamond.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_diamond.png index 460eb1d7a88d19d377aac4f72f104e0c97863ff1..13bccf3f0f68230621bd523581cabcba1dae2970 100644 GIT binary patch delta 833 zcmdlWy+(F|CF6;WR#ME|MwTIlW>yA1p+H_|mWF)`G&OfpZ=HBU53G&D#{G&43f zoBWVfV{#~4je@0u5iYsXHDGt%eYdC+p660@TOq``cjN2x!;J#5mnM<*Vfq}8h)5S5wqId1&jowU& z636QAt0pz8dpMd~SaP^3E)VeKZNHD;F={(|85Fi}x=GaVhQa@DR~!?F=q( zp4`l*w4~dkQup4)i&rP?y?p$8-TA}sD}Tl%&Qe=FWy_>r_B=M%6sLOCX4|!tuc=A; z{qf$#?CrPr*9+UUl%F}A)OR{a?m*2=`=Z+CSqYt|4+=26X5YQ0m*+A^{$H7gtAA{o zqW*58X3y_0QL%Z($5k3C7iUR5)D^6h-6b56)Nt;1OOb&~NU&$fE01Q)dnr-}9F=NC z<;9AR*cvgIPc|2tx+`~6z@Iy5eIJjOF#P^(p_KBJp|x=S8kzb9GCUV8Id2#;d|90> z)^)$OBU`!o^DWs(ONTqklUH2XIdjj&?9$FGEe7tR{U$SZN!R4K9N822bWfT4^IE5n z;Fnu>c{H!|6}TFbcHXzfFgC&}@$I2Byhw+oS$!% zE>J0(WU{Jaawelev{d9%&F+^;3xC|a95U~mUPG|@!T9W_slQkbteGVAi!W7*0SG)@ L{an^LB{Ts5=l(Iv delta 606 zcmZ1@yFq$_C8N_uD=B7f1H%vlGb>YLD|fNWK%N(6J0Z7(==U6 zBNH>-#8e}5U6UkJOEU}0l$6x8q{*5rS}KN?X_h952FbdK=H`jIrb#BIK$eApu1RW| z2~eSlahi$Y=5m&MjFT6#)oc!D*Jn~mGXxr!m}aVLk!E0|Yi4d@u4`dwWT|VGVwz@d zYGiJfWSlbDpIZ#YQ3c#VlLI(KCmV77B+hY|2FxPPW<8!8^=H(ab~7+Aig>y>hFJ6- zootxbVj$oue{tS{uOZ7^7Ai>Fi(-NIqiO z-mzfovQ=6=hEq~!IvTNiX+EoDTd*#B*0RKT>3hC2e5tKBsbI>veaysHW2u1PoZ=%A zAMY*R%C@gf(&+@l_TU(v!vztSqaN=~j}$w%Gf{$}%X!Otr`y|(>o6Fd+GO*lO(5d> v*9!-}yIWbG&|C9*mfxZ^+0*`f&;7%4NTk5%nsfgX1|aZs^>bP0l+XkK>=4>e diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_emerald.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_emerald.png index 460eb1d7a88d19d377aac4f72f104e0c97863ff1..847ddf3938cfaf38aceefd3e77885a9544306d91 100644 GIT binary patch delta 820 zcmdlWJzsW$CF6;WR#ME|MwTIlW>y9URwgEs9m0++$QpGBYzyF#(!kZeebuYiwd-sB4*Io}z1>Xq0GZkd|m>Y-~39 zA*;sZP_`NcOD88wQ%egY3u99kLqk_HCj)aw3uhB2Q#S(xBUd+z&D+^LnOqH$6M@#J zCF@!mTcqk*B$}A%CK{L}>Lw;98Jee>nwcb9CMqcum$;UdSe0j_=GiJ485jY*W2lSl z|5sc=lTUGoPF}bf6r*)ih`QM(P=To%vj>|<&tAoGK1!SMk zPTm@}`fGhPyWho$pR#(ZRxww1h<{&pZ?+c4Lnj^PhHW_!PJ5<%o@_awX%*yOs&T|9 zq|Nu;J^7up?mNog-eBjdq}0K2Ge_)}$KCfmVgA2@yWmbk#bn#?TtUmOCS)zRfpgKlg#6lTPw){(WG- zUSOAz;41FvB6g#0H_L&qyE6{+*nLhA-yZna@k2wAztjjA2|ggXoD*%xx!cQq>7~iN?)JRfj3Ql! vJk+M#JF%E|^5QFMMcOitoAw_&bNCCV)XsCww`Z@s!2krFu6{1-oD!MYLD|fNWK%N(6J0Z7(==U6 zBNH>-#8e}5U6UkJOEU}0l$6x8q{*5rS}KN?X_h952FbdK=H`jIrb#BIK$eApu1RW| z2~eSlahi$Y=5m&MjFT6#)oc!D*Jn~mGXxr!m}aVLk!E0|Yi4d@u4`dwWT|VGVwz@d zYGiJfWSlbDpIZ#YQ3c#VlLI(KCmV77B+hY|2FxPPW<8!8^=H(ab~7+Aig>y>hFJ6- zootxbVj$oue{tS{uOZ7^7Ai>Fi(-NIqiO z-mzfovQ=6=hEq~!IvTNiX+EoDTd*#B*0RKT>3hC2e5tKBsbI>veaysHW2u1PoZ=%A zAMY*R%C@gf(&+@l_TU(v!vztSqaN=~j}$w%Gf{$}%X!Otr`y|(>o6Fd+GO*lO(5d> v*9!-}yIWbG&|C9*mfxZ^+0*`f&;7%4NTk5%nsfgX1|aZs^>bP0l+XkK%}Uxs diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_gold.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_gold.png index 460eb1d7a88d19d377aac4f72f104e0c97863ff1..250252a5d833d168df01fa32a78fab5126c76bc4 100644 GIT binary patch delta 789 zcmdlW-6%W3lJUewD=B7fBg+s&Q!5j5D-)B+@ytpn{2t~?6;lf{V>6Rv3ti*X6m#9= z6q8ilB(qctT@%yP)RbgX<5UAf%gLH7S}JK4W@f2oi7C3KX@-fqsVOEYx=D#ihPo-H zriQ7e#wkWANokwQS?)2aB$=5Rr6%-Z8|fOGm>B9>CYh(`nkO118XBY}ni(6L zO@7F#F*%g2M#0j_$#L3jnz`)4W&0_O*Hcuv3<0Lbq zq%^}MU4s;3L*3*g69Zk#qEfdWQOj8q;6pBk+%Sx=uGg9+xm5dCG40H_* zb&>u5iYsXHDGt%eYdC+p660@TOq``cjN2x!;J#7cmy+Aez`z*q>Eak-(Yto?es88k ziR1R)XFU+(eLpL>Vyl-+;sp&hrN7L)W|my-j?ES(BD%Ux#nlPHi(fc;{BCubkf$WX z*QoLQ@|QSSIo6xTw*2Qm|FyAyu+gO@)kk;fKmG$kK#pkeXkN0ia)AwF{EN>88?b7>mN!NX8 zA^)qE`%g3JID|}*NU&SENXRtF^X!`FMfcyhIJ>Y2KKz&ByDZM{NWJj?#}Uio^g8zc zZf+Ah9+p(HkkiM!p<7h_!hr8T)Z?&~j<9sjXcapMv<)vVexyHx+&Ghkp|Bmd^Z zzfU5(H_oq#N_Xc6%76AW)p%iUt#~0c^~lfIYf(EIleL${@f{C)bi<2{SN2Wbx3V17 zVEy9@7BbIGou@hZcxELOeh+h{in)PBvZorWYBqocjO83K(Yw$pM_Ala08366ZKf17;CtvmVcl`ZH=yyBQc5MLb;`Lo9la zPBzSIF%WQ-zc}x}*N|l{ix#=u5?1)hX2<*eqv!;Ul@l}yp9=lt@|)QDKxegxwB|ZD z*8o}H`Szt`TDdz$O9#lKeyrLpZ>zwuOAt!FqH2!i&dvFZT;ev?EQIGegM~a=>nJB@~<-Fy+)9r1?br_6JZL)dOCJ=G` v>xBc~-L0%o=&gA@%Wu(|>}h|#=l)?iBvN2>&AI;x0}yz+`njxgN@xNAhDO>Y diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_iron.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_iron.png index 460eb1d7a88d19d377aac4f72f104e0c97863ff1..efd4b3021f555a779bb8cf8f023d6e18ec645b3e 100644 GIT binary patch delta 417 zcma)%y-EW?6h?`OL5;0VvA1Pft0pTNRG z3Fs?`Phch3`UZBU)Gp=6fsb>ZR$tccY~$^@=r%iKk1#J-7o^ikv;S}3HZLD1P8+SwETE3$w3refAqrMti7aRpgU^RT_*zWHt|@3UFl(nIH?)!n}_lk4TJ#xIEqa$Nub delta 309 zcmdlcvq5@-C8N_uD=B7f1H%vlGb>YLD|fNWK%N(6J0Z7(==U6 zBNH>-#8e}5U6UkJOEU}0l$6x8q{*5rS}KN?X_h952FbdK=H`jIrb#BIK$eApu1RW| z2~eSlahi$Y=5m&MjFT6#)oc!D*Jn~mGXxr!m}aVLk!E0|Yi4d@u4`dwWT|VGVwz@d zYGiJfWSlbDpIZ#YQ3c#VlLI(KCmV77B+hY|2FxPPW<8!8EN9f5c5mk5)nNnx8ahxc diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_lapis.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_lapis.png index 460eb1d7a88d19d377aac4f72f104e0c97863ff1..44ff3494156cc67eec34cd70e3c596b52fd81d66 100644 GIT binary patch delta 811 zcmdlWJwtYaCF6;WR#ME|MwTIlrdForR>mficlHMan%G%+#MwM;Tk(KSyrN;EV`OEfb!Hk7AYxdx+X?x1{P__1{Q_}=1L01C9Y*9R^=I~dA3SM21W+DhK9Px z-hagvH2D;V=;Sq=zg&p$HZcayQX$4^lUH!xsGnk=b%B9_vCPxOF~p+x=;X6rOo1W| z`zLlBJUG?I&$x?YnI4n5;1wmd%x_J)H4SnLpLgDp{KD4d+2Od3Eouda;y>e_*#R-7 z(N{Vi25>jOdsTGqr`@^6ViiS}+j|a#eTnBN+v9IH|GtM=`ZDwRQ!4iVpSJq?Yy0vG zb7ngE%OuuEu`+y=+VNrSXHk>%Wd>`Ro_YS-oRKe|{zqxv@|pKp<<_h=Qcm|=etU7n zJmpDS8O&4|?IjYP=v)k)8DiwOGAQ-ow_4T4(g=T+9^Gv7xHgGlSy^Po1a`K= nh9*Z3YLD8ZC12{z|8*%+2%59kXXAx(y9?y;XGipw|85kHvJY5_^EP9Vl zHq2`=5O9^hIPbvMkYz557P;IKR`|(g$NT-G=md?G6Eq5+3jO5ro7nn5XSIm5<~ldy zfBE~|=P4~cV*UKF?$>yRyy}FWovYrz*WQ+Un(MK}zgG&SvF%&G@l;u@XE+(<9ebT2 zB=oCL5v#|wD3=xirg}rS9>Y8Dzk8qXcc_X`Yia0MFy)Zt@l86@Cm4ftb}$GeAF*uj zSg>{3Dy<&FDXB9Zjo7_3pH;FgSeHF(S>n9(J>MC=)Yh9+Fy-7nX5y={R6uY}@ezrS z_ZDwu+t()Pbb?`fa177kf{4pekN2iWik;h;D8bO>yyd;q?QO?(7>rJBvU$@c5OMwM ug#+K+t*lSzt$97mZ_%3UX@9=w{$V*JQebq=x&H|R5O})!xvX8$&np>C~=^C4u7y^wnPti3`G)goyNJ}&`Ha465 zkX2)HC|iw!rIVATsilRHg|VrNp`ojplYzOTg|ms1shfd;k*k}<=Iv~rOs>g50}Rd5 zOm!_RQ&MzI%}vsDEsV|6bWKeS%q)y7O;eIhl9UvROI*uJtjaS|^K6xj42%qP4GndX z{r`$9X!0oz(aCE#f4UOmZ(>ZGr9zC`Ca>VWQSZC>+iV5~#w1S{#}JF&qmvJMF*!;! z?B5!9fK_};>R}c~VSQ`QJAocdzFz?$mGMLYLQ*|K&~`23>So$)8O zMy;KnpAhX@FX_Mh#4~S(PmliS6vQt$u&v8zw*JH$_t+D1|29`G)-H~oy`S4A;%Z5n z@bsTomL}Ysk;a$cDa6&pm?kV9dYRL`WY$(KhXpEMWc!u}ub9Pmpyt)3HKBo~vdS|V z7bM&~(xcH3BgD|6Y_-^tz2V3=yWQ-^d)Q=;9kydQ8#Q(A6}S2V&aZCM<9;_5xVT>} z$y=v4(?9mu;eGYY4ab*XPdIq-;XI`l=kfpbiI6bk0WJ2YfIo1&kv@bsQi<(UhMs-Lgd{(rA`{wC%+ VX)BAh7a4%S)78&qol^p169B^MB1r%M delta 606 zcmZpX-5@=|lF@0Sl@v3#fnkV&nU$%rm67S>cxELOeh+h{in)PBvZorWYBqocjO83K(Yw$pM_Ala08366ZKf17;CtvmVcl`ZH=yyBQc5MLb;`Lo9la zPBzSIF%WQ-zc}x}*N|l{ix#=u5?1)hX2<*eqv!;Ul@l}yp9=lt@|)QDKxegxwB|ZD z*8o}H`Szt`TDdz$O9#lKeyrLpZ>zwuOAt!FqH2!i&dvFZT;ev?EQIGegM~a=>nJB@~<-Fy+)9r1?br_6JZL)dOCJ=G` v>xBc~-L0%o=&gA@%Wu(|>}h|#=l)?iBvN2>&AI;x0}yz+`njxgN@xNAjbPd+ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crystallized_canola_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/crystallized_canola_seed.png index 9be90b3638f8639552081d89e67b830ca21e428e..e7f82670de65c649f6bb398b6849a3d56c0eee75 100644 GIT binary patch delta 361 zcma*hKT88K7=Ur?RZ0u4u9b3=_LVoeBySSz=7EcwgQLkMK@tCehg$F}IAwS1esCYg z?;!53>g3{Z`@_R;GvCa+^Fmg5#?W$ZQ6C_)h>N}Fn|phD7p~I!*tK!B;K&gegTFMt z7N!izG15ffNov3(1ekyZQb5Ne5fd)uk7B>{B1tcZ0Y#UfX#{~`p#l<0O6M_=R=pm7 zjp~?Wr9&e?N);ix-zAX%QF#|kluE@P-$PqJw)W{V-u`FP`E&cI?u_;Ukv@MII6}7N99sK ZJ4xI5RWSxQe9b?yX}A8|4&CB>@(VcxV1WPt diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..4a850a2a6ad1af66b867e0753e5e3307bc99a7f6 GIT binary patch literal 4003 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 J__lqA{|T$w1c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..bb56a2ca9a3b40032a89672bb210c656622e9a40 GIT binary patch literal 3963 zcmcgve~cVe9pBRm^lG62BB(Ts%a2@zw=?g}@1fh~Zue*p+-rM1(knHQ_vXFX8*X=J zJ2Q8;Z4(-6j8p?&u5E}`KpLB-sjV2ncs8j5ifxG)8e?Mo12q9dgqqrb;6?B|yL)?A zx$CVz;wHO0^WNuuf4$H5`+aZk#{PB7J3rN#N~M$)fMo2^TiJ+{4K4n z-x{S-%dShl9jR}A>qY>7!yg=qhYFu_+@PGHJYXVID^~%XO08a7t5SDF#1a!lzmiS= z<>XJ&lFzg0EqXyIRC8k3U%xXHn|JmPx;sZ)o2S>Vkyh6n5KtB|m1^ZuC30%nbX~3k z&&jZymgn!f-vnQ1|*PA(KQ4#L48D9vzZieKxI+OxDGg`=h{u*Ng0M_s+x#*u3b|S-*0mK1PG2R8X~h+N`D_|Y&GMr$t|rf9lCz-g**j<}_1 z$QHUlmP)ZrsI9x6J0opF=tF|j(p;&DRU9NzX1UC!1Sz_uBPukCm`V*qRSy$QFpNzv zEzRo91*IS?1RP?nrln-B9S{$u(j>dGY1|wfN{Ct-Z48=3fe++3e46uH7nz@(zOUj# zh)G&X*y7anZ-&AJ1{k`o>do9DN}8Ll}hCzZvVdFP08*strP{c zA36P>yTUZcGQ}bY6U#&@(KxcXYr`vHip`m4VPMjST$#TZwB-sR8D(x|YAkBU88@hm ziEs|7sx+j~LPZ#5(_R>qC0ebPe7Bxi@>qp8J5wter8tmgOV5Hq<0ACuFkr5hmI>1T zP~W0_Yp)Xi-#1B4js}eqApdK1XuRhek-R(En|jN2=Boqkau9m317&@YLa%95g98pj zoEbVYJk5f(K`o?Un_I&3m}1r$ok$D*+d`jks6{VlreAbJCrip?)T}T)wAiXOYvylH zifX&MW>Vx?#6p@1&5jDsKsx50t!S>mI$K>2c*$Q(Ryz@BTb8ac>OvqDYQTxp&^*K_ zCeTF{&!mQJa2>ZROQ)7%=+G+}v`J(#%|@0DRg`!JHK?lDf?4g#G6d6I3+fiMa~ly| z)1eL98saWktEismQml&t@r(IbtCZ@{-Mj8kA zFct=~nMV-U6`gZcaB8-_k6?+$T>?mRxu98@fBsVX+1 zD{+m$rU9cY${`O_g}`Zta^k8V_G)G|H9RqBs9Ngi9bC3tDww?qZHTnM)*kzE(0QXLQX<+}&1M-EKld$(=6 z{ujH~om~Cp&Zmz4>dxEl?YsXFKRPl{tvP#7oPTIfX4TcNy>gB83|}^U*Oi^GE&td- zdBr_(?YWO%yX3mPL$_*=KfnD)r*1dTjJ)wh^``ULKYcL$U- z@aTi3f$-VG*|NXk*b6_N%&nSw=keY84b!JSF@0(>ckBgc-$(hmJ#TjM&mTWEefAI1 z@26iWM%8P3Ui|sA@tuhcsnZ9;eN&(O;ajgCd-C=#6#e&#OFn&ZaL-Hcu6+7S-S1E6 zPuzTN*MVQNSIv`MQ@h9T*M8ddST5D^vuN`Azb*u%ig|=^iE7|o4D|L&zkPz+jI1-y{R7inJ(}C8@HTT z^4O*ylrMbdk5>$xePe%a`tRlw`))n-@XCp?8;1JNuijbUgpg_cmR)>HACjd)_^FcJ$dErYu-1{ ZcdU3hr9Mrcn@Fz5eZBqp6Fm>?`6nn*B)I?p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/empowered_canola_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_canola_seed.png index ca4cd8bc94c246b72f4224e37fdce7f1b5a1f3c1..c0517b21b476224c4e5f02486a61210747e080f3 100644 GIT binary patch delta 361 zcma*hze~eF6u@z8Dy2hL2bY$Ztvq<|?p^MB=w`r0x;VJLOD-tl4=`x^Pq<`vaxQ`V zG5!z5-Bm{ihwNXze0KBQyt__vjaP(TkvFtN@`&kTbN}QoAFJDXdoE2pOBE^vBKVWG zZ;8v;Xb}_(tV;ztat*>_po&Vfs<9Mn+kLV;p)y)l76Rr3am4|gQw9uHVpWbI7u~z@ z_o!gYk;VPa3?eWw!YVoq(U4Suf>e1(7tc-c()ib#`0&5&>+rPiCfPwT1UP8dc9Wy_ XZhDao0rsEM_hkIBSs(Y?nHl{6egtAK delta 361 zcma*hyGq1B6o6setSnpD+U^q5EeFn-IhjjPurOd_XJI>;3yOFFgSszalio*I0s$-E z!+Kk>x7E_ZBK^ztq zOJ)k=wI`QKNYYv$!3;(Q4OU@PstGA-)qQ5G105Relmle^jgbS`puie9;pA|dx7~rT~*U$F5 X>-lLh1~`1oU$g1)+xvD{@0F7usMKPZ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/enori_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/enori_crystal.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/item/enori_crystal.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..3dd1ead2ed2ab4850591828f27cd9bd2860c07c8 GIT binary patch literal 3969 zcmcIneT-Dq6`!?OyHpxeA)00jkI@h;+n^wi24Pvt0v5dQ-TQW5n3*@e zdCSgjlcH!NTHP*`Rzcce|3FJqQYpk1T1i?dAxlau4QgpcF*Pko14>#-jkM>@7fan` zr(cuI%zO9#?m6e4^E>C<`^3^E_fDDoxygw{V#>mf_D=Y}DgJ)ylkhv^!ao@NH5WQo z788k2-yDCN65Ds&3gB&iS9jE%S!}yOF2#7@h*T+80CXZT@9t88x$8tEIiknUr<3On z9!g3+PbXJs8JsD!iC({BFcixNmvp&<>s*T`@4ic#SF%AsPDD&9<+AyrT}mg*a&35y zhvlSHhD7Vq$<|n*)SX!>wFRM&^b|%e##Az_6wy`HH0MebQ!HacCKyp_W8KyisrpHR zwvc;vXZwPxE_h2Pd!wje%W{8zf2vBW zFGPNjmtu*`3HqXR5-hE3Ay=r2%@?a~0*A>ZR**>w$6G1`xm(8-`oe5kId^4|6*-ZQ zihw0`EO;rCsl&$XuPdvSTX7pS6tJ; za)8$t7kYyzDE0>9IH5j$l`A6O8%JS0a}`vS{BfZ1OdVRV+d{#jAnXc)Y>hihYqm*k zZPM%&ex3*Y#XI6{SK*?aMIxPyX@szWh|xt9TQh7`pM!x+2T3v+N zieY0q2a_w{fcxISgi!9`b)@LrP*m#b0_!zt_k}(rILnTf8e7FdB6CdFu^2^IGd08nSmh{8M@;buRfR){ z;U%RjdfS3*5M}}nK39@b9BUiIgQ+aeu5^-A2fJgUX8S6G2F37!9EVSJe&q!7SEldJ z``}`llw!8nW&O*caDf53rYTx=e5qd&+3t29yjH9j0^2XID9^0CdM2)8aemqzei0Zq zP^~n}#Y5GntS^;Q(q?XD3vSF!0RgHE`(p&SF;`aB_xB2L)-_mLffWNU>Sv*7?Ew!@ zkQ4HFrWe`zYa7mm%893Gh+B$^6rvK~lBFQ5XuvRsQdNVnj%T=PE08;CE#3Zo!>f|r zUY73>(0=6Pf4&uF2veg9MZ)9`QdCt#KyHGV=jw#$1e?4b!%;C9yBIXI6-rZhbY-e6 zYGgBRkY6vtQKTxckU&LHZx+n~-mfRl<+)?f)GlIX)UxN`U;Y)uHm$YmZq68ss4KU>nN% z1chEznF$>@XJ` ziJ1;3PF?ko!w5wTW6xkZv`~#SDobM~)-~vr4zx*RII4wA3#usfbfz;!wS;3fDoYoR z=9*?~2()vmLEUl`OGVrTYq8>aF7q0dWf7`doNCD6IzwDnIr!d%<_<@AOH&C0J&nq8 z2{l|t5TtV09w9=9^NL3i*RaO9A~-V|jw4v2Ixg{m1Yn$5uFZ-ECm2_^2(z$5-7)r9 zJE)l4R1{)BSK=y#paG*y#vubWfq0L6J@kXbEww9D}OJ@nGB` zjzdjj)ao)bD>Rp{oeyQ?sQU$wxjY1ymiV!LTY{JReM{t_%Y|^8n$>;aXNg49(8BiC zF7xSceuJz#wRGxN53M-x*sl+7dSlTaSG{(4X!G9aeAlJ}(d^O}X07&`H-6=@eP13K zK03Vr?Dm-_9^FW{zVHL`NN4l&&(AFV^z%>NfAotj;oDQrg~zRn)8AU2{CR3p>kr@D zdB(iF;pWZve*N5sdlxL5dd3|3+bgHf4s6*Ww(*s-hTiR1HZ?o>#XZwDO2hcZ@9ln4 z%`|mvnKZH&zkbW&1?gYCx9z&po3|g>^R?Wm&(2?#Il1Z+Zx2jA@u#iQ!xu)Z9k2W$ z`l+S`_cB_-8k~VTHNxP=3ks&`_4Oa67qp9!SJ-5bNfd4Z{9uec-!vX-<`YY zgB3FlUjGz%^`T>>;qSjM9qD}egI$M?TzdJ=H5X5B-gU>asZAX(JbZH1(>MI&y6*Sp zY|Iq7gGCXogez^o!@@$$HzA$X1j}5KloDjrjIT!8X0)zVD8kPpLzE7 y=3hSh+e>G6y*hWs^l61J-LmsTdEN~hnx0sGQ|a=p?%Md0ym0=K_C5DJxbdH-12upE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/flax_seeds.png b/src/main/resources/assets/actuallyadditions/textures/item/flax_seeds.png index aa0eb947b0fbbfe3daf49efaadfc2ce9e79b2657..ce81ba72fa57e381c8ee4de7236fa6d0b00e8771 100644 GIT binary patch delta 1144 zcmew@Ia_Xm1rx9NMyn7ej-0$=tCGyLw8@E#Vxl01zM-ChzLG*kE=VS|A`>jb0%o)_ z)p8jdgcurF8Jb%ePUc}&MCO_^TdEkCS|q1fq#5ZZS{SD38kw1-=~|i_r0AL(CMH>? zB$+2$8mCR3!mOp6YGRORkd&09Yi^Kcplg(9lA@br1k{(DWNDCWX^~=RVUz@NM1ilb zmH%WxPKU|bEE4q!AO~9c7iFgAl_ZvA=I7Ze87e^pBZ5+k^K(ieg62jBK%j33BBAn; z1mqFYp?R4lwn|1y3LrmQIp^o(7X=q2Ca2meS(=%e8k<5T0x~O7b0S+3dt}kI^+P+0eq!(8O5RBGEWe*D}S#NH;0f*jP6y#XL35C^f|_Ee+`D;u6=g z607ozRG{yS42%qP4Gnb>p>8_)E{n}%Hx9AMuUJJVpJDsyN=%p&YigV>v2F}XO|wdw zJeOHf*}%fgz}(2(ST`}z$V}J7$i!UN(%2$R*C5Hl($qA`%-qOmGCSvF6(ZCbP2R_; zp<-xYY-yAX3?|DYLrdKhOQ3-khL(o9X@<$Esm6u|W)`OAK!uu{XLG7D)hpe|;$>i9 z?DBMR4Dskp{_`IUB-wZjc;{RdIMAeb-~0(xf4H5Jf3)5ncwHHL9Ic9G0U!f%jaFX(P$u%X2^3uC#*>5&+%P- zjgIpibuYdUaEhs0{>Sg<-1;51O_v!Bx)a$B{mfu%W506c-JA537~7A3rhWJ0;o)I= zBYCJ@LgHLp-G-N^*;}ld_!?E6BzQk({?NQGHB=Kjmr4Kt delta 712 zcmbO&_giv;1rvAEMyn8}$xoO{Obv`e42`Xf46F=HwG9ld3=EVMDsl^~eDhN>(<)sO zOHyr>j0}tnbPWx45lScbGFz&cB^n#2BpRpbrkY!t>6)gR80jV%09ncAh6ahI7HP?* z1_qN~F>9$Ln^+p8CMT!rnj{;U>zWvvSn66NrPwqQxz9K?E; z(KXf3$jmU=)I!(XGTB%+Da8axBqpZlCR>=B8l)trnV6dzDJc|}xR#Yzm1m^pVRN79 zVnlFuD@sN}`OLyn$V8ayF-jF0l>_N=>s$ne548$zEInV&_kGWO10B$K|=% zpIeQoe&X+0_ZS!$-Lp(Z@|NI97Nj4q>-Z@u8iX6W8Z@E0n`v3p-iy_4fip+_h zy!@K}M_e~FIAOd(RZ3QAP5%Ps1U3Pq4O5b*y(}$vJ9bt0e17HoBL@yB9GItA)6w|w z%~ST-`)U-fRk5+LMJTx}KkUEr+KDwk{?|YKp7*wX#j5}R6KkAaT|Byb-|~5vZZt;A z`>_ic%@E+-T%r1V$;q8&J8T`cH15z*c;f6Nm(a4i#e>0LnQ51LY_x=ggx#MxAFuT_ zCf7U*ka7}pwK<#k@9tB1F3Y&18=@my?biD z#GSY5r$FJYwYFhps`EUKJvBVws?Pk&3!g48z^!N7UR_SvJHNJlLwp Ypsct;bFVdQ&MBb@09C#M&Hw-a diff --git a/src/main/resources/assets/actuallyadditions/textures/item/food_bacon.png b/src/main/resources/assets/actuallyadditions/textures/item/food_bacon.png index 4985726e5662fb3f6ca2a2867384df8c3365a40d..fa1f13e8e999e9d94e2d613ecb8ea2e0dd6da517 100644 GIT binary patch delta 360 zcma*hyGjE=6o6sejf50wEkjsiV>obT=XwV160orgXggOF@d7StUczPzJD*`;AI5hO zI}3|6wiXuK|NMNr*>2WdmWtzsp=HJ*TOzZF)%@l5!Jgm8>%3jLCY@F_)(DKjpR|1~ z=`fMuR7dbid+=NYpjZcR-X~>33f#%|vpil%Oo})Qz_LRSQbcgX9Qdq6@Gc0EOm9X% z#ad?4BsqbhsDVg$a7ianB(%QSJPVW4m-7eTHHe1-vWF{!$4;a*a37hmjLm&_1 zJBW>y#Wtq2un1rGaX6gaY&UDKQbyVcZBbd7pQ5mc+5GkH(XJoDO|@ORI-X}a<_JQ- zAGCQ(%@M^|5E1x*6}Uo{;EgFj$bS77ebCKkda{TlnJVW1eb11W0yIVgCJ<}mQJ_|x z9{nUM=8|JH8Z>zY93+F!*+Ge+P)tZcRoVQhUOm_Li^Y(>?ql+vj=ndS({6i^B)_W3V>M4r%t@?QJ=jFF5Se2jB?O=ISP13q_ z&YPw6wKnMEZPJgU>3&P>w49T09=r)&tt4a{NlGzA^sAldRIWOz#~javAQG6f2BcvG zvOGy3ml;=5$U<1>-*s++<%MFZ;J`C302xEbiaY^IGR2XYgj#H69Bgc)oBn+FuD=yt zcpbG8)6K)uR<)_iaW#mWu6c21%TC6l=SM|JN%Q*H{>OaxKl~qlQkC@}rg7A|PVbLL z%IlY01~PG9cX#vLV;03w{+`}gpUf4IEvf1g?NU(fy-F0%7Qr#^*6HEvm# z7XCx$%2lG8gHzdfF;oDfOoC37gXWT&^Grxe{kg91Ezn2(=kE0$l0?(IS&q(7L!q02 g3N?bm+}Z?*P+T^RH)ij<*MjiUw_j%VW#w7$7xmN87XSbN delta 405 zcma*hy-EW?6a`?i*|2D^wTdWVu~07DJDHt76ck)Ag$N0rJw!} z{O%mo%Oq{(O_Yu9!ZO(mH*2TR6gcvwDZ((;$-Mf_vv3?Ah3WdRKJV^E@x^4TS1&fM FqaTxMZ5jXo diff --git a/src/main/resources/assets/actuallyadditions/textures/item/food_cheese.png b/src/main/resources/assets/actuallyadditions/textures/item/food_cheese.png index 6a47af6338def647b44a42500c0c46f800348b01..b1830ba9e444e9ae9a802c55572ee71904b8ad71 100644 GIT binary patch delta 1250 zcmeB?Zjzs1!NhC6(JF+ABPXxesw6WlZE_-`m?(&$Z>VRWucT0s3zA8#$OOx5vNokgor!Z^j8dxM5nWY$|=%yv5nd(}Ym{{s28XKhQrX(AsB^oE0rx_-vft*p` z>ucpdS&-9VvNnrEy#mOIR{lkqsd*)dC7Jnown~Od5W$F`)Z+Y{Qi!0rkpU3s8-hrv zd?W#Rgmh?LW{Itmk&*()*H+H?Ir&Aw1&PV2wn~;}rl!WGP>F!diqxD4m(1MMykdw; z%#dXwQDindvD{;HO*J<$vaqyB(oM58x6n;aGBMIkvIK^Kk%_TETB4b`iK$VNl0tEb zYgvg^c}6PGcSZ(A2D*lZy2#;vm&InX8;98BSFECw&#?V;B__;?H8oC`ST_cxrdg#- zp3AJLY+zw#U~Xh?teco5_EYmj7NX=<8eW^QCOnVoa83K8mzChz0a zP%$(xwlqpMG1j$AGPKl9u>=}uVF*l4z%-GXYHVm=W?^a$RH(UmHm536y=l{bUIqrn zkDe}$As(Garylf{b`&|bKk`zlb=xd2e@8DqRfzz8Lw5co-i?-QQcYjN-sq}-owM8h z<^2HtFt4e$oeClR^SlmzUEs06bBZgMp5~EM&eZMfmDY)Bir#uZ^$x$=Gxxsv`@M4$ z9R*k%8#a1M%m4D+xT0~|*6L~1%j%z$&Qqw)X7VYt@nuUrP;PIwtX&cmIwb zMY{xq4*=sbE>7U{tY@K8>W^-Iw=UbuvSVHLZhOYlyLN3CPO_VS|JJTtPNx%7c?D)P z7$s}CEG1u-3CoAs^O-p*NXZ_re44{NXMf%lBc?aI)=sHp zjfpq+zgzvW_J{a|Baf2QqxBhQwQ>0|#D3S}UE!8wxOh?(iv{}x!S|N#%+h=d#Wzp$P!Q(Y)9I delta 859 zcmZpY?~$Hh!NlFP(JF*#@)M>KGXtX#12Zclb1NeYZ39Cq0|O<6irfM#-~5!!v`Ux6 zl2ltIBLgD?T|+}%B&C!4m@QNiEsf1nP0~zt%}i2FbyE{f%yknD(o%Iz4NNUflPppU z(^3*Azhc%>F|@QaH8V|0)-^IWGt)ImGcnV(NJ{~lnUrW?VPI}2a%;u6=g607oz)I97C ze8Xz9c>}u&qbo74B+9tS8`#ArXLEY!66?UA)HJJ<$(}5h?8PM@cK&2X7Kh1sT%Mc# zxz(8JJzsEhFfcG~@N{tu@#s7{)!u_CQ0Dl4xwPZjr;d0k$vBBDIw&*8OGAdAYvQ&r z^W4038^gX&o1{>{bx^T=S;h`mLB&!Fl~)-X9vAJ%o-kki`xJGjAF+Mq@6Uh#TvuNq zcY9mz?PG^jbk9|3ykEl|`gPm1h)2mwU&rUmE7sL&h1P47Sj+Xlh&jJSWCySE#3QFq z&NJ5cOj{OPdTiR&>rq?@5^ZUFm{vu-&#W^PV0So{^1`gByXUTwz-5#2vs@Q)_Jx1Z z;WuJZc$`t9F7kigT@Mw(6Dv40r%zM0Z{h#htdeQEC3fC@3xSR)n}2dX|KxUfg7Ari z2llpBv-zCdzFaM>w_Op>*ps_;>Wt(ZiMs_m`AnqdrZ0Z}M!uBMS7q|w3U5XgPRS6) z`RC7UIoMpWw@B>|vjLmJvp?xPxlfMk8+pw&(+rA{zT_*xe60B0=ZAd4K?ZBhbhxF` zR!H(S6tOwDN+tBPMkM`H66wr7ob>UJ#g3fYU6Xd*S;M$VXLZr6`~DsYN`WrkOPBwi z#`&bkynp_F;aeAUnHGLLSobGMnQ_hU>o-oB^1C_YIZwJB!J)t;lsW6+9fto)Tlcrs XmnqtOKDWw?0R%i<{an^LB{Ts5zO_5> diff --git a/src/main/resources/assets/actuallyadditions/textures/item/food_fish_n_chips.png b/src/main/resources/assets/actuallyadditions/textures/item/food_fish_n_chips.png index fd83fcf002d6c662faf374de9f5372cfff45c382..06e81604559bb340269ddf3a28aadb2fbbfe0ead 100644 GIT binary patch delta 1296 zcmew-b3lHA1rx9NMyn7ej-0$=tCGyLw8@E#Vxl01zM-ChzLG*kE=VS|A`>jb0%o)_ z)p8jdgcurF8Jb#|PUc}&MCO_^TdJg*87Czhm>KCB7^fuaCYzch>slHnnd_#Qn;Mv> zrY0Mjr>0Dv!mOoikZ5jdW@(Y6Yi4N#B$7;wbuG*i&2`NTjSLgb6U{A>Qzt)UPO4V` zImybuC^I#$B(WqjKhIXlPzfR!5tLe-pHm7EG&eE;0)0ae36+l|Adip^&C4vYRWedi z0Qu6&IX@@AD7YXoIn`Fl(#+J<*c2)ekXezM6XBAXo0?Y)afunSOeBiTW+#?=jINf+ zX=aJWW`??HhL&c!sm3NLx)v#>$+{NFK$j*a8KzknSSTqJm$;UdSe0j_0)1y>U}T_c zXsC+_XUoZVS!^b|afnTR#VR`a4BJmvVnUf%Q{!}rbz@L!npMi=xy*{n1{P)p=0@hm zx`~NKX1XRuCg!@9#ujP121yo{rlv_|=0--7**Pbx5TVX!@;*)t6+;7KOQU398n8?< zwA4+p1R7{zXbB3n~f{llSdGqvXX7c-XgMw@4r%rosDIw8gedSxh+JuCP^B)Xf`13F~D=`1J znx@LbbM0+oyYcs=S;zGc#H(o>I*^d~@W~|6!zVm0FpAgf$@E9u`27F>VRrR1vz940 zeflmxvvlc49v=I;8vmbK2M>Jsc=-6b@A(41d}gn?$ND8+K|o z10Kw5Y}2$Kc}qyP*1Njob=W5*7#JD-e^Sc-(0HZBPgb?l5)yL0yO$R&V@MRVI`Gt> zq`{c$g0qXaxBi)b(uWS|>+j2`xtg3%vHjiE`LF$Wcnm5fZtTy$-m|o3M{S=m%LPUq zmvynbx4cpiKa_4GWMjSqn3wm|e0+3QSnQIn+AT(dhCHCTqM|Jf{s%Q2*saUglxNTV z@PGf}$g|4(Lu1rvAEMyn8}$xoO{ObrY}jEt-d%&m+pwG9ld3=EVMDsl^~eDhN>(<)sO zOHyr>j0}tnbPWx45lScbGFz%7CZ!phCt9ZHnkQSN=%$&Q80cD<8=C1_CK)Ct8JHSa z8dxSye#NY%Y?)+co|cwosGE|UmZocNW|E?tXpo$yn{1eDVqt7#VxDL|*_oy$wtZMsVN4D=1L01C9Y*9R^=I~dDxt1 zIr$B%&E^g4DvYkgIFcyiCU0ODo1D$*p-Zd-gHqG1QYL${Sh5$FfY|wy9a$VE=W%&% z_UBe(s-KagEyuvXw8+!NF~p}c#Su5 z-(>F;y2SO?DPf@!tI#6Vv>8rXf*Aoxbsw4*szth`8Y$;2(CZCcoO5c9+|0D%FW;74 zSAJel)V<*TboP6PfB*Ua|9R~L0WZy^BL90$@5P-sXIWA2A?&2N`pq4wtTlb|%S&$D zC_Za{{IiFgbV5_$tqm7Sy&A5jDu)$#Gas0A>3YmkR=aTinoIt{zw+K}RDRL0XJIIB z$(&WDLQ1&;GBQiT))@p9E!+J7Tj$T;U$5Z6tD+(?>0G+Np>v}3MT_}8yDpmE zVfo?Et!6CGA(Ls#(IXE6-+r>CF4(W)|WdNP+VH{-hg-HT35 z5eZq5+@5r%t8CEmhJtjou-pgQp^yty^AYG?T z7aq@+-e$^lP0IVo?HEUoo;ikwo2(V)b@(m!_m2@^nQNB*Wsh9J7N4E&ybQn3Rs37C z{M|#gpHDUk3mjH6GD^y-d#J4P*kn#*DwA5S+41S3v!AToaGXsdNzt&#f1}iDyT%#n zcb(UsT)JKJZnlSAb&{XQnGYtGhhNt>%G~49Kdkm3_wBo^o8dv8FYn(=zxrDJ$Mru< X;^hm1xw&iX7=Xaj)z4*}Q$iB}{j0X) diff --git a/src/main/resources/assets/actuallyadditions/textures/item/food_french_fries.png b/src/main/resources/assets/actuallyadditions/textures/item/food_french_fries.png index ddda218e950af56ae9a1442133d8e79159bef637..03ddcc822ec3acde3b4d2fa55c6108389b54d047 100644 GIT binary patch delta 1271 zcmbOtJ6(Q)1rx9NMyn7ej-0$=tCGyLw8@E#Vxl01zM-ChzLG*kE=VS|A`>jb0%o)_ z)p8pfgcurF8Jbxc8BgYARzTrfFk7gk8m1aqTBMok8XKD!>spwZr0QCxnI!5Om{}SD zk#Ta0p~d7W%v!o>mZpZrre+4ZW+usox)!D;X+VXBK-GpuX(q-gMuw(l#vo@D`1)G; zPZs2Kn5@krQLg}UqLqJ9W@=tZVo7Fxo~@Fh5=1Z}D7830rxYS+Ze#!i`i3A9Dj!Ke z9w8l?msw(~WTd13^0k$7eolT-a6w{ns;!cxnW?F4UN+*Qgl;O%`A0I%t4`JlANY%k!Wa{n386hYL=9$q)=SqT2^9J zo{ZcJ>n0`|ndzDsnV9QZ8e6348YEd*nwln=nHw2RX6Kx&LWDY_$@@4pR16J_ zEsc_a>Bln3&{8+W5@?`>p{1d2nqhKkspKGJ1 z%g?!W_y9xkiEX*J`(^Ibw`>qN);_bD+u)H`i-Gv!=!VlyGY(r=h?J>3O`3IF|3JK& z#-RfVi4UJl5}O?%>jyJUq9z<)&xM>f7+*)zQsnMi4l-<>aea2mWQ1%U}1E=4vD+0D%K1e~-Y9g8GLQM-I*V|Ns8J z%Ecdp`WhQ&x8H7iF3x=TIKM!5f?c5YrF9$DCnP+uJP>?zZd>L<@pk>(_;f>qIqR&| zwk&LEJa|{RAiR|E&~t-^iEKPPI^jpA8yInQcia)EKXM=;CFS4A*K&u_g91Ns`%E)5 zu$fin|I~-^kWxv*>BJWd=~52${DQi=dkuc)b8zq9^JCG+(Ei4UcXx%?ud_BZIPfGf z;s3r^<7uBBezQC$;K05?U}xFeORJh=IOc!!_;BaJz9R=dd^*})?mr<&Xrq|$TLuY- z?HsZXy11Mg5=0g>&$Yg`d#m4%|MxGR)K&f^eCW7=!=d#Wzp$PyYcGvs> delta 1125 zcmbO(KSg$e1rvAEMyn8}$xoO{%nS@ejEt-d46TgJwSlC8fs#T+Zh@6=eoAIqrAuN- zs;!cdfsui(p`k94(#d_y7Ah&miN9$9ng}g9L@_Wh?eKJQ4DskZIyKQFI8dVPzH;%D-Onz$dM|gfkmPb+az$ywu}uaYO%paP zc*sAw&T~ailVFlj&H~P<9!Gvn?3ke0x=t`EzP*QNw|J!BM?W=^^ka$VQ-!@}Y>d$0MweDdeA!!gc6 zXKAU5pyKPE980ry-rBNSe8#M*;%|+um+m~v>0QL$5qiWcX>!ApN+IEm4EGjFZeA$p zac;Urc&WpJ&bRg4JdA!<6=pB(GglI9#m6(^(jRnH zMNA_a-~U~C_6QHl*MnABEPrDERo)j-F!j#WV7hbly-D%qh9yB#)6OtGbXbz5E6-rC zDXzam_u+=8^QH-S1;_e`Gq_YQ5@ZN?x?cTd8Lf)%Apr6tTQFR@ECBp>&`z5eRwla`OBZCLTb z;r&rICnFKA>v{YEF)_PhUOtgUA%rI13WUcVV!?AJODw{Lh zZF>~Yc8PI((O-A&CBwUU$t6ebeJyCOD7whU@zBc1+WPKyqgMZ88j{mdRc6geKK-9bakl6`=If1T r=WToVZ?W#%DS2OQ%k!#O{?D4fJZ$6J`mZ~R8Gyjk)z4*}Q$iB}+rh;L diff --git a/src/main/resources/assets/actuallyadditions/textures/item/food_french_fry.png b/src/main/resources/assets/actuallyadditions/textures/item/food_french_fry.png index d92da14f9d05b2d9eac0aa4279151adf0fbdfb15..fd613db162de477acb98cffd6baa66dc65ff5b10 100644 GIT binary patch delta 1473 zcma))c~BE~6vuNQhZGSH&}cPA(lN@yp2==10vZskP!*J5McGX@8V!k>aJAryBH~dC z4W~qDaWeLZ6e7Xq<-b$oT-;Y85rYa9jsmCxh5(R2aR3KN6o4Q?f?+U)Ng$OmpSy5APNEQmAUL2P zlnQ`Qp)f!x6fl6|Bt+vBN@KLKhf6X1aZ%FGcdBWvfi$Rf+CTv$c-@q*q4hdV((9%K z1|1OqjlXYr+kXmF25HI` z+HoBW!l1)0;BBXGIW0DZxq2Jz6Qorgm|#N`j&x)JzLjcaI?RB1fM6$o%KD1jvi zK$5T+Kw(q@5D2aUKnf=?j1o&=*y!SB^abBP2OH13E%1dvgn$(&0uU5L07}BK5Qhi| zP(ccsMj%j(V-m-p=ya)@ki(251lUc4VIcJzZPd{9Coke4oyJIT1O2&3?u_+Wc)n7;U@q3s{Q$ zY0!J1*Zb_xoBlnUJ?(kdY+G8{!;!J>hhwIqRVzg1A)QzCtv&nBo@BW72Qu?wOS`*7 zzdG5bvMQI3x))bkg@>Q% zmYa8ni_T=Ha4g;ZrWKFlovDfk%D)+bZ-PrPYw89|nV)^wEo;t!#j}bg6c5I?MELg< zS?c3E+Aek-@3s6@#I!f*nL&>GjLUN_?HII9p4Zu#qBxfn+z52U^E~PrZ|^N!SeL$O zpf_@pJ0EVbUyH6g(q6Hv=F3FW_6@@qE~H}vKU71$w)RXXQ)Wr;g!*q4ek{5@=*(*h17jJm8 znP4;{qikf!cMHF%+F#775e)yd&SSByziMXfWL3z}82fzelPa~)XCkgUSsJ8z5y##k zuOn--Ps>(YEbAgzr8~O8d-sEr`gwyI&b&o?=kK4`zlK+mX0S9I=6bOzWoK$@Z>H;| zw&=vf(b{s2e;Jcz%RZ7>Gq&yRPJ`WpO*CWV2rhVwpx8|QdUjqW%I|Z2I0#edtJDU@)%Vp_H6%++6XC0zeBL=?pADr(uea#`Q+9^15$0p?8=&x6{C z;J(zgm!8S?f7q348tnS_nYu delta 768 zcmaE_uvKb;1rvAEMyn8}$xoO{%nXb|3=OSJjIE3fv<(cc3=EVMDsl^~eDhN>(<)sO zOHyr>j0}tnbPWx4k(5sEW42H+OHMIOOaV%y8Csa@8YG*T>RO~G8R?p*TBI46CYc$V z86-`9#jK@lU~HIZk(6qno1AE3q??jxVy2sDnQWq)lwy>Ynw*+ynv^)%oF!><5bIq= z7jr`c%QOSCL|r3`RC8U6G?O%4O9L}Y-BiOA3kwTVOVcFdL?wmd64$a4tMZK0JZ$cp z{F>Ev^9FVmMi*k-NQ`NdH?WIM&gS&cCDwUCscBXzlRa51*^5g+?EJ}&EDn?NxI8!e zbE`4cH*9a4&cMJJ>FMGa;?bG>=RX)ovhf&PJoUgheOs1>oa!4>9`*w!LfH&@e}nig z`DE#HShsLacQa(ZXmqgp$ZwWqer=8q`=45}wWYJq`?p*5;DLmsN41alnJOzgvL6sR zWD<9y%<|n-S!U*qc8!hkZ1Jn}I0S-PSrR%0>c#gKKAv;`692#d^*??;i8<{0|Nnfu zy{@qjPyGLHP$}{M=S%HV6DJ!y<-F*kekh)G|CE2%4GnCnzdbsYFX{7BpZnhVo%h1OgXI1!ynNn{qS7dY_qd}l|KtycHE((CgS9h ze)#sy_V3af3Y(ODWTsa|l+~Q7jk}!7oA;GPwjs|zu{)8k#ZqE=mBd+(x3>gryEt5V eugW@TF)%Q1`#&u!bc!qk5O})!xvXjb0%o)_ z)p8jdgcurF8CqBwP3B=%MCO_^TdE`)nI{?;85rp%nxX2=om>Bvd|< zfILDvG%vHnR>??70pw>Z=lq=fqTqtW&&k$xJsb&BRbQ(Ja|WH_gz%*f7<=$lTI2RY{?^#I>x% zsyrhV=sRFg8t57t>LNnjZ1PIqLp?_O4N1NM1M{a zWj;LFSX}Il{n-N_p4FetULEek!?R57U+B-dJUq+K=j66#|G${s^2~u&S>al1R!ND9pB34a zvm_*@Oi5vNStAh0)NM55sF;|XlU=-|#J4w*tG8H9ZB*1-S9kQ>QIEhz?T-(=N?rsq zPHuNSc&L^4VV+^fii1awcQAcf;LcxM^hKey{l@h5YWEjQNHlGlbY@erq=enwUppR6 zl{<7?Pw(J&r*!2-TGq?mzpl`lC(!VdWjg=GqltFStpZh#W*hDNG3~1EotuK`|5_qB s78iCdX4mZTKan(NXT!aO1FxAFzI~qTJ}q~v3Ih;$y85}Sb4q9e0OA(BtN;K2 delta 1150 zcmaDVw@!9~1rvAEMyn8}$xoO{Obv`e3=OS}&8(<)sO zOHyr>j0}tnbPWx45lScbGFz&o8d?~qT9{hurX?Af>sp$a80cD<7$)l)S*E0!8krj= z8Yi1ie#NY%VriO`oR*wwsB2+toUChVW@4#pVPI*Yn`U8XZfb0hnw*xBGTDM9adQys zT}D@vG&7)vR7>4N3nL5Nlq8c>-6RX6R9)jlqm*PzpyK3YOC^Qk64$a4tMZK0JZ$bW zoBW2=X7dJi6-HNLTuGF1lQ*!7P0r@@&?VM^L8)n0DU&@}EZK`oK5Ar^b23k^5nOb7(WMgA z8OIDhw*AQVi16%)m}0N;M=-H1O=-yj!=o-I?Oa_-H1*ammNw&^v~tE7?^$!|ZhVZ6 z&R*nle*R(0=YQ`#ue|rYM&Fr3vE{-3gAe0{YyMo2tAAKOGq-!Um_f~=jla)CJH5#A z)Zv-x@|1;fy|tE>)8RF(2H&C*&NoJ{UY~xeIKj4Z>EQ~V7x^zzP9JZ0u-Wm|;pvR~ z4%n+`GDoa3QyX$$5YZ@w@DnkC}&vuA^F$uKYQlvF8@+kRQ{edt>kg+ zQ_TYzhgqz@GI^W`{axQ{V#w3*Y^{w#%lca)O^h81rl*tpe?*_0b9jkZ#N4@(d8?m1 z`f>T6qGyrA3+2vJFIm-0=Ua2}GBo5o*gokvBSZXy{2!Aqt~FnJ31an5bV2fc|J2}QgSK{MB_Z)a*|UbDjIRH&L$<-L$UGnAM8u7CWHtGTKr zyHRz`JqA&w?9j^6Gy@*n^~v6!RQx$6&hNUmM4gFy;^nJvgBw1+n{#glTgTT;PrvXS zh{u)$U4sZeyu>iON$`@hG1cIB?P^Q_x;)z0ItoG-mNd-*>9 z+InaImIGpcylOwSrUmY`oqKAPn?ht^{pW)fVuxG4sJiX5I%N>jk?&hj-X&+hQ8wY+cQALv?%zgxhxMKyNWbl3074STKT z`OV<>;9{D3&*;ErONG!#{)+gi*HZ2>RLMkhzq4R$k7BWLw0W?UbIS2Jrm#EHVyAbl z{ak!|4)e4Hs$l;rxHLH|-G0+nmG88TWbs?ghBIf2y=<;rTED{n(9?zYZ_aJmcHzs4 zH66KE8|kX)@hwiJO)uBt9wLMz2;V+Qvv@rAZc6JIT3Tc4V&*MpA4oI8PNA$}A{p zEaZ$zX&fh*((t}>8;BD{ZVLz2c?CIP3M5wsxUhxwhEU2_Yh!<7LvM!5-TUEAeC2i0 zTGX2drK@UFm*Z-X;&eXT*>aQd=;eGU2x?v*xBn^M{SW_#pH*c&NJ*NssrAG0XngQ= z-&i+D70)u7oq{Lj)Qxr?m3yw5%$@MFWcM7IJ&1oS4T;B!>xtv3naNjMQnv0YS)6R2zimp zJ%CT*<|K}8E}ol%!)<@~{rU3wN?&)LMKoBxs7VywqnZPmfK<3tjPC$T(UcDKtaI2rwnXz=h7zc|E+V z)%~TL{tx`@A2h2ZZ*v`#opNE7Y=`Uh(-zVVICfrDVHC?`UjN>+a2y|n>BguzAM8f) Mjb0%o)_ z)p8pfgcurF85vj^7*FP9RzTrfFk7ft8d(@xq@|hbnwcgg>L!|*80%UlCK~A`8>bmq znkHFVBpIeop2Do9YhjjZY+!C;q?=}Jkg98$W|E|vXk-dx8Cn`9TbL!8C!3{!oKfKG zYvn&#kketZHj6~P0?3J0{zaLoc_oP@nfZCPN`^`h!HA&L;{2Rah@iQV0TAdLf=H-* zBmsGZbZA~?iLH{6k^;!rR?hi3`9;A6iOH$9N|t7(rpBgFiGa+C)SL*H%-qzxVu(x3 zkYyrKWHvjo++%b#PP8;hN-<2)O*Kxk&`mP{g^sa>xvr6sNuoh&aXAwr$eFZn`?bHJ-ld_wba$J&^7>PcKhC}VB_#H3`>QP1o2%BH2v-ocn)W7jTTtNt zw>~AjJWSPE-(I`FZtSVw9v7_j$^M!B-Pzh~d}`8Rd1lO2AKx5z5%Rbj7vZVTcvtcJ zp4Ewy6~sRLxanQ3Z3OrczvVP~PRY?lmDM>r$Zw$=;|8#~=*PphASmAB| z&hb6Cd*a3O2PPLTetWd@x_XPj#66nAn-ta+KlwAW+j#mRL&N(iPGbP0l+XkK DVr(<)sO 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 Y;}3j)`-S8ACAP9>to)-}K7H>$0r;Q*(f|Me literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/green_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/green_crystal_shard.png index 8c6a496b5103886f9a349fbee3804ea6916b99a4..c88d28841faebd1bcfbf6c92e662e5b0d6f35992 100644 GIT binary patch literal 3742 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 U9e?R~c7GimK2ZABo=@KQPa;A3z5oCK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/jam_ch_ap_ci.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_ch_ap_ci.png index 5cca1441d3c1a8aed5d7a08db34f402342f36fdf..33c8a5bfa5cbed7941ba9ec6889faff0b74fba8e 100644 GIT binary patch delta 1969 zcma)-dr(zH9LF!uAOt}HA2o_s%Q6=B>^Xa01BwWW$xFq&mI8ZTaux0+?gcS(E>pv# zmZNe}Dn-Y}EOkQhfufSwfK~(o225i*O5<~^z!wUR(?Mvopo#Ox&d%>U``PdBx4++< zmcYvK8%KNldm0ReBzdB7(}Yp3zFfJO;_8)Yv59uGra6gAa8U0ioC<^C#*qB1UPa9} zKULhHZVFvj`BDH0DHIlITBIqbuiLnPMR+%U5={h(lUW+bSd{@m3;{$!6p(1bB1I-h zrm(ZvZOSC1B8+4#0Spxgh{iC0M;ZZ$L7dF6Na9(>+3rRhA->q#Uzqu@k%5YKb&b z#=f9wo@%pZ=Jo|S1obbR>RtQwMgOBelNVUb_DCZ#hV&*Y&ah@$bLM9gS&cLbEXFkM z7n05SYNjd1oTXZ9eNNctl|}zh4n?~MxWsZ8N(ez7aD>4?q8JrOilPFQRt1O!npI`m z7-F->=Gny+8LFNgf(QbN0+339tjGu=Lpvj1nCHCZ5#((1oDeI^j3CKS0vye<`oeHP z(l`cCh+$P4L84Le;Kb*jPbVI_<>BWNJCqk23T|uY5Pi*4HBoVvx=ok}c@}brqX8j^ z1q{+N5olfmP~ruQC6+_TDS9P3vNNo9t1ZKtEyh^oT)p`A=@wbF*{wOYsUZXqA%y`=I08A15gZIuhYTY;WHDiZq)HUvBt`(e zwFF3G2}@{3P$hn-ESb_rQBo-fU=*E0Q7WtFt0ACZh!ura6~ajaVfk6vVTxXQs4%Qd za}Xd}#z4wrYXHQpkihakO(6Io+vzkG(-ZHiGpPM zzb_}OMkCB2z#S_78Dp?Rdge*@!_mB zIn5hyw2Yse@Mc8o$Eh9xN1q%st(m#8ref_kvwwLtVNTk5|K`pPbn!vfQSkD;6Y<)$ zRXwY%d2F43K){t#r(2G%H(d!zz4BK4m+hVT+Z>@6dJ-chd$d|yeS9{>@t>GNf4^NU z6r8(o-WKh0gK=a}3-0OIULL$6(DU6Q`x1A z#-@VUlen#|?P|p|6C0C%FS%nlyXW{Tp@9#&_AMwlo7CW5Rn_{&d)=9NdAAO3UKO~Z zeXgOxQGewAk=%mH3wv)(bxnQ*x|_b{!?!fHcP-!9*~nL)O)7M~p0EX$c6Y1yfpoie z^Ua(447Eie4^JA!t6wFqi}UpQx#V5?j<)g^9LxbTP9&nz36jF)uvxL6jCavw8^ z;Ttn*ylZxN;TN5LJ6V^8yV{+P?oYo~zc_4b7I5VFfB)UOFP43{bd0U;gP7vs_I2qU z4Ud(J4ZF^F{ZUqC5^j3A<&N~9v&J;VVj2CXpEaElMfQEasJ7T~-&S;HEk8fv(uJ4C z9?$nq&)?PaXruKQx={6!C#rHzF+_V delta 770 zcmdlfe^q3H1Sba@0|SHn=l_Wl6~&o2+BaH-Fin2KRAgbGYit-|WMpMvXk}`y4I~W= zloTp*3#@$eQ!>*kT@p)DZIz4+j0|)QQIt;ZW42H+PcuxmFfmKiwKOtI(M>crF$NMT zNxCKmi55x5Nk#@KW@eLLF>9%qr6yaZnOdaiS{f%B=_Z+(Sm**3nChCD86+o}CIJme zO_^-LlDIjDRe(_?IVH`~D9Iv8*CNHjQr9fm1gI}LEm_yd($XL;DaFXxz}RH+X;w)N zn7b#xVYS)3fn9}>I2WO7oxFivY;rcIrw$SJDk&6~1f`}~rA+o@v1Es^^Cvs9I56r@ zHsy7w@8zlc!@$5;;_2cTV$r)a*wFj1gG6n(m$k_?y@PzE9D>0u|5#qW;Qy$;!>X(M zA7}ahMsHO{@xm8LqC$?=Ep1*~#V=g@V!5Q;*IB!ZzwdY4yL-RmCRsZQ{dZJ6E_vMW zu|?X0$}^wdY+mE=M0k#zT)`JRx3#+(LyZ{<%PN`I)+^7H{SrGp$ZOJ)DMg*>3rw|- zdaanS{(1E@o)GaBXHR*Q#!S{SmGBehTh2Kpd!2O6^`kY{)WXj{Jf!fVOrpg4)`IU7 zXRRzuN$B*}6fCh;=~QBv@s(}ShVzaE+H1n383I;@2vo>1JgAvdS9tVjn$zZc5r5ny zf3h@ay!rp?gT}`C#9ND2w507_C?0mu%5Spm+!*Ifp38p1d+N^qD0}}eBVooi1_sHW zJ%{YncK5asIcEohQnJvey}{1UY|3u3nSB49-+bRU z|DFA5`0bdDuMLhg=ybX)Db}*d934EA`G(I4Hs;%%yvwGlJ|Sr2h`=C$m;e(jrjmky zqLkR4DN&v*=5EM^ho*;Zf^`rk4VfE}7iR5TXz!QX|Yg3=fYiU>g#FaoBu3b6u2Syq5TDjcLZ zl2#M zB3b2AgvEWMd|Q$rJ4A(-9gRV*y|Y2|yt%0~Qh#AO%K%jEXrAhRT3p0;`!opn<4} z1YktWfj}<-QfYw}NX#iBJ5ZKHAVv}u!UM3ZaR@@8wR%+qWC~KUOe(U#i2Y$D1%(r2 zt@TjGv_vvcGpa-Zt-`>ez|ufvR7H>o?dw-xk;>n*S((-Rt$72=w!qmSXg=3m&jLt7 z#8HwUBZ>U)#RXa=5yc=tBZktl*76q_gn_7Pagh*3#J*yKd=bX@mrd~84!zz=c;Tde zCiJZ_T0KiU>3up~@CVaUlXIr7mwNoquh$J>ux;xzzyJ2u+S~?r^2M$@qqw4*#@6q* z-8=eY+ad3!na0E4j*Y9Y*IsYC@nu$3BZS7z`*-i&gD|qCqkX}N?kn%5r%!U1vAT&* z{r;=<=A1a5tE%lm&M z>}YIiD(txS!`R)eVPXEgZvOZ$XPY|f{>)kTtJ7eZYDwK69Zh10^YU2t^{e#>xt_@1 zPmb!m+x%czd4y0M)iA9mtE}1_zk(E|ly_&8HHVBpy=DJZ>;7^sg=NJ&Xw>usy6I(#|4IHSBNUK|$rmGeLf8y3B)CVJl9?Ze}nnwlP2 zr#sFsDocdA3u|*5j=PJy!Yz{<+z&k0&-mhw0@H|H^IMx^$5$UXb?#iL-JD@QW)Qu* z#Tj3ph%NQ_-P7-%d}>T;9lcJ!ardfRYj(@el|@z8GAc^OHEJEPFYjJi<=8gT-@UI| zT~;1hKIP>3H{bR2Jn8Z`c2+(eh8N$+9C987YXrMOAQ*|&@-&`9}yZzx2^J$?bX5px?UGpoV zf^X$r_~Pt_MGcSqxpUGpGIA=s$qQHSTs^p^y_6lEeeFhE?V=OzHE&niiR3{Shv;-{ X+@W_&J_FMJ=DKNVnW+a;@=E^#Um4E< delta 770 zcmaDYe^q3H1Sba@0|SHn=l_Wl6~&o2+BaH-Fin2KRAgbGYit-|WMpMvXk}`y4I~W= zloTp*3#@$eQ!>*kT@p)DZIz4+j0|)QQIt;ZW42H+PcuxmFfmKiwKOtI(M>crF$NMT zNxCKmi55x5Nk#@KW@eLLF>5KCr6yaZnOdaiS{f%B=_Z+(Sm**3nChCD86+o}CIJme zoovpMv^j`XfKeqmCC$<($s$SDBE`Z|*DTots4Y1yS=Y$Y(jYA<#mLye*ktl)R!I(+ zvnRh{wb{IZU4@Z22cc`7yn$V8ayF-jE-@A>DHN9krKVY>O!j24WQVZxCp)q@FzQb> z<#nj<<*EC_z`$7I>Eak-(YrL*(EG51L~Xd2waGQTgM6hNg265SSYE#1|ERvhs;m1S zXZim|Z&gO|!WT)RLXOrgZC+c&FI@X#xuo3JS-XqB?|0n0d%xo*Svv~-cT_wsdED@^ zMcRYPGoRjUUgPjYc#fQ0!52HXwYwTajTs8dDw)^TE6dG$1&5b+gfPkEHaOx7}$@Dt`+&N(G}opjChqczvm!p}cEr0}9lqQv^vg6|V& ztt?DQ==9bUEU{MURAQL%m2J_6^Nt1DYr>=%0#=3yRLC(rsF_n&c=TwR)8=~-f7~R0 zvNUMC`Ty#J#>V=@TZ>k-r0rcO9(K^mZ?f&&80So$%YMRp>dyWsd;c#ZVa7HF2Fag2 zhwRjL|1LPyTG_;+!KlRbJ6qo^&vy@xlGW{KE5=1EI<~uzopr0BL0!ga7~l diff --git a/src/main/resources/assets/actuallyadditions/textures/item/jam_gra_ki_ba.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_gra_ki_ba.png index 5cca1441d3c1a8aed5d7a08db34f402342f36fdf..c98ef8c9456008b88a340078ec59218166d1bfe1 100644 GIT binary patch delta 1979 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 delta 771 zcmX>ue^q3H1Sba@0|SHn=l_Wl6~&o2+BaH-Fin2KRAgbGYit-|WMpMvXk}`y4I~W= zloTp*3#@$eQ!>*kT@p)DZIz4+j0|)QQIt;ZW42H+PcuxmFfmKiwKOtI(M>crF$NMT zNxCKmi55x5Nk#@KW@eLLF>9%qr6yaZnOdaiS{f%B=_Z+(Sm**3nChCD86+o}CIJme zO_^-LlDIjDRe(_?IVH`~D9Iv8*CNHjQr9fm1gI}LEm_yd($XL;DaFXxz}RH+X;w)N zn7b#xVYS)3fn9}>I2WO7oxFivY;rcIhb}P|D=8G01f`}~rA+o@v1Es^^Cvs9I56r@ zHsy7w@8zlc!@$5;;_2cTV$r)a*wFj1gG6n(m$k_?y@PzE9D>0u|5#qW;Qy$;!>X(M zA7}ahMsHO{@xm8LqC$?=Ep1*~#V=g@V!5Q;*IB!ZzwdY4yL-RmCRsZQ{dZJ6E_vMW zu|?X0$}^wdY+mE=M0k#zT)`JRx3#+(LyZ{<%PN`I)+^7H{SrGp$ZOJ)DMg*>3rw|- zdaanS{(1E@o)GaBXHR*Q#!S{SmGBehTh2Kpd!2O6^`kY{)WXj{Jf!fVOrpg4)`IU7 zXRRzuN$B*}6fCh;=~QBv@s(}ShVzaE+H1n383I;@2vo>1JgAvdS9tVjn$zZc5r5ny zf3h@ay!rp?gT}`C#9ND2w507_C?0mu%5Spm+!*Ifp38p1d+N^qD0}}eBVooi1_sHW zJ%{YncK5asIcEohQnJvey}{x`Ux+^qV(8T@Y&Y9nL&gXo8k8^L^ zxP~bkf_%rkLJ&ln6l$oR`l`;K+i%R&>CG0K(QZ;z7xtJi-o1zQ5 zQd}E7XN6K2Vv*zklz15^3QYk4^9U%Ej5u0SRR)r-o1WMa;x=YXD=;Y*JGPswmS_WM z=nrP4D>kdSus_Hls6COS`#qp9`5*m-{HDcZk2WAfh&xx~8&>8HQp8 zgoUPJ#hjI3%2O=1ekbh9%94L5jqzRq9*G^0*Rw# zAn-B*tjLQLt4cH{Y6TjK_;U9&V&gsUQ67oIY1nXZbzr#0(iPPxyS92x4TU@lImA%_ zW5fa)(HsycUIkF(1%?q>4k4FOpX$iZvD&S+9BaNY!73GM)wjo4B*kX87T97!q6%cy z7?0l@SeZ>RShk9aQMO7Z+4y4XFb+dek#3lV=%)^_9D`vbqy!|nhgKv7APbsvo)k!+ zl9HlOBxHGp8yYs4#V{(P(liD%gd|{))=(aj44^QFA*a%UgNDkmVVH+3gIORdA_+K= z7J$2!0I4iyF+~fC$PbsL-B(T$719A{S>uqT!fN@d2*?a%WSLTA%!z|x#d-M=vQ~O1 z)2u{s5FkoofR-T*cwYN5sGO=`iIfpihp_VZZeHdoiqvKU$|m3Z+gnlNMO3Yv6WVoz`O&xLc>z#9jfr?1;FlaP8#KFqpZ+TI*N`1z0W*Oeaa?5xNMN=f;u z^JL?tixqbomg!=R)Td?JaB>@+?PG3#uyapteQZ;8HC2E&@DKVSSF;{afK3eyO|nu0)&D*LPPkRizWVzIXgmYT49sJ$v)v*SlI;p7dP*W`fY; zOT^DR*HF29vzubvF+@di?M)QM%g{Ok^EYKDp96 zYwbnvb-^(ybH=otIPv&mPxzvxi`zDisB~@>w&lS`+wdnZD70#=ZnfvzSeL{`y&%ciKz)+#J~H|U&VQ`WdHyG delta 770 zcmZ24e^q3H1Sba@0|SHn=l_Wl6~&o2+BaH-Fin2KRAgbGYit-|WMpMvXk}`y4I~W= zloTp*3#@$eQ!>*kT@p)DZIz4+j0|)QQIt;ZW42H+PcuxmFfmKiwKOtI(M>crF$NMT zNxCKmi55x5Nk#@KW@eLLF>5QQCR?VNTBPV&8Ydd*CYhO7=mOi1>=Lr#wnyCTp2W_zCkZ=bVzgPP*p$(VA;&;pZP7Qg~4&QDS{-!S{)? zRu-ltbb4zFmRPHFDlyFX%C>03dB+0nHDS^W0V_iUD&!a*)Xb?XJbEsg zSsFCn{D1X9V`F{dtwk$Z()KPC4?Ae(H`#V>jB_T>Wk2CPb!UH+z5kbyFk>47gXGVi zLw0Jre;1r;t!!e^U{vDzovrVd=evhT$?A5r72_fn9ot<_O9R#~E!enyarSe)CAP0P zS6^-OV{rJfRZTrq*l#Dp;VmCOSf1`G$?dN?wB9r^@o4HV?R|`@!k!J1s23F1e<#m}5w& z=xmbaklJVt)|kpe$uYpZqoS%j?ri|X=1p3^NcB;e)K^u)6>UNWaI2+MRD;SlP9?s1{i}G^kI%dw<0^t zPZX~wi?yCB{UAVWCL}omas=h_)4uSp2%}{paGq8$f?)yA(+JQC!2(8-7yuQDU>J#( zAuG7v(?&-yn2bS|QUI<{JP;HD0tOc(zzB$taT(zXO}TDrd1sj08JAXKmW%AX-E1w2 z(?k7WFehEMSuLf5K^kG|V}S1Wke>TL`cv6dWVXlYkv`0wESG4tSW7aBc~OqjvlL0< zHXC7slw5Bmt9oOav5?A&_Vl z$cmH*phVydf(YV@GBWVl>Z!nn9&djS<7f&t8r%nf9;LB#S>YsCopwez#!wiIXk2X; zL;(U3G+=Q?0hqwBBq>ldLN3l{fwQ>4YPZ@7ti@cCRV-Bx-#({Elx=ovi7h@XwnS36 z1U`RgWiiL|l2wp7$ts#9?&+ta*bK!Q+%Od}NF8E1hr=L-vq&UxzzUEB6016AAPa#4 zMOnrnMlmEkGHf`DBo$I22p$j^1_6l(bqFv>0<|(c=AIxYfytwW@eD?hJOu<Jn9LPU##44r_GR1SnPrRJ+3Adwg;Nw_TWv@jgzC@hYV)T75F zf)a5W0|*yMpk_z_hG8h6(2C59P(nxLKt9Nixu*GFBQ?^<*5)5xH%l(LGhPTM7~amSkJ zKI5(_iy!Q4oVX|;J}T<#tk{XGmaH@fyk#I>Ty&@2Xc!miv0eCl^(LypIQJWek1H>~ zA$8x*ZuwE@fV2Defip4udf0xiyYoEr-PQ%A`!Yo5_fmR&=DTy7+xzbK>QWl~=cUzb z^!G74R-5a0rMdb- z<(9p&uz6t;{%5~up|`FoBqTAhqUk`?Ix(`mbQ)8zcV1%7th@c$(QUoGO?M8RJ@QdY ziz7A|TAZo1QtFuI#-;~NrOQf699sitcb{ACas9+V{mhHLnU$TVevQ8IVR68{@}`{K zjU9msz9W8rgl_u|Ckol%v8ONHS92xi@YDl`%TBI3>5-@zTT`tIJ?bpV@*-1fsP4Iz72yXhS5H+X}C$ zKj_4lVZo;lCHvMz?9Pk$vFheKSwR!7wOkIxdo2%dteKRN%%+(t%szQ{@%->Ir}O^h z!~RXyTNU|f+Arp3OkcX(`q|N!yYe5sk$vx{fit07#);L{+3nN(f6IN8u_~u*fO}rM zG5Y>6XCLd$*2X@wn%>vGOY&RiD_S(U?rfG@CkhHz=<-y@eMlQ!KYD z*6rD|!Mb=wyJxxam#DV-vz0ZC+sgAyyUv$QW#_+Ckky)UC9|#dxMAO+x>q~SS|_VN PZcVCjLDK$&WpDol;3&G^ delta 771 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 Kg&z$~&HoF%)7}99 delta 771 zcmZosxGFM1f|G-dfq_B(^Z&$&isDQh?HjE^m?l4ADzY%pH8u<}GO{u-v@$i<29gE_ zN(vRZ1y;WKDVb@NE{P?nwn|0@Mh3cuC`u>yFB z%-xgUu-a_iz^=kboQu%4PTs&SHaVNqLzftfl@y9gf>P70QYL${Sh7Rd`I8-492oT{ zoANr;_wv;JVPIe^@pN$vvFKeIZ0LR1L83O?%i83c-a)=n4#D7-e=ILw@PAa_Vb#_B zkF)%Lqqi!fc;SmAQ6Wd`mNu`g;uo%cv0PH_>#W_y-}gK2-M!y&ldK(u{yQojmppFx z*dpyg<(W@!Hm`AbB0NVy>B9eu{L1SZm;;lt1TGI9|6c0OSNN6G4Tv=!qb79HDNPD=yUFD=-(eR1}4y(PA< zI9Fe7^J8%Mu~khyRM>AP!{IF-KUkjbD#`7yI<($2G4W{XFYSGds=}XF8LJoTF9N1^ N22WQ%mvv4FO#o5^8iN1; diff --git a/src/main/resources/assets/actuallyadditions/textures/item/laser_wrench.png b/src/main/resources/assets/actuallyadditions/textures/item/laser_wrench.png index 91d17239f1fd01404fdec28198cc0382c3dbdd3a..1d5921326557c06bde730b180ed5f11f31927c76 100644 GIT binary patch delta 1593 zcma)5e@sQp9RVk5ivo^!`T;E_C# zD0(I_1x3xL{W5id{aW@zam%eA6qPp1Y({%?PA#oDb!lnoNVd8USmt8u-9PTW=lj|B z^Zk53-*eu+d-&eXEFo3dtCc4t*VZ>`p@3yYbZ2HpEbvKr(C78E)Ws0d5*R@eM}m%o zwh1yUm!O6e4J(mUm*H3YG;71Sd^HM7|29184U{-Xp16ux(g%I6DNf|F^Srul>t#7(nEn@eSuf< zjwY8b7LCE$rqQH=p#Axz*nbSK{2%-#Tu~ng6?pCLv8lB=!P?-;vIgB01zwdBB9k$o zG|(bymlg%;M1A9^68dkX@)o3TcH$|gUr^KJ7J)#9rU?ke92lG_KsB%~gw8BZRIjHo z8gP#1cV0usglAJ5qASaPuaI6ZHD*Hv*!>^pJk!}qURYdv1?z&E82On+8X zE_uB@=S;u5WL@2%^UcnjR|l~(R2A*+eKPCe316m%4}LZ6oa5v0l%9BY@5`4DC2VQ`zWAdh zk?2->;Wc;Kp}wKk)KA#i4X&aeLx0k3Aa}+OHATr;>z*r^bjR8^udk`5o6cTODx6rH zb?(aJqO5Dy?ylbXzeQI~3}1Zeuiy7X=M3TnGx4z(p7%}etV!>hyleUXWlvPBUVCFx zOW)l7<)>$49&jG`pz7VUtGl+RY)R_r%xS8MCOLl1Kk9n#7gu-r;q1(k+|6xyZwc)F zZ16<$%;cTJSJox%PT`&YvY|~sr%#xgQF`Q3Pxc?tgys(4)Q5_l1shkdcQ{fUj=BDY KMeodhbj{yu5E>Z( delta 793 zcmew(yHC#`7@Am_8d#ZFXd4(>85k%jROA*|`R1o&rd7Hm zmZaJ$85tNE=o%X8A}O8R$84cuZfTlqoRnswn__BUu4|EIlA>#22xO(18d+KzrkYwN zr5R3s#jK@bW@2e-l46{sYi@3ksGDeH0#t2iVWFF5Zfapb)7 zExtW}$-uyv@9E+g;?a3D#5(VggMh5MOrtf6rb|)t-3edHSlKt2voompu!=um@N8YZ zcEi*rtCvC(lGX=Dc&X^CKM+uy71FFaC)6O~k*UA+wRf}6OJ{dcGY~yVkwlwWIk=ikk6}X%~&6*j%rEuRpKmQ}c=AT9NK`p#zD0#S#r2t~yD+ z!Mz#waWmON6cW!_K9@OQz7(c<`V z?9@jqkejYt`S)#Rz2@| zW!%?8M_7ed`KUe;j$V7<9P@8`j;2d{L)8oP{xEHkD1Wu~Az$%t1|aZs^>bP0l+XkK D_emuo diff --git a/src/main/resources/assets/actuallyadditions/textures/item/lens_of_conversion.png b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_conversion.png new file mode 100644 index 0000000000000000000000000000000000000000..592f6b5e7bd093eeb79edc8e3e01dddda425c545 GIT binary patch literal 4005 zcmcIn4{#LK89!kZ1Y`LxZv5+)66>UkftZhleY+Ge&7CV0)Qo}Lb|8C;!S`@~m=GdH(Sp1zimE!7K@dR>DjW|1LOPUnNnmmxmU>HC zwq6rnl=DUJLTqCymC!k^rKKgPOO-X#h;n-y*4m4-CJ0wUJhv%nlCoy%v1l+bFI7V>r)CVx zsd;{JqR~ycUZXog67thmq$1_mBRKSDt}rEOX9QD!CU2V17bXc#xygv@MhCf5Js2B< zP!KY6Ryc9XZSjizjpr7SFiw#W>k|o3772WWmvvsz5xf`jI)qu%DoRZYr|?i?1fUe* zRZ2Ns(ylOeEyr#h)zmU|+fBwWJvb+Z8wi((H)On3Rq2&+FNNbKsSJl$8fwsSES(TZ z(s*J4(=-L3AyEOUEbxFxrYa$GwusMB+h?8$jSiszY3AP4`(yE$UmD*UhF%7~4(V{Rs zPh`4V8v#p#l4S|R!isS<)?g!tmMEKoLLa0BQv!5Gjd%V5G4&RMt2I{eGtKMidE;17E@H}w4cS=Tvx{AmBKO+9P6o9~;o z=JwMiQz!hjpriEZ>wg~=Z{0l^@|#cfl+8afVZ!zg1Lfa&ZU45|Kc9VwoAKDjKu77> z1Hr$C&rkeON8!ykJz6w%-LYe}bN3g&^UR-@zIbAwh^gNF*0-LKep>$M9rtWkrXRcO zAKcxK1i*A>*XpEzOF z)GErdKX$(T!lgHQ*duE5zOCgCZ9MeA&yMf-MWp<|1*g04V)6MKmZPRsMmXCJDKh}bKP^H zS)Gf1_0Iku&-=!X>1|(rv;JJ$9jAKN)a{B~e7U)6#r+S=eg2lI+S-q-xxE*-ZN{f{ z-<#HZ&&O{ZYPrxa1l*I~J`#=oXR9&uiNmeOU)uHFU)Ih$`O%(ND(iRN{8aBx9$ESF ez3bO@oLu?4ZhdD<=`{aEy0UCZcz5YH+y4tdN% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/light_blue_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/light_blue_crystal_shard.png index 8c6a496b5103886f9a349fbee3804ea6916b99a4..f59562226bf763c70b7945d35b03c3c1f2c6887f 100644 GIT binary patch literal 3788 zcmcInZEPGz8NOhWQs<+AC`p5;ST;y}b#7;7zn5H7$LGdYIol+T;s}0Zc4pSz=I-{g zyZ%ZFC5eK~p)q=Y4Bwt-gH5&<9hI(b!)0p z7fFv4)SgVCGFlo|dZSn>RvsgcF;#3gPb|Z5oLd!&Db}#95sWDHu;rP$(rhYdi$&n= zE8fx61z!bqJWXq!rcF&v<)`#~6pv}dbzKcpjZy>>D4D6IY#LRQoh^i-On4mD(lDwj z86xweiL{`Cr41J03wXWMrl$wS6*)CSor8CPCxQmSIV{PhJhpDyD;Ydva|& zN~2^vS|$kX;cG&XhQTrlvyp2=<#f1=Xg1Oot$Dq%WN8$SL{YiLo#B>k3Z;3heE48k z7131kk<9Vt1X*OMET|cg5U@xmBgFEE?NR(OOgxMmq9vfFU@2QFOb~TPi0M(=)9q`7 zBM}BOD~by41yNjKuyA38jY+Lm9jj|AmArv!lCmn71I2<0rsl&?c&-$_&jOB!&N*Vl zV8}P&k5fTxYEUjMzcs%Y@rjI7+5E=-5)lWC_G)-s8r<|P2MHYqhzEv=T)`NUwr?>@ z4{Q?f7TQo8!WL)crKp)z0uX&WAT9?8L0k*@jv%M_)11wXOt9pB*auk;$ z0WsHAC0lI|;K5Xu?XQALnw_H=Rm&5NPMczAu*;z}#}BPAes%ajHG~j@5gA{+y8iu; zy1)R-GpHA$h$T^wPO(__j6sA~+!fk##wTp@`lj0^_9?{< zvKbJ`Cx%465E4mUy4ZAeOLAE4H=9lnCL@rx4c9aD)*gB*rZ=(qIIE6HC_SxYyMp2++hr7(seJ(pY(;*?e&Cc+sIw|8N#Hz8FK_QiKQc#09swk{h zD~G(kyR^xwXx69phE&o>xte~K4VsW~xP${swX{u8{*U@rWZdeqVJF7Dt&5~(2ZTl% z(Ed9^G`@?CNZygHO}+4XopQlyIS7^5gVer4vd4~vZEEX?F=`=5$u@FzCqUSDTobB* zO)2EZhBeXun(Q+Uwdv)xYDN!Kvn*96%^b6bjkUAQZJkThYOLN>4|q9T35#IerQFbw z>k}6V7b4&gm!N=fDRqJ^$Fx_AWtxE*7*Kf)j0rL+lspF$6Y0!m*bWTWz;e}C%)yq) zpmIu|AR96d%9aGt0ID$44OjZkYOy$>Huoh#h5#5sqy^pv6bTcXLg-R3+kZ1wtB_-1 zSX{T^Agyx~fqw>a9LGX|9Z1HBpfu=UNo%$v99<{CFo2=RXNHd)CLDxyOkI;RLAk!X zZe|5KHEoJ4YQs4si-HeF8srDi?-SprPKVWL>0V9UT%x+`fOx#aW@B&&D9 zl_Gm>-(}#VeH)Ths6H{=b-wk02iK%EA0H_8jP&2n-&m}-9qTsWjgLP2wN0PPZS%Kw z-?)AI!Gl`{(ZbxTuRievrSJLsJ4V%?_pR^Vy7j<;D_=PI`StfKe)i?}^&Fr1(Pxfd zy12O5-M#m8_5ACLyT5ttsf$}~SvxnkFn9h3zxc`K?Z13V&7atO(@paiF3j`8v(G#; zJN!v@_~F?<|MAS1@4WleyKhoeaNI`zu79pC@U!uwBk&Ax^oyyp$)_~d+b-F?q} zdwc%V-+83wfAIM=FMi;+zrTB7?#c~c|JTFi8@}50&o3&^&ev`)PyX~vg}&koFWlRE l>Nk@w8W+Z;F}o?3J3Y~lcU&I2J-crX^bHmt-*foh{{TMu<5>Uz delta 296 zcmX>jyPau*L_G%^0|SHn=l_X7im^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|AXMsm# zF#`j)5C}6~x?A@LD9B#o>FdgVpPNs}RMUM@{vM!^WQl7;NpOBzNqJ&XDnmhHW?qS2 zUTTSgiJpO;p^-C7_8Xw0DV{ElAr}5;C)DS19Z}$Mss4YtW5ti!t&wgUT*6n~jhC)4 zIdW$6Th;{&r%1i{EL;A$zDc-`<(R~pXDQkV7RNZ&ehvDhkzn!sPQw04Ijo8-SE3%y zsaD@`ZPAoV3m$w`|4(UI-RpU%`5GBNUwS+fp4clvn+=t2fhS3j3^P6TiGop^vs+ycZc44 z=Q=aHd$)hshz}GgJ_=P@qNF8QVj@Wan@|BYK}Etpt%WG5kf4dtDAA3IPyFV-b}PHx z>+2@>-kEcL=X;&s_kHJlc6j?ut1i9f(p)aLYG|-90{`#GzL#7KziVdSpf9i(g_iqhqW|} zs!Ar2d(mW?SHaSz3zb?&Y&B_x2?D0oc}*idICH516n+O+n~cj1<-*rwSyp5V!lXUA8Sk&@uL3A=YQ=Ka=GCF(VN>gV{4-Di9PLbys9^$^BNJuOK zDi~$VYD?P@hmhdBJYQ;Nl>mv{b9|412y8kg;?m&A)47GX9uR6sj}SXhl{vlrQ8|i> zk${-%s*>%s3*y04o@G~FC9T1+jHu;x_c} zgu(>|Sf;6)t?}WoF3V$u5Tcee4FUHXD;hK7=g(wyEXz-KFie1PGp$OqQ+~AdR1TF! zO1j){y5MKrltOI{hYM_QccE;Got}^otP8NV2}`0No#wIZD?x;p$O&yR(-S^*VZ((q z1PM$N38ouJCk8>xVmiXQ$)xlsHB8vn#SAxG9dgHLr`x}8cuTTB!K)<+?MGApb5}6d zv8hWR0g*Yhj5g!~t}I*(x^jim9z4G?H5YZ`j2~5}WIT^lH6C+l zp)yYLY7j>ih1Y83&~IdxHdPg^&eTapC5@E1(z9sLgp9*^44AK_V}kNO)VCzxx~qh5 z;oJXvleFw;&@2JkzgCCld!ZT0foyLYE!SPB4s^>w=)o?O^(6|uVQ>QuI37^gGLaQP z+h75A5GG7GG6+0uLv3tY6aBY^KI2e_UT(Wz^g$=f%4E{2Fk5)3Q)_NqxIJN=`KDoW z6gbpDhMu)28Cb|9B4F6?B{98CjewWKrDSyzfv#nl*yBC~5_1bqoR$$Fj}wYG#(~W( zW(kvYE6d~#woK@i9<)hhdj>-egDOe`i(6bbnDm@(Wm(cQeaFcR5e!k&Frf`I0|_6j z#d;9^{CaE3kVFW_VQpyCKe*NF{XNf>b8;lL<| z3&;ZHP+xzmSMAl@3Uq4P6j{^;wb@>IHigqu0OKC>7q%_`&=t?_e{}a< zcW)mYQuKj6Z#($%XYgh3e)88l$}e4a$NHnY-jB8nZtPz^d+dkm@xt!MPocy1-7h$2 z$DjJ^@y}srw&!a0ET4jTeq@jDB?b`!}3BvQ1mFqf~$DW3T>h_NxOYj}_K^^7OO6IdgXG zy*o-*ulmc+uX^~;^)&;x*3KUP#JOvijcwQkgSl_7JKdW<-1}PfjfZpI6UlQ&EQ9$x-~6Cbeb*I&7;_t?uTtj}HYkJ)tNt#^Ius5l_rIB?OE*Qu}F`H;Q& z;{`k;OzVoNQX;0_M?>Thk+n;`QU3Rq{+Pb~)%`JQG F_$NBa1Wf<{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/palis_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/palis_crystal.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/item/palis_crystal.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..4dfee48f7702c7d445d097ec3ccf2fe12ee6f6b0 GIT binary patch literal 4015 zcmcgv3vg6d8Q!22i$&7`!C{8!^)lM>ID6kuvxSg_5}HkxB$5P2r{~^tZgMBPdzX7R z$&xq?p;qj}R;i-2wA0Zk=%}T1n0AyZ1;(_D6sFcHX)QC>G3}sCaO%_t8vXCS5^O@& z$9N~3y?f4g{@3~b|3BxRWbt&cwBDTD~T#N-vi!P+I6|tG16eb85m&aL7i1MLJ1t762xNM)FDkvv5M^iLSGr0h; zLIn#^N+c@q8O5g46?Bl>*bf$!e47y+wC~JPu9XH}pKsHR{h)DW*{~qjN~c0o#d3gG z7H50BoEP+Xvjm|seN`xOt}~0maONr~&AYQe!tghjKPka%Y0AdoH!_&ZmfJCER5KUP( zd1VbROo2V(Iy>it65Dhbk@;}NNoux|C zMt79nQZ7?SNfX;e7wnLml(3~?cZLnFE|f*F13eUibq&@QVS(r52Cz@-yCK4JhJ)w&8@zL~s-Z5kmql2_ctMLqfcy7?fI~D2L3P&2ZV2Aa~?)y8Zixmn7RgIMYp` z{c!Am?uwwK^1k$BU8N6z)x-<(f0qfoeGjJ=lb@K1ZRKWh}!1 z$3nzX6{I?{jtmFuKyZWT)Nw3cgW6cM#`|vzeaN8-z07jIsE1A#mdT)0VK(6IO0Btd z=Jv!(hONjNMvgA(NR}WEF?Cd=2*fdX*`|VG)fEDsa_5p&O$4fzrSKNEA&@*);l!!R z4zjQyBFyuShE+p_CS0v71?#-3K(Dl*O(M;b4Wt`TMMX!&Dwbq}T6(pzRB9=`pR5LJVS3et#*5m99VvA3bQ!x7$4WC4SoYGv7isM!`3 zkW9cmL7*x!EJs8{;T1w8O0ZV-K7u8(WeX0F0F2XR@X?SQiY!|-1Z?n@XwTqd`Jkc` zU6KS1x)PB^*tD>+V*+^~@uH#Fn25IYUa!ilvFb>oqKQZqHBcMwm8FR?vK$z<1j`b2 zZQAMrGmA9muAL7BQ>$ODU@;C2$YR~EU)P1-eK>jcg%>&=`{E6sdFA$F)~n&)(?@>u)ALPR4}QIW$eO(V?BNw#?!1&7 zb?$}nS6Uu_bIXfsCr)2H$-a8m^5b{QQ-UH9wa=e&*iAqYsWM(a7spUjOyj_qI9jytHiFvZcaE>w;h4WKHe- zHS0feRNT~j>hBL98ccrc%BdAkK7L8KnY_-N|Qu)%3ug)zyE$@H@| z@q_%Ij;{WG(>=~_yS`!k^^V8`=bp)!m?D`nk)KKwAEZ16_cpU zo%3;HZM6>ic#HLe?sT^%G|i7l`zUzbe6bv|Eo2d@NGiY5>YjR=mg!k;DO4^6=U4_7 zg#{aC1ctcASST(r^>14@fRLe*Sq6d=0Wy(6EQA8Bi1E}|B+6XQ)G6x{i`wLNl4B(1x}I%lL!upQw$_` zJWWF;w5z_Il*5BEI($mibewSph;VZ6KijwcgQYe9`^>8Ue)i9Bk)1Ev^$9Ghag$t> z`46qjSC~;ua~(n)b5-3_=<4Ri0ZWXPGEtgyf3D+u3)FG{rE{%^EVMioA=m^hWVUK( g&>}cYi9%$`NL>|PpS|x~ZMI)M|M+?Kb@@l*FGilx2><{9 delta 405 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 F{s~p38}a}E literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/red_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/red_crystal_shard.png index 8c6a496b5103886f9a349fbee3804ea6916b99a4..8fe6cf2de55d7942727759d2844f4bb237506bfb 100644 GIT binary patch literal 3723 zcmcIneTW@b6@Mw%reB&w3nH|R6WLVS`{v#|A9rTVYuw}|-Ics#o4nYKAJsee-q{`Z zy_x6C?C#4Zflvq-krou%MuXaFt+CSl*AiohVkrbF{i76Guo5CzA&7+j(PE`|=6&tP zzRfq%(&~ zZ0K4?B%iD3EG{mV7tL~#&KSh=JOfjMQUnqxI~3=+feDOeyF94eJV@lQ=xV)fW^&yU|GITExTrf)yJk$TE^Pl z4@R*}7PBuD8}BVpRi3MgUJwZZi%e1{j!&3R@jaOM7eY$u1MzHj zjc_8P@X(r~Qutw#HaP??YVsLnwBnhLwOY-ejI*4_LQPgHIzTN)k@QUuySD4O$fVdr zj<77mEy0mxGDqQnVN=Nd`f4KP3sM#9yZI#(0XhcJ@NG*nOhSeTQ66G}Wg{NikVcqT zmMxi(%i8v)5u`Y8tkhbdlAtkQA@KwbktCjj0@sqrQvlMI*bFSpENW3*TeiC+X(VYa zk>GPv*NSNSpdO&|BEKp+=?zX7RBg<62N}h1L6*bSn?Jb5{POgHI06>~h=MPE$NqjO zT>!wbZPV_JPepCjn65_PwX6%oSvhm?+L@w~6&dPJL>X}IP_NePSKsM9H6pE(ls*^T zEr^1h3Ify}j)nwyG*@=lFU~4()^%9h70Z$^U*xG8p8*fAnH9!r;4{8(edx@_0j1bQ zj02GZVks0zsgN?2hi%Vvlz?b|5IRAa)S+x!o^P4`9QrWOd%DFek7pD#Aw&Q0n<2{N zw%`J}p#Xq^#Spix5HU-6+~tA5PB45kLkhx2ycvG*Xpj6+KLorp8;X zMkG4fWh}(9*PjLnspW~bTz*z{npA1Df&(k93?OL#M|*2BZnSDRjBy`nkc{F3p<4!w z|E>_-_iERZyNcL!8m~XB7L3Y4=)^vh_BDzSGs8^1l}Qfyko0xh~OeGcO>bAKP zn$%_#Ih5G|8sGpk)n7U zoMqr;a2irEbe|N?I@Ox|Gn|wDHCY|6Pn`Hi{rsjsd}+g9&VBx=O~;?nD)yrjS3dUl z)4w|X@7wPBT=?=G`Q}blVGuZ`inT&)s~o?Vo+9R9ZOq)ju8n!TC48o*cXp|M;hmJhATH z$Hp)2`tH?@x83x>fr(>F-#GmqI>Rpi{_#yed+itRoR8~QkG%cj_a8lWrxSen(t-7* z*WNq&>wDDmXTDOp|KcMrZ5|uj{?L}gOLu*opL~D!D`PkO<{9mc3*R)ae!KSKl{+r) zJ$&qkm&U|fXa5@9edH6r8{=0_J$dIJ_g?zR)c0O`^|5#7)?Ik`?Pp&U}oXkrghb7(7*O7r?V?XzwL{=c5v%n*= zn1O*?2!t6g-L3lr6l5>)^mS#w&&?-fs_8x{e-BVdvcxr_Bsf20#!FY2 z967W3E$f1XQ>0#emM#BW-z40}a!g{)vlQ(Fi(?#XzXpBMNU(T*Ct?4j99Bh^D^U;U zRI6{ewrI+w1rNTee<%y{TDjNmeCHj-IklV;5Bifg{`Wla>E7qU`NER#c-o69)A-8T rSS4r7RBWD`=*afuPiN{2nHYJ;tXT)2JN>)@bRmPMtDnm{r-UW|Kgo2V diff --git a/src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..2faa78faf4a0575417f1c5e5e131c0a28f7a40e0 GIT binary patch literal 3943 zcmcgvdyo`I8DAom7*bdPi$Gz@j2j9C}!EPxsu7?Cxx4 z<{n%r5z#-Q0#+U+M115AB~(hWe2^$fkw22CSe}rOR4hrQh+t7#R!nJ`Qc3We-MziT z+;Qup+^XH3>HhWi>fiT$-S>8FTsME-(s`LoX8!ulj&AtBG5x;tTKK)?&zBkeU0?0o z8fP*$ygU8Q$vkvu34jj3G zKao`ek+2%Y-ST#incMO5>9S zZISTZ?vAw$UGSFA4kk&}Rn?J^k=%%$3!?#*IF6%YP1Q662o&$EBy1E_;#(&qbja9? zf@%_k6(yC(csP{gvtVi6g>tniwh}kO1OZb=Syd%DoVrv43a^Q)4n?J!a^b16B+Igr z#DFDDEJUeTY{I7%TP`=zak6F@ENb{REjsSqS(R$HjKiVGlWT@Sv)LUa0xP$YprgTi#?3aA_nW`L$MO=#6EM3N<8)EkDS3GQ@F*rpT; z%Cap%MT8^qZK>N0xa?qw%x6;?A#5RH^%C7RESH+gG4Ki3p+z93UQ@qcVeS3(9Ojs@2LsO==?*3upIF}!dP6Ct()IQ15}^k&ntS0APEFeuHquQ)BFCpb z;)bBe@R%@lLaA>xrQI0?kl?H|RcdOL0Evv-9(S0AuwfgBNy-q{nTeS06OBqvh~;OM zNxg-z6h_5RK+N^5lJ2z&;=xpwW>-E-8iRc)QA@!L5a|E_P&4La?sF+Bz%_{bYnivV8y|JWEcfGnpQ< z;j0@iBo)Lr3?v+#A|MYzj_K$K>xLsG*EDLtw$5ZYb#=%cI+1SwzTpkY-XNE5PfWwjC zrh!bK+EDG8jWBV9Eq$M33uDv?5 z9nYW^L%yxqi0YI>Z}ClJ5aBzRdXgA?MJ?c^U^ZE;M4)9^2IkCzKw@UXiPKEmCL_>^ zG4?HHI;Jp4tFjDcW7B|M$)Qami&F>L4pdRiH<`(F>PT+4D$A7I@N7FZL^wz@r~z%* zp-6aOE!KVCV}7f$9HNxx*3OF(_f6r&U=V(JYTkf~WxZ2$3do zxUV5$U_%I93OK^FDhn*3JT1ls0pn~6K03ND5%)}oFb8wZo5sh9g9@B=be&kxl?0re zI0Hu649-7T$C{I#dNfaeyCoB=nd$4AVQI+JpgB0{UU5sKi2E?k3Fn$^O<7%IW}W8h z)$^f-oN~VaGS`OS(vm(lZ%gpfyl=@0bh!v_Q~A@uPcoS~aLjA(wf8=F|A{-UVM~76 zwtslri^_q`FKx2d-FxG)FPwVrmF)#;T(|c-Z@y!G`CS$G&F!mj<%Pio4{Y1r*>?Wa z;dA!!o}(9UP|rU3+NbYX@vHdgBOgA&?%DWk+m}y%CA{OV!j_+REE@UIeVbmMiw?Gr zf8+cw9=|C2ljj$){#D<8uZ%{xmgUcY8z$9Gq6 H|Li{jm&6~0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring.png b/src/main/resources/assets/actuallyadditions/textures/item/ring.png index afd4470dcefc3e39ca140933b6fdd69824e55379..0ceba9a0131052b66fabeac5fabb2c61d750e888 100644 GIT binary patch delta 891 zcmca5drxkH1rx9NMk_gHGb76oBV#KgLn}j5Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QP2j1vu0Ow&ws%?y(gbyHGJjCGTe%@TD@&5hF%Q;iZ$(kzoF zzhc%>F-S8^u`o9^(M?Gy^yW8Hd+HBsyuEOX_ zj01@>Zt@0pvB}w-p2|eHZ}W9d9Yz&H17l00WMGI`CK+1lrdXPo>slCE8tSGQCa0zv z8yc8dn3`|C&E>~bU#03~$H2gN*3-o?#G~_Uh^_yj0Fk|_$9BBn+H7^;(V|+N2{YD3 zvF|@-CVN#rv7qU|n#GlR53YwW7iRh~;d~)@D z%lCV#=Qnh8aMZV5xF7gmm@(Kd#p|j}cH4b7&DM zuB)n=!t~<%?%2eZ{Os4wQ;$Z@IVzZZF~UUbtGEh}xuPIH7lW1G@s}11FMX^gpJRCQ zURUpfaXsU4b^r6Lm=sQL(mBmgc02EOZbQ<_2(4**oN8nhk`5d29A?l6KQ*-|b;G&y z%xl)|+h=39<7avK=Hk=Z&9(JAnGU$983`)LaJnB7Y)D&uGi%#E1toS7*FX{0iyLKc zZxrPI>9lWxyU5HFE^Qu_j^V2o7yDc`@x5F<@44yg-m1m-3X-c17Yc59=iIQ~)xJf= zbCSx=y#_q~{4aK`d%f#-+pJ}ov&{ZUJlnK0NALBw389;_!p_cqKa)vneu~mej~ula zMeE(4++JRrZy_>krl;(#kChKUJ^FV~b(z|>Rbf|GvCUv&lHIU#=awsle?H%1NcjJt zIM&30zd}Y~g0RSBWyk-FyFRurSU9_0`+>FN;(v{SEyCPCboVgN_?6(zV6|I@0SG)@ L{an^LB{Ts5mM>C? delta 798 zcmca7cT0AH1ryKfjaG8ZW(LL~hK5!K##RRA+6F*|fs#T+Zh@6=eoAIqrAuN-s;!cd zfsui(p`k94(#d_y7AmQUsYb~u=E=HAh9-%+hN&h7x)zB>rn)JqMrI}kW|m2o7O9h8 zF>9$<8mA-~BqgQlS{j)e>zb#Um;e&fuPJH@0+xGX}Xg9Y_vJH6)*WW)g^Z9urgFnB&KX$KGPGp}l zH9O15`2YX>?A+wT`VF@odtP)3q#3#}1Hs|__5AV%27msQes&8pV?MmtotTb`^iS8WWHA?fdsw-9WZUohv|h-8x>bdmEcKoR^eP z^93>*7jCV*8^zDx;>;&+TlC~HI~!ZPy~)!J0ynl8s=5Ze0Q=%!Z2^#uw_hLo_0zBa z`?vTwH+R1LUq8btDRYM149oieb${!n<~L-@x#>CdCr8Lk;_A4{Ue2J?v4S_^<`vUr zzOGAHOByD!y}KX1BjL1|OVX!rGc7Kj@4u6C;=qUB*S}`pyH_Ekzi!9w;_6!=iGpV= zj<_Da#8)NNG_zS-S5T)TL9e})L+``%#zsYL>0o)qhCsdp3~Lk`KVA<0T*TVSA(4*gru$bb|Ngqa-$le_2g9yr4#pUzmvv4F FO#lh+FKGY( diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_fire_resistance.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_fire_resistance.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..b70ef447711a90de07e88cf813487c99d882b077 100644 GIT binary patch delta 1021 zcmX>hdslvf1rx9NMk_gHGb76oBV#L53o8R7Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QON&CL=G49!z@6H^kCbJk_~jtQWF!+(vnh=Q!J7v zzhc%>F)%hYNHtAO(@ix85=N#brn(m97Dl=zsb+@8sfm`!hKZJ&Em*!YxuzMKnx-XN z80Z?MCL8KnSOSeqN;5InH8L_bGBZoDFicEMQBo)_aV;ycD$hvG!|u2@tTvlBu&Xe- z65~RmjGMfHU2JkTr-uqL4%~d5Q-@K-(7@QzDA~kV*D}e_Qa8mC=nD%&OGDi>!{pRd zV?zTo3sdvWx4Hb7>NjvNI?KSogpH}Ci*h)vwSpHdkxX0@6Y4dqZ<^4?8&fAOEKE@Do9H0Yc_^Io&Dx_wWC`y}PUb8+UYce7K*Jb*W*k&0zzcr8PB1oA%eYcAPMH{HRsU zch3$B+}W|CXFi*X=OmTRcN(X@ef#X&@NmQR>TQxSH{M#G+`Wubp!?XOjT#Lg z11j7fD>?}6W@Lz6{<=iA!N+WJ{n->oGr9Xa*1h?mUib0SUv^Ix0TxFA7KYu)+3VCOuoNwU#0JPd6}4fMW3hrj$O@MpmV%P z$H79VuSJ<5cXjU8wec!ab2lbiZ%bC5*0nTgWygskpo+)mr&I{J7nH(P1w4W^`G&FSTxqxY@k<(UM*w<@LE2~pJ zlpQW_E8^Nvqc{Kb^A&A9%PyMCy7zfr^ns&0EyUepeAlRj2~Rokm;KP*SK17xqoQuz z{mQg<&766BzZe*r4_7C@c%AmYlB;yo77|@XXuM?vDP1WJUK*b>LSs25u>0=g+>LZy>XW_ oq)O_mW<8D2vv?>k{3HAuvo7nC0`2T+e;9zk)78&qol`;+07J8smjD0& delta 782 zcmcaBe?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} D+hr&~ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_haste.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_haste.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..dbe7402175d63d8303c9a1133cf22c0b521eb565 100644 GIT binary patch delta 1020 zcmX>hdslvf1rx9NMk_gHGh>4g0|P5VV=Ds-Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QNcQj&}<(~?bfQxi=Sb(2y}EOir&O%intk_;>jO_S3S&5{f! zzhc%>F-b8v!Ftjw(O*2eR zO*J+&Ftac<-+Y_PkEuS8SEGo5fyu|y#WBRA^JvKae4#*@{|-LR$)zG{y$={XFCVOG zm&(wX-TORX_3Uy>>(2Uy?u`pQm070g&Dvq|oGE1PIR}|NhnYMX-yZ8fILj(yN3y}i zgUiI`F<0)r@%hw3!@B9;_f_71|NV32{qL3W?20V{P5;x5yZH+A=jZCyd$B!zJJav^ zVdlp*iw(?|*OgejxmMiA^(K1ej1RT!V#n3h^Y^p;xcB8}v^~T9w&Rau+0xcM`Mf#( z&G##2jsFh4dbN+~PWRVu+C~9;_HX|D%qU=G&99hB4x67w?_RB8PWOLWv|PDtH4~pU zFGrICM^mAaXLk1K!Ugy5-;M3!*RQGn7?iT@CJWQQ2Kxu>DxQ;6PW~}bV-l&Dz)bqInZ|!GX zBwPQWa^CYwrxM@mCA|}J)MlSd<4BBXOO0^Km~(gPvx`=%fFNsKx=`Zcn;B-a+WhYq zglwK&?r>m}YklU$3=^qdsVIvaHQp1ObWU&j*tQ7hhK!Elhre#j_;X3>!_V%$w(qni z_$>{7Ic4F(sJ&t9ub%z5EdBu7O$BKc6&bGfLy9@gCwgb!*?LGjJ7M|dr(ODzb$Y*Z zYKt#3EK^z+nte6u>M{KVZro?i`}>xbzTP3%aN}oh>MQ)MlgjxnNXrXY qm3&^v(k5t?#V5o1<2cK|sef6Nb9zOc_XM6|00K`}KbLh*2~7ZUsheK_ delta 781 zcmcaBe?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8R&5f0pZjZ>F#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} DA8sfK diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_invisibility.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_invisibility.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..e23e11004e7b766036463209c1e86914dcd3277e 100644 GIT binary patch delta 1006 zcmX>hdrp3W1rx9NMk_gHGh>4g0|P4qQ!5igZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QP&OiavDQjAk|jg!p{bqy^|40SCn4U%u}ro!PBJw!*G)7rHqcE?HA&P>N-?$2O-f5mF;6x&OSCXb-fY40oypY_C}Lq? zo}z1kJTG(zHvJ+hd8V*EGEZ zb|)oPZnHB2bvdZeD?27v+l_3{LeNicdbDRdHxg=Vf3{f50QtkfS&I^fQLA@M&Tf zx$_?^KVLOJmD54QHBf}{&Az+ae=|(YS{k)-S7*hn2@KM0i4trMYvWd5e>K@uhRtJX z+kLyb1z&I9ets@~r`6AOR~ak%o>%ZGNN}|^DK_|Rzx=kOp4mlYf{N!Pl^)sK8)c;* z*B7mf(VA}X45YBfQ}(sjuM;wtO?)qxoG+fa;cDL2=-gS8t!;8Qe3KRaFy)25vjB^u zzzXqYho3UWUN4PZUcN%3Ymvs4Ip5!(J^M0$4`cjZx!xnz46QYa@h5`$BYjtAn%@1o zZhu4nM?<@|LZgX3D#BAvG`Byx`zks=VZXh=iP#k;_jUH)xpjN-fg?x44rfL1w(W0V zk(}VCug@>@ewRGMhF#yX<690g&*K*iYfOc delta 782 zcmX>ne?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} Dt&=D* diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_jump_boost.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_jump_boost.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..879a1da6f6263ec95bc04d14f242318574f6bc50 100644 GIT binary patch delta 1015 zcmX>hdtH8l1rx9NMk_gHGh>4g0|P4qGb;m2Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QNc%~F$1O%2m@O$1&K!jb5A^WN?KUi(s{{Hj& z+GF?Ar|srnud-Xu74RTHL#*5Az|UfFqnSJf!F8MeeG=VpdG!=i-WxYom|wfLNBH9! z2Q5|~85Xg8l}G1I9=N>uCd+W+W$9Xe`Nn6jOKur7bWgu_-_N<(6O7ponYW7XOsW z%$HeWH}2lOH}8C(Ud@||PfHRR>L(Vc$Z#@m(mB29O~?_)2Bz=A4ePFM-6b|5`h@Ni zv4)+e7asnkTmB&X`u)A)tPRgA=RIfKoLqK>FJRpi?WbLnJ6;P1B!mJ1>y}wzm$Uws zR!MoNZQr-2BJcS6H9j&{MO*e?&tf>ef#)62Kn55!4>CH16TWhmrHihgpA2wWn?9bR*qZohUw(S!0 zFKzbHNAY z?)q!FI!4ndg}L))zKnWTXwPsa_NS@-n}zH#?1G_9zd{7p7dPCi=)Z8_th6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} D$q^_z diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_night_vision.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_night_vision.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..aa9f75d662c5dde4a75a1b4f8c00a6c506de60ea 100644 GIT binary patch delta 1001 zcmX>hds=>i1rx9NMk_gHQ)7b=0|P4qV=H4*Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%gwn~q%$6z^h9+rgDQSkfhN*@rx{1jqrn*U%hNikEW@!e77RG5QDaNLg zUomSdo2OY?7@8;Q8YdYg>ZYWcnCK=NnkDI)BwM5yCmEYrn50>5wqW_rRi2TWhs|lGli#q~Y~H}G z!stqj1Bo(j@&}%W;?a3DUx^E2M*W-oe)m#1v^3GEzxR$&*&LP`B+d+S~uY#bMt)@L+Rl0bvfaj58 zWi}ID9$Cj7-TQI(8J}mr_kDkMcJ@a>Cl19Q`GxP+uuk+)*|h7FM*s20AM3Ys-j?TK zW4`_A=bmq$D?=NY*qgh(PoF;U^T1K=g9-&-l8q$!8Xs=BZf(JkQ*H9g=#$@(_fuCY za5!nPUb+9~?YcD#_tpQN-*&daeouX9WIX$&mnFZh`L2&m*HAdUN#}HqduVx?Tx!GP z$0t*)jrV`t`g*1GTQh;~V~aLwELgQ_RsAYIR~Z(K4_g>s+^*f7&wMk+Z2DQoXnwu; zp!vI)?dv{$oUFsRNTX{JM}+O_^sfy?OJg*{=eWf9dNh{CUN4nhac$MstX!*gYZ+Hw zxqfl?cAfhA`ofo|uD;w8#az+%yn>IT)%jt7#ETN^yMEuz9YPpAC#iTU9od$1dK-tP zsQ1zOpos!NWqs-`&njgzW#1-Cv?WTMtK$>ic57|f>a*9r@ST^6d+o=u!|Tg*MUEx~ zjx*fL4?kq|y=>x}T)qP6E{!vD%HQkgWa!^zjDI65*R{RTY2O6>Co|j6EW2qk`&`X& z?FWx*=JX3s@=*~!$)a5Je&39Bd&=0q{bp`FV-{^6rTx}!{dGwL(~UO`q|*)`)?VN! zos*ZB^CkED9%Y7T{`$4uRUaB&ySq$XkiDwodVRyZA1xPFPCl<{(0^e~eS+8ndEp=7 aABBT>XMMQsz3nsu5O})!xvXte?oSG1ryKfjaG8ZrUu3#hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|j2&I#InJrZ;lZ}nd%~LIO&5}*hbj?gnjC7NXEKGHi(o!svEmI7PEQ~EC zzhc%_PPH&GGB+^RHBU=5)J;h;vCy?JH%ZmCG&V3!u{2D!Og2y5Y{BxK$<@Np)Wpmz z#Y{If(b!TqIoTvdH__4%NF*C18yZ_!ni!{;DJc|}xR#Yzm1m^pVRM@4Vnl zFuD@sK%$JByn$V8ayF-j3Na4ce4SH=akD?S8dJU1E51+$2F7Mj7sn8f&a;#4yAL@C z9F6bO{>TI<}}{c~#{8yFiu&iz#}|EoRY51lH5T`tpK1pV23?B5Of-+iBr8uBb;c-Rj! zZdjS4HQURszF~qB*GU-`M*)^H1$X|1M*s8}-u~*4{LQATLc- z26?+b?Mzo2&+ROJH)m%4-stz&lIQs?oBXn6=N_%~r?k^b*S)A;_3Dak_s^t#GiHC6 z3|{bmKm=BFfP$<1ni#@HdCcxZDn$B{&t zWBm`W8m0I&Ms#nDFy>Zl5lCB=yXtM$?pu1dUk5w8xUdAweHEf_!0Ppii8X1m(UsSq zQc4^=OO@{aFIlqUO84cx-;_SZG}tVNVd#E%nxTHF{tZdXxee3ngc*Rq)78&qol`;+ E0N;NnmjD0& diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_regeneration.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_regeneration.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..9285b587f283e11a8fc1c43f4e84b3b95cfc90b9 100644 GIT binary patch delta 999 zcmX>hdt82k1rx9NMk_gHGb76oBV#L53oBC-Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QNi4b0Mv&67=ZEiB9obq!KYl5~?2&5d=FlYsnW^Hf9A6r;(n zn6*@l%*~RGjg3uoP0dYBb^Td;g*ay3XZNii`o zG1WCRF#+0X3S=c&CMW79rkWX87$v5fn;04?DHNBumX%nQXQbv~cibCRo6Q^8RTy1~ zaUoI0P2RvRHaVNqLxmUzZobZ`!>D3tU~FlWY+|fynPh0Gn__8Vu4`dvX$bUma%!rv zp@Er&srlyHTz*XTYy2#)GcYijdAc};cyt~OvCX;cAo5RU;VPy^7H=Un4W4tC7ACMS zaq+S#ImENn)yX5>=F+Ca466=J(U_aKMut=Mf{~H%JwOMm2-CEa3itoWlM_kU{9{(5_fg8oZyb-h>> zbM~J2a^U&n^z)37PcI&3&t@p_-(4ii;9@Ao%#v8?Dsbq#i3y{VU42vxi(B>0Ge@}_ za;JLfpJKR>Q~Q^x=i9q`kr50WmZg&>YzSpk^kAN~EOXYee4gau&zXET?%%%~d)`;C z=53YQ?YB&vhKgz~2Ml-)8~mwX{82FBz+;w#7rc8HvOnSe>9mhw&At6KCpB1^?W_Mi zT((Ma%b4cC*Z`PIHhXc^D4ciQ;U|yXa;N5pPZy~ za>}M18`MuHm*(8wmU}z?y!s)(?U&z{>^z@lv9|TBwSvHnMf*)$14UdPMp@+8@y-Bx zOl|(cb+31=D=yT#KWnDpeHP}t{c^omqz||iF5VINM5^eP-|fubk8Afk_?_~!^vtxH z>bEp_&WTgGU(?>^8WgA)S zH)BHS+wV4pEo@BUg0ERVN4g(+$N23Lvr~JV-NXYbPRHLiK4$nosJYD@<);T3K0Ra4gfg=C_ delta 782 zcmX>ue?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} Dm@z0S diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_resistance.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_resistance.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..40597ecba186eff30c72c77b1e3bdbf4448e6081 100644 GIT binary patch delta 975 zcmX>hyIy{R1rx9NMk_gHGb76oBV#L5b1M@gZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@QOH5)D(6lhe#}lhZ8CbdyX?Omq`1Opu{29dH8U_w(oITAHPSUtGBMP(Of)jowJnM-fY40oypbM)GRG2 z#oSUi$6GlY)DCa&pI&1^iWA=n+ODJjK%%tG?k)+6WGygOa& zn@ep?k8Ndk`t$VN{lEY3@BaP1PeDoPQ2pkek-}xXP8<)X`0w|7`(8;&sD9Fxc?Q}a zPMvxrB*@^U-~4s$+NV#miy5}(vDK|CnVGO=qu7z&RY1^X@$=!g>(>SOzll%pXvnzI zq?I%GsOnnpMJ5X}XD!RDX}`30Z+L3M=g*rr&n^0M@SVMeT}f<1j@s;#X$%@mr(7z? zc4Cnzn80B0?fAbN>?=aFuX>3l{Qg-#_x6`ulMk=WkE_q(TA_QF1-epnH0g4)=n)ndP_UCd9}ayR+@XWRSEIaj2=y2%Dkaq*lo>HCyko&KvEb8l~ZTd?LID z?{LZ@8zzG+x3en>c`a?1KmT&*gW3tlxN>sVtnK~#V#j<2yA6LI6~(DFvMJdsl?k6oH=p!H wK0$q-f=TJ82&Tf8b-&oxG5twq`hTj9(QDShdZqFsObkHa>FVdQ&MBb@0E+H^KL7v# delta 782 zcmZ24e?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} DPT?pL diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_speed.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_speed.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..67f8cfc28ec78d8047b05c29faa36f9b817f2190 100644 GIT binary patch delta 1010 zcmX>hdr5wR1rx9NMk_gHGh>4g0|P5VBP#u`n~TG_y!a)HO9TvD7t8G%?prOioSFH8M&{1PUh`m>C;ywqW_rY-o{Y znFKV*$Wqrh*~CaUF)7VNH`(0SG$qX_)xglqP)VV<#I>x%syrh#54+>uu-a_iz^=mR zN{kDMGH&t)cCpFXoE|E~IB@fIP8~)SLjz+=qhu3fpjQknbyF;Xp0+TwG}KKqOioQT zHZ(A^Fg4$No6C=>-tt1|Zw3Y?M^6{W5RcBIA?Ndj97X;qEGfE}wCK>zB&O+A0b;!q z9!T-4t;^J^x^wo}lXK8X*|5|``zC24aYZsJ7>}ul=*FbF zqnX~{&6^s|Pd_{5^nq(HuDH;+`tvL9MlpdnMwB;pz6)3E80jV%S(xf3rKMOTTc#KoSr}VP ze#NY%l9*~?Vq|V$tZSZ@YN(r%WMZLfVQ!MDYiVp?oMLI1Y?*AHy4ix|JCm!0p{a?P zS&Er%YND~FZgR3oif*E%A&^KmNH#RKurx7FF;h|~E^#d@u`16<&BN}vH>@_BH?XTP zx)S3;qKuoofn98JHm8RQF%H~(ol}Q#vp=^QQ@zzIzEB1R#%50!#}JRsvy<(+4><@N zjqlU`%)hJ?b88o%-wpZSeV>gQ@+@R{*bg&q zSec_W+sm%LVS*FaNf{PL0hTfacm9P&|MVE%{jL6gkA2!hqnNe>D{Hgn-zs~2X^n~Y zS%&MSvDaBAsd!Fexe>PgYVK8*jb#qza+S*YPZ$*hPVhO%RX$<7oBjRP-ZX_EFHKbj zdAmRDOjjGv?JRybXJ-E1==ax>=lLz0{IX@|9WXdm&!l}bW`CCq zUhse8ufyq~Tl82xqQ9KZl8ruo&G2-So-*_AWBWGdrzB>{&1!$f*dd^JXmc{hkwlqe z{SU7irT8>PbZ?C?=2mPGNL!V=>TTBUTY9%&2RpmCumsF~6{2sz>h+3=HEFWZmDitA zN*p{(mG1s8S+e3v_vO9cls?5Y*er-)=ze&bp?<0U4N1$n4b$s{8Gyjk)z4*}Q$iB} DxyvXu diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_strength.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_strength.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..2e2f61eea6a23ab80831959765e42befefc5bbdb 100644 GIT binary patch delta 1016 zcmX>hdrN+T1rx9NMk_gHGb76oBV#KgBP$~_Z39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%B&C!4m@SnPlarIp%?)%dOpHx*(+o{gbuA2ylXNYOjZ;#MQjAT^QVk}* zV%AbIOfj@fNlh}>O-)Ko(Y3HJG1N^;OElNDNHQ@_v@l9aOHMM{Y{BxK$u%i4In6jV z*;3ck+$2%g!rUZH*V53!K-bv7#5^@E(a6HsFi}aNxWu)r#Hu_aH4nSn-muzi-oUQP z=t6`8i85{S26nN@*_<9K#JF$sbxs{d6+;7KOQU2HV_nN6LrdKhOB0}X4J{3U!IYeu zYHVm=W?^c+`8JmyQ~jgjdKCr+CQnZn#}JRsqanT-!j2;Ugj7NlHIoc?a%Q$Z5z?5| zo5Wm#z5y?S3xzOK*sl-oEjSTTT<@3WeBk~4c+!94-|zQXy`8l)ajRB>@#O}M zu0W@yCx5ki@cn0PoxH;7O**HKtu_=`aG;rG!Q%2S zeS9jxCqs-_&&1D~HRb(GX8n7${~bjb<~^^R$9`*V+3LGYpIU1a;|+uiMHN}~#JZ0r z32IFBei~G{p=z&#$*ya)Und>a*SC&!@8jF&o!Y=%5 zI@SxYI4Zd0zs}w3>!COM^s`MZEISp%pKvTJ3=5y-{(8kKAlNw1v1M!3+PKxm^Y1-e zk!G4dyCJjt-=(CD5jtYYQ8zN#ctM`y+U@K)NyRhikxl)%hXM0uG22z$dH*@R!N+Ry zxg|5(wyX-fy6RZPVeJP_F&*53LY(f0CK@OkWtKP2*R(Nb-*)@>u}9oz_Rp{Wk&xQT z7%Z4Ax^_{h&K{<$EeGD@C|tOB_OTh`nfQOE=hGdTmo;~kHT~M69QK^S_M_QCS#^1@ m1c`-rpB>0+sP}mgf7AbuR7b^`_HAtpK;Y@>=d#Wzp$PzwtCxoW delta 780 zcmca5e?oSG1ryKfjaG8ZW(LL~hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|jNJ=O7F4GeVriIcnQWfA*@EReldFZHsfn3c zikWU|qOqlJatTvlBu&Xk< z5aB?gOq;xcU2JkTr-uqL?%RBwQ-^W0KerlFz11tePzDCZW=|K#5RcBYlkK|?IS3q$ z@6-Ow>vYScEHjp6t4Quz-{h6?E^BgGd{Y;;ZmoA%CV22%n)lH-#lJCy+dJQEQaL4i zFMC?++}izfYabgJ8$ZtdRWbjoJ>w6ZDuZ1v(_aMr*?jEZ4f)@FpN$&wEM$1t4>N99 znWHt^%dWm*f)m$C85TzYmNEr*{)I;W^cdd#t^R+HecD5#n6?8eYqRFxDtmlsjfwVI zhU=xV*I6g2cur!u5w`tm?p2nJWe(v?*1=Xvf@hj<-OmOKE*WHEQn#~et4RpeyRQqNz1tn)9Zv8fWXt$&t;ucLK6UH C{wK=- diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_water_breathing.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_water_breathing.png index 85dcdcaec84056682d29ef19b8b222f7c56c6637..8caa65c181a185ac29256693b1b3f12772da717e 100644 GIT binary patch delta 1010 zcmX>hds%*h1rx9NMk_gHQzOd|BV#KgLn{+gZ39Cq0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T|+}%gwn~q%$6$Vh9*XaMwUssritdpx@Hz8hPsv($!WTVDHi5Q2IhvT1{Ow> zUomT`m?fqqTN)S`=$a-crs-OknW?*1)@^o*R*X$Rl>wcUvA!g5ujccYKiQlqe(u36P6I#tY_nOX@`6DQj zQr@J|wUp(}7lCEXvF10m9+l6WJNNzXd$Y~+)f_aJPIsET7Xr=HBh8= z{fbwQ9{ttXuy^m)trKML{B;tCSt51p`oEy*LHL>Fw2QB*j`e$WqR^y zXN?~JnY(>+0_3Zi?Q6a~TdTx8NyT##i^aBNYqNlrVXLODn%%LSQ*y()*Spp+n{H0K zcIKdkCFhdM_xJCOd;U{fo1K5IrS*?>GaCfNA34cz^tT^B{Mcdl<#$`G_cJDOo!F#v z+Gyz!MZWq%4c+OdmKJqh+5uF^v{dK(`xCDss`%tT>&8{Cy#(xUdtw}R8cSbJgsEwuT#<%NfJD*o49NKE&222m^Zgy n#h~lLhVlf72lB!{!Z$J-GtQVLyx!Q90SG)@{an^LB{Ts5|6G=c delta 781 zcmcaCe?oSG1ryKfjaG8ZrUu3#hDKI~mR5$Q+6IPJ1_nwB6}bggzWFJcX_YRCC8@Sb zMg~R(x`u|j2&I#InJrZ;lZ}nd%~LIO&5}*hbj?gnjC7NXEKGHi(o!svEmI7PEQ~EC zzhc%>NldjcF)}wW)-_K{HPlT>GO^ILFgHonwKO&`PO&shwoEop-E6_~oypb0(A31t zEX7PWHPP5oH#ylPMK{sX5J)5&BpVuASeh88m?Et)8Hk&uF zt1!9}<3gg0o4kQtY;rcIhYB$c+- z2po;?)BeosbjzeHGnQqmNbXwSwt#?=^c<@}B_t7}TzcGc|JKt!q>RStqG@PGY$cw*6}ERhErq4(4)|%K1+i6$DQ3ImlH$VZ59D{np+zg&;3Y zRR(#xKkZCc8_(@5em7@k{@&>K*OKS?Et~wZW#=BP^{2GcO4q%pU-jyWZTHWleKTf% zmkeI;f8(#i>7iTnSUsY@oX(PsK7P&cbd#Pk^Y3H(Hs+@!X35QJf5zA$pm=C=GRKib znPdGAuNtNJG)8o9jWFg`Y!OIXmAmR~*6v$+w_gW4yST6f%zYK2Z@}vHiitI8veA{- zpHfO3JWG}C{x4aw;!5}Bz2B5R#WdI~h+*h{c$%Spss0T~%ef8H>x3DAz|+;wWt~$( F695ykC;$Ke diff --git a/src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..37ff85e12965c3c34b307e2d514b192f490aa282 GIT binary patch literal 3869 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 I?fmM$0dE2#*Z=?k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/white_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/white_crystal_shard.png index 8c6a496b5103886f9a349fbee3804ea6916b99a4..ab4c93bec77a1b710af8a59373d62322c04c3322 100644 GIT binary patch literal 3740 zcmcInZH(MT8QuVbG-*OYRMG|o8K;#JVAeC^Z!4ShE_>ll%3i}|lU)9!9nXySOm^+9 z?YrGen<%YPg-8^sQ2x*g)K=jKLak7d_;IKtswiLm(MpI)m0BtRJ&*`hRUz>s0$%S| zF6~}!)ly5lwr8Gszvg-0cYN{i^w&0R*s-BdC~TUVEYHAwOa9yPY52c~?^5A*OLOu> zS}1JXmjBijzW?Oy0Jg*GY&KgtLrnDRNDD~PUwIkPq=X_XG zl@263RZ_=th01K@uyP1kT4)hf31Vw}`8;<~PesYWRR1WFg9jI~je?&?b@%akW!GYjKL z$t5yBp3h1uSlV@=(Hw}4(q5P#U|O3sHB!X6OC6x#16*@HsdtnMuF1M=$S6wzO9oho zQl&D04;9;J4A5ydu>cnJd>e{RtBXyk&B!#KPq>^|0FAr)hNanzydIhnmIHjSxH%VR zaXJ^T5`@9@4WY=wU=@Y=%neZ44p)KZGXrSTJCI10#Yr`e>wWGV?%SqNTExok<6$J? zR=Ov5ythD>Std(rP9y{@(n*zA9lm^GZt|@kfwfkXDpq& zoNx37XLuYf$Ycevnk-?^NM(|i)F6o)3Trm& zA@5|Dwh)P4e;OpDlEupP^0R8tgiOK}99XGkV1n|0)VC(%MyrOy827Pml9nG3x@ACn ze}(A2m%EWXnD0%e@p{8*!KfUBPV7NxU!&M#$HF$Xb;KC85R_yaxw;b|>^rV$`j$;8 z)W@zh@kcH8Ifn-H^7=hv47yofD$`z#8E3UYwb?hkMU7(h-cG>l;aai?)?LaC9l1Vn zk$~QZ9O4ob5a^yd!Iop%qslVPzzhrnIxofqnG{-{gNccBW;1LDhHGFsvMlCc%Vf|w zrB9IUL#@fT1VJli7Sjz^`p&4bIH5N8B|(M&F@#79ybUN4CN_o8rC_%IL0SDqj)h@y z9nJz&=OzOG4CFYDg#tT}j1xg=FvODnYDYM_PJm$`h9aNAal&E3L0HGsH8~TM>#OT# zRshErn<9(aCKwIo`%rh0AHcXze4jc)cBij$cj9zPjxE7kf ze(}mTjy=EQoOAKJj{D};@%3LicWcdgu~2#A50#y7{`9S_yDvRHbK!^E7a!aH-#t8aVn+_i51k>_^*YR~k$Pd#|@ZF#crkHB79_nWEdWW)FV_0nzs9?(e?-?bm*P`=QINr?0;L?A6VGeeTO=pSXO-^7Jo$eC?rE(#3@z$fL*PZD$v1 jUpTYxnWbB<6<&Dn?!TY<<0mfU-;Yxh)8%K!?|b-vgA=|= delta 296 zcmbOuyPau*L_G%^0|SHn=l_X7im^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|AXMsm# zF#`j)5C}6~x?A@LD9B#o>FdgVpPNs}RMUM@{vM!^WQl7;NpOBzNqJ&XDnmhHW?qS2 zUTTSgiJpO;p^-C7_8Xw0DV{ElAr}5;C)DS19Z}$Mss4YtW5ti!t&wgUT*6n~jhC)4 zIdW$6Th;{&r%1i{EL;A$zDc-`<(R~pXDQkV7RNZ&ehvDhkzn!sPQw04Ijo8-SE3%y zsaD@`ZPAoV3m$w`|4(UI-RpU%`5GBNUwS+fp4clvn+=t2fhS3j3^P6TQP1mq8bF~vrsL=qaoP?CbwAK%$ux0Soz z`fHQjoq6x`zQ5l0`}w|i-{{C~mtFe4OLMv0Wy3?IG5BAbeOJ8`em9)?2ZO)WwV}x* zmwVT`?7JfOwL|Lx{BSTnkxrEFaJ;CRXFPI6zEQ0KI+q*R+^8{cw@4*dOa);G4qf#-7g=FM0@-QZnY3EggQp@^?L@>b$HWd{kLL6*3x+b+hGH8pr z?~IkUwspZLy)Ldc6IYtbxu=MVsERO60IPPf z5T$at3tv=hwc14|>6TfrsO{UL=wy7ZCX_LeL^H7`w#LtMp3Etl}V%xt8bJj3BIAI%0w{wFBb8RF+j&K~~#?6Ir5GW?F+L!SI0^hfjNca+&#s>Fr?vAtthvWsB3) zzYT~B3@~(E11Fo~qd`MdCQ1QBEom8I^v+D4Ka=rTR-evLkU+-GwV7s{*wcQh1X8mk z9p<%M@Uq+#Ty75si)?Uzp=^n*PYVdv1+umUOCmq5vsesHL4=p731unM6E=Hc!?~bb z^>rO_Tcb!*sfujF))3ZoTL_mBs>8M}WjJ*-s2$oVw}0R8wq$Rbg;N6Bk0Sr)u4ty_ zQUaxgHA)aSDbxlfCc=Vi;270ST`c0t;$+a5D}>~6FEh0k_2Y~eg|i~=Nvax)8MIIl zCk5G$qpHMewMyVMD@&OTdAl=pi&07=X@Po{3>p`4(31hZTDm4k|3iJt=39SE__loe ze{YhK9SvF(p!_R4wBAdtNN&ycrrC0x#dx6K9E2Y10Ie@W^pr9R2OJl1*U+~jvpt=f4EYwZ z5Y?y)y~Q_>u5#bT)Dx=i4m1N^36_)9PXzjwrDKOjN9);-4I9Q1atI;)xCYeY8*GKdLkv%PXnLXqpkxU0G@vCN*;&CG12xpLupXd-*= z7m&=&A-J?;kKNl6ymaqdB7`m%!)@yBJKuURms_C?mj=hJFFy2@AAanj!K>~)e)@_V zC-+}`-{!%4UKn!4Lldh`K6doA_uT#7Z~o}yZEG+7{?V(dmGTYjy0yh~gF_Qnzc}%X zzs`LB!1HVBzk2d_YwCAg8IWU*Q;%Q0@-J_k3!Z!F;Ml3v`spoSzvhXjzL&fG*V;vg zp1k>u$BrD`Kl1Ya`CrUizuELt|Jw&&S(Q6J|I!~mjEBGV^LHHH@a~WP_RYU-`tjix z?UTx$v#%fc>`JXT|K^Tw#lAnsUwUN2m0SP#g+s%;{B-Ze)30y+(~-lkzLh(4 zZFJ<=4;Kbz{_ng7I*8lzK57vB;{n`(1zj^)7=oTX)^_PZihve*gdg literal 0 HcmV?d00001