From 5ce6647783c763c9e26abb2dd93d65ab61c9b737 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 2 Jul 2023 10:33:50 +0200 Subject: [PATCH] Port to Minecraft 1.20.1 --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- CHANGELOG.md | 4 + build.gradle | 41 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 16 +- gradlew.bat | 14 +- settings.gradle | 10 + .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 257 +++ .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 577 ++++++ .../c52895b732924e707cb6e5ddd1c6b6962039449c | 2 + src/generated/resources/.cache/cache | 1634 ----------------- .../cb654f100e416ac39358630d6623170b9bfdc5d2 | 16 + .../f481442ce31db2c3b3dabb5b6d85f9a78568164e | 18 + .../fd27170b6bf91459ed2598d25721edfeafc82e0a | 771 ++++++++ .../blockstates/black_controller.json | 6 +- .../blockstates/black_crafter.json | 50 +- .../blockstates/black_crafter_manager.json | 30 +- .../blockstates/black_crafting_grid.json | 30 +- .../blockstates/black_crafting_monitor.json | 30 +- .../black_creative_controller.json | 6 +- .../blockstates/black_fluid_grid.json | 30 +- .../blockstates/black_grid.json | 30 +- .../blockstates/black_pattern_grid.json | 30 +- .../blockstates/black_security_manager.json | 30 +- .../black_wireless_transmitter.json | 52 +- .../blockstates/blue_controller.json | 6 +- .../blockstates/blue_crafter.json | 50 +- .../blockstates/blue_crafter_manager.json | 30 +- .../blockstates/blue_crafting_grid.json | 30 +- .../blockstates/blue_crafting_monitor.json | 30 +- .../blockstates/blue_creative_controller.json | 6 +- .../blockstates/blue_fluid_grid.json | 30 +- .../refinedstorage/blockstates/blue_grid.json | 30 +- .../blockstates/blue_pattern_grid.json | 30 +- .../blockstates/blue_security_manager.json | 30 +- .../blue_wireless_transmitter.json | 52 +- .../blockstates/brown_controller.json | 6 +- .../blockstates/brown_crafter.json | 50 +- .../blockstates/brown_crafter_manager.json | 30 +- .../blockstates/brown_crafting_grid.json | 30 +- .../blockstates/brown_crafting_monitor.json | 30 +- .../brown_creative_controller.json | 6 +- .../blockstates/brown_fluid_grid.json | 30 +- .../blockstates/brown_grid.json | 30 +- .../blockstates/brown_pattern_grid.json | 30 +- .../blockstates/brown_security_manager.json | 30 +- .../brown_wireless_transmitter.json | 52 +- .../blockstates/controller.json | 6 +- .../refinedstorage/blockstates/crafter.json | 50 +- .../blockstates/crafter_manager.json | 30 +- .../blockstates/crafting_grid.json | 30 +- .../blockstates/crafting_monitor.json | 30 +- .../blockstates/creative_controller.json | 6 +- .../blockstates/cyan_controller.json | 6 +- .../blockstates/cyan_crafter.json | 50 +- .../blockstates/cyan_crafter_manager.json | 30 +- .../blockstates/cyan_crafting_grid.json | 30 +- .../blockstates/cyan_crafting_monitor.json | 30 +- .../blockstates/cyan_creative_controller.json | 6 +- .../blockstates/cyan_fluid_grid.json | 30 +- .../refinedstorage/blockstates/cyan_grid.json | 30 +- .../blockstates/cyan_pattern_grid.json | 30 +- .../blockstates/cyan_security_manager.json | 30 +- .../cyan_wireless_transmitter.json | 52 +- .../blockstates/fluid_grid.json | 30 +- .../blockstates/gray_controller.json | 6 +- .../blockstates/gray_crafter.json | 50 +- .../blockstates/gray_crafter_manager.json | 30 +- .../blockstates/gray_crafting_grid.json | 30 +- .../blockstates/gray_crafting_monitor.json | 30 +- .../blockstates/gray_creative_controller.json | 6 +- .../blockstates/gray_fluid_grid.json | 30 +- .../refinedstorage/blockstates/gray_grid.json | 30 +- .../blockstates/gray_pattern_grid.json | 30 +- .../blockstates/gray_security_manager.json | 30 +- .../gray_wireless_transmitter.json | 52 +- .../blockstates/green_controller.json | 6 +- .../blockstates/green_crafter.json | 50 +- .../blockstates/green_crafter_manager.json | 30 +- .../blockstates/green_crafting_grid.json | 30 +- .../blockstates/green_crafting_monitor.json | 30 +- .../green_creative_controller.json | 6 +- .../blockstates/green_fluid_grid.json | 30 +- .../blockstates/green_grid.json | 30 +- .../blockstates/green_pattern_grid.json | 30 +- .../blockstates/green_security_manager.json | 30 +- .../green_wireless_transmitter.json | 52 +- .../refinedstorage/blockstates/grid.json | 30 +- .../blockstates/light_gray_controller.json | 6 +- .../blockstates/light_gray_crafter.json | 50 +- .../light_gray_crafter_manager.json | 30 +- .../blockstates/light_gray_crafting_grid.json | 30 +- .../light_gray_crafting_monitor.json | 30 +- .../light_gray_creative_controller.json | 6 +- .../blockstates/light_gray_fluid_grid.json | 30 +- .../blockstates/light_gray_grid.json | 30 +- .../blockstates/light_gray_pattern_grid.json | 30 +- .../light_gray_security_manager.json | 30 +- .../light_gray_wireless_transmitter.json | 52 +- .../blockstates/lime_controller.json | 6 +- .../blockstates/lime_crafter.json | 50 +- .../blockstates/lime_crafter_manager.json | 30 +- .../blockstates/lime_crafting_grid.json | 30 +- .../blockstates/lime_crafting_monitor.json | 30 +- .../blockstates/lime_creative_controller.json | 6 +- .../blockstates/lime_fluid_grid.json | 30 +- .../refinedstorage/blockstates/lime_grid.json | 30 +- .../blockstates/lime_pattern_grid.json | 30 +- .../blockstates/lime_security_manager.json | 30 +- .../lime_wireless_transmitter.json | 52 +- .../blockstates/magenta_controller.json | 6 +- .../blockstates/magenta_crafter.json | 50 +- .../blockstates/magenta_crafter_manager.json | 30 +- .../blockstates/magenta_crafting_grid.json | 30 +- .../blockstates/magenta_crafting_monitor.json | 30 +- .../magenta_creative_controller.json | 6 +- .../blockstates/magenta_fluid_grid.json | 30 +- .../blockstates/magenta_grid.json | 30 +- .../blockstates/magenta_pattern_grid.json | 30 +- .../blockstates/magenta_security_manager.json | 30 +- .../magenta_wireless_transmitter.json | 52 +- .../blockstates/orange_controller.json | 6 +- .../blockstates/orange_crafter.json | 50 +- .../blockstates/orange_crafter_manager.json | 30 +- .../blockstates/orange_crafting_grid.json | 30 +- .../blockstates/orange_crafting_monitor.json | 30 +- .../orange_creative_controller.json | 6 +- .../blockstates/orange_fluid_grid.json | 30 +- .../blockstates/orange_grid.json | 30 +- .../blockstates/orange_pattern_grid.json | 30 +- .../blockstates/orange_security_manager.json | 30 +- .../orange_wireless_transmitter.json | 52 +- .../blockstates/pattern_grid.json | 30 +- .../blockstates/pink_controller.json | 6 +- .../blockstates/pink_crafter.json | 50 +- .../blockstates/pink_crafter_manager.json | 30 +- .../blockstates/pink_crafting_grid.json | 30 +- .../blockstates/pink_crafting_monitor.json | 30 +- .../blockstates/pink_creative_controller.json | 6 +- .../blockstates/pink_fluid_grid.json | 30 +- .../refinedstorage/blockstates/pink_grid.json | 30 +- .../blockstates/pink_pattern_grid.json | 30 +- .../blockstates/pink_security_manager.json | 30 +- .../pink_wireless_transmitter.json | 52 +- .../blockstates/purple_controller.json | 6 +- .../blockstates/purple_crafter.json | 50 +- .../blockstates/purple_crafter_manager.json | 30 +- .../blockstates/purple_crafting_grid.json | 30 +- .../blockstates/purple_crafting_monitor.json | 30 +- .../purple_creative_controller.json | 6 +- .../blockstates/purple_fluid_grid.json | 30 +- .../blockstates/purple_grid.json | 30 +- .../blockstates/purple_pattern_grid.json | 30 +- .../blockstates/purple_security_manager.json | 30 +- .../purple_wireless_transmitter.json | 52 +- .../blockstates/red_controller.json | 6 +- .../blockstates/red_crafter.json | 50 +- .../blockstates/red_crafter_manager.json | 30 +- .../blockstates/red_crafting_grid.json | 30 +- .../blockstates/red_crafting_monitor.json | 30 +- .../blockstates/red_creative_controller.json | 6 +- .../blockstates/red_fluid_grid.json | 30 +- .../refinedstorage/blockstates/red_grid.json | 30 +- .../blockstates/red_pattern_grid.json | 30 +- .../blockstates/red_security_manager.json | 30 +- .../blockstates/red_wireless_transmitter.json | 52 +- .../blockstates/security_manager.json | 30 +- .../blockstates/white_controller.json | 6 +- .../blockstates/white_crafter.json | 50 +- .../blockstates/white_crafter_manager.json | 30 +- .../blockstates/white_crafting_grid.json | 30 +- .../blockstates/white_crafting_monitor.json | 30 +- .../white_creative_controller.json | 6 +- .../blockstates/white_fluid_grid.json | 30 +- .../blockstates/white_grid.json | 30 +- .../blockstates/white_pattern_grid.json | 30 +- .../blockstates/white_security_manager.json | 30 +- .../white_wireless_transmitter.json | 52 +- .../blockstates/wireless_transmitter.json | 52 +- .../blockstates/yellow_controller.json | 6 +- .../blockstates/yellow_crafter.json | 50 +- .../blockstates/yellow_crafter_manager.json | 30 +- .../blockstates/yellow_crafting_grid.json | 30 +- .../blockstates/yellow_crafting_monitor.json | 30 +- .../yellow_creative_controller.json | 6 +- .../blockstates/yellow_fluid_grid.json | 30 +- .../blockstates/yellow_grid.json | 30 +- .../blockstates/yellow_pattern_grid.json | 30 +- .../blockstates/yellow_security_manager.json | 30 +- .../yellow_wireless_transmitter.json | 52 +- .../models/block/controller/black.json | 4 +- .../models/block/controller/blue.json | 4 +- .../models/block/controller/brown.json | 4 +- .../models/block/controller/cyan.json | 4 +- .../models/block/controller/gray.json | 4 +- .../models/block/controller/green.json | 4 +- .../models/block/controller/light_blue.json | 4 +- .../models/block/controller/light_gray.json | 4 +- .../models/block/controller/lime.json | 4 +- .../models/block/controller/magenta.json | 4 +- .../models/block/controller/nearly_off.json | 4 +- .../models/block/controller/nearly_on.json | 4 +- .../models/block/controller/off.json | 4 +- .../models/block/controller/orange.json | 4 +- .../models/block/controller/pink.json | 4 +- .../models/block/controller/purple.json | 4 +- .../models/block/controller/red.json | 4 +- .../models/block/controller/white.json | 4 +- .../models/block/controller/yellow.json | 4 +- .../models/block/crafter/black.json | 20 +- .../models/block/crafter/blue.json | 20 +- .../models/block/crafter/brown.json | 20 +- .../models/block/crafter/cyan.json | 20 +- .../models/block/crafter/disconnected.json | 20 +- .../models/block/crafter/gray.json | 20 +- .../models/block/crafter/green.json | 20 +- .../models/block/crafter/light_blue.json | 20 +- .../models/block/crafter/light_gray.json | 20 +- .../models/block/crafter/lime.json | 20 +- .../models/block/crafter/magenta.json | 20 +- .../models/block/crafter/orange.json | 20 +- .../models/block/crafter/pink.json | 20 +- .../models/block/crafter/purple.json | 20 +- .../models/block/crafter/red.json | 20 +- .../models/block/crafter/white.json | 20 +- .../models/block/crafter/yellow.json | 20 +- .../models/block/crafter_manager/black.json | 12 +- .../models/block/crafter_manager/blue.json | 12 +- .../models/block/crafter_manager/brown.json | 12 +- .../models/block/crafter_manager/cyan.json | 12 +- .../block/crafter_manager/disconnected.json | 12 +- .../models/block/crafter_manager/gray.json | 12 +- .../models/block/crafter_manager/green.json | 12 +- .../block/crafter_manager/light_blue.json | 12 +- .../block/crafter_manager/light_gray.json | 12 +- .../models/block/crafter_manager/lime.json | 12 +- .../models/block/crafter_manager/magenta.json | 12 +- .../models/block/crafter_manager/orange.json | 12 +- .../models/block/crafter_manager/pink.json | 12 +- .../models/block/crafter_manager/purple.json | 12 +- .../models/block/crafter_manager/red.json | 12 +- .../models/block/crafter_manager/white.json | 12 +- .../models/block/crafter_manager/yellow.json | 12 +- .../models/block/crafting_grid/black.json | 12 +- .../models/block/crafting_grid/blue.json | 12 +- .../models/block/crafting_grid/brown.json | 12 +- .../models/block/crafting_grid/cyan.json | 12 +- .../block/crafting_grid/disconnected.json | 12 +- .../models/block/crafting_grid/gray.json | 12 +- .../models/block/crafting_grid/green.json | 12 +- .../block/crafting_grid/light_blue.json | 12 +- .../block/crafting_grid/light_gray.json | 12 +- .../models/block/crafting_grid/lime.json | 12 +- .../models/block/crafting_grid/magenta.json | 12 +- .../models/block/crafting_grid/orange.json | 12 +- .../models/block/crafting_grid/pink.json | 12 +- .../models/block/crafting_grid/purple.json | 12 +- .../models/block/crafting_grid/red.json | 12 +- .../models/block/crafting_grid/white.json | 12 +- .../models/block/crafting_grid/yellow.json | 12 +- .../models/block/crafting_monitor/black.json | 12 +- .../models/block/crafting_monitor/blue.json | 12 +- .../models/block/crafting_monitor/brown.json | 12 +- .../models/block/crafting_monitor/cyan.json | 12 +- .../block/crafting_monitor/disconnected.json | 12 +- .../models/block/crafting_monitor/gray.json | 12 +- .../models/block/crafting_monitor/green.json | 12 +- .../block/crafting_monitor/light_blue.json | 12 +- .../block/crafting_monitor/light_gray.json | 12 +- .../models/block/crafting_monitor/lime.json | 12 +- .../block/crafting_monitor/magenta.json | 12 +- .../models/block/crafting_monitor/orange.json | 12 +- .../models/block/crafting_monitor/pink.json | 12 +- .../models/block/crafting_monitor/purple.json | 12 +- .../models/block/crafting_monitor/red.json | 12 +- .../models/block/crafting_monitor/white.json | 12 +- .../models/block/crafting_monitor/yellow.json | 12 +- .../models/block/fluid_grid/black.json | 12 +- .../models/block/fluid_grid/blue.json | 12 +- .../models/block/fluid_grid/brown.json | 12 +- .../models/block/fluid_grid/cyan.json | 12 +- .../models/block/fluid_grid/disconnected.json | 12 +- .../models/block/fluid_grid/gray.json | 12 +- .../models/block/fluid_grid/green.json | 12 +- .../models/block/fluid_grid/light_blue.json | 12 +- .../models/block/fluid_grid/light_gray.json | 12 +- .../models/block/fluid_grid/lime.json | 12 +- .../models/block/fluid_grid/magenta.json | 12 +- .../models/block/fluid_grid/orange.json | 12 +- .../models/block/fluid_grid/pink.json | 12 +- .../models/block/fluid_grid/purple.json | 12 +- .../models/block/fluid_grid/red.json | 12 +- .../models/block/fluid_grid/white.json | 12 +- .../models/block/fluid_grid/yellow.json | 12 +- .../models/block/grid/black.json | 12 +- .../models/block/grid/blue.json | 12 +- .../models/block/grid/brown.json | 12 +- .../models/block/grid/cyan.json | 12 +- .../models/block/grid/disconnected.json | 12 +- .../models/block/grid/gray.json | 12 +- .../models/block/grid/green.json | 12 +- .../models/block/grid/light_blue.json | 12 +- .../models/block/grid/light_gray.json | 12 +- .../models/block/grid/lime.json | 12 +- .../models/block/grid/magenta.json | 12 +- .../models/block/grid/orange.json | 12 +- .../models/block/grid/pink.json | 12 +- .../models/block/grid/purple.json | 12 +- .../refinedstorage/models/block/grid/red.json | 12 +- .../models/block/grid/white.json | 12 +- .../models/block/grid/yellow.json | 12 +- .../models/block/network_receiver/black.json | 4 +- .../models/block/network_receiver/blue.json | 4 +- .../models/block/network_receiver/brown.json | 4 +- .../models/block/network_receiver/cyan.json | 4 +- .../block/network_receiver/disconnected.json | 4 +- .../models/block/network_receiver/gray.json | 4 +- .../models/block/network_receiver/green.json | 4 +- .../block/network_receiver/light_blue.json | 4 +- .../block/network_receiver/light_gray.json | 4 +- .../models/block/network_receiver/lime.json | 4 +- .../block/network_receiver/magenta.json | 4 +- .../models/block/network_receiver/orange.json | 4 +- .../models/block/network_receiver/pink.json | 4 +- .../models/block/network_receiver/purple.json | 4 +- .../models/block/network_receiver/red.json | 4 +- .../models/block/network_receiver/white.json | 4 +- .../models/block/network_receiver/yellow.json | 4 +- .../block/network_transmitter/black.json | 4 +- .../block/network_transmitter/blue.json | 4 +- .../block/network_transmitter/brown.json | 4 +- .../block/network_transmitter/cyan.json | 4 +- .../network_transmitter/disconnected.json | 4 +- .../block/network_transmitter/gray.json | 4 +- .../block/network_transmitter/green.json | 4 +- .../block/network_transmitter/light_blue.json | 4 +- .../block/network_transmitter/light_gray.json | 4 +- .../block/network_transmitter/lime.json | 4 +- .../block/network_transmitter/magenta.json | 4 +- .../block/network_transmitter/orange.json | 4 +- .../block/network_transmitter/pink.json | 4 +- .../block/network_transmitter/purple.json | 4 +- .../models/block/network_transmitter/red.json | 4 +- .../block/network_transmitter/white.json | 4 +- .../block/network_transmitter/yellow.json | 4 +- .../models/block/pattern_grid/black.json | 12 +- .../models/block/pattern_grid/blue.json | 12 +- .../models/block/pattern_grid/brown.json | 12 +- .../models/block/pattern_grid/cyan.json | 12 +- .../block/pattern_grid/disconnected.json | 12 +- .../models/block/pattern_grid/gray.json | 12 +- .../models/block/pattern_grid/green.json | 12 +- .../models/block/pattern_grid/light_blue.json | 12 +- .../models/block/pattern_grid/light_gray.json | 12 +- .../models/block/pattern_grid/lime.json | 12 +- .../models/block/pattern_grid/magenta.json | 12 +- .../models/block/pattern_grid/orange.json | 12 +- .../models/block/pattern_grid/pink.json | 12 +- .../models/block/pattern_grid/purple.json | 12 +- .../models/block/pattern_grid/red.json | 12 +- .../models/block/pattern_grid/white.json | 12 +- .../models/block/pattern_grid/yellow.json | 12 +- .../models/block/relay/black.json | 4 +- .../models/block/relay/blue.json | 4 +- .../models/block/relay/brown.json | 4 +- .../models/block/relay/cyan.json | 4 +- .../models/block/relay/disconnected.json | 4 +- .../models/block/relay/gray.json | 4 +- .../models/block/relay/green.json | 4 +- .../models/block/relay/light_blue.json | 4 +- .../models/block/relay/light_gray.json | 4 +- .../models/block/relay/lime.json | 4 +- .../models/block/relay/magenta.json | 4 +- .../models/block/relay/orange.json | 4 +- .../models/block/relay/pink.json | 4 +- .../models/block/relay/purple.json | 4 +- .../models/block/relay/red.json | 4 +- .../models/block/relay/white.json | 4 +- .../models/block/relay/yellow.json | 4 +- .../models/block/security_manager/black.json | 20 +- .../models/block/security_manager/blue.json | 20 +- .../models/block/security_manager/brown.json | 20 +- .../models/block/security_manager/cyan.json | 20 +- .../block/security_manager/disconnected.json | 20 +- .../models/block/security_manager/gray.json | 20 +- .../models/block/security_manager/green.json | 20 +- .../block/security_manager/light_blue.json | 20 +- .../block/security_manager/light_gray.json | 20 +- .../models/block/security_manager/lime.json | 20 +- .../block/security_manager/magenta.json | 20 +- .../models/block/security_manager/orange.json | 20 +- .../models/block/security_manager/pink.json | 20 +- .../models/block/security_manager/purple.json | 20 +- .../models/block/security_manager/red.json | 20 +- .../models/block/security_manager/white.json | 20 +- .../models/block/security_manager/yellow.json | 20 +- .../tags/blocks/relocation_not_supported.json | 21 +- .../blacklist/problematic.json | 1 - .../coloring_recipes/black_controller.json | 29 +- .../coloring_recipes/black_crafter.json | 29 +- .../black_crafter_manager.json | 29 +- .../coloring_recipes/black_crafting_grid.json | 29 +- .../black_crafting_monitor.json | 29 +- .../coloring_recipes/black_detector.json | 29 +- .../black_disk_manipulator.json | 29 +- .../coloring_recipes/black_fluid_grid.json | 29 +- .../coloring_recipes/black_grid.json | 29 +- .../black_network_receiver.json | 29 +- .../black_network_transmitter.json | 29 +- .../coloring_recipes/black_pattern_grid.json | 29 +- .../coloring_recipes/black_relay.json | 29 +- .../black_security_manager.json | 29 +- .../black_wireless_transmitter.json | 29 +- .../coloring_recipes/blue_controller.json | 29 +- .../coloring_recipes/blue_crafter.json | 29 +- .../blue_crafter_manager.json | 29 +- .../coloring_recipes/blue_crafting_grid.json | 29 +- .../blue_crafting_monitor.json | 29 +- .../coloring_recipes/blue_detector.json | 29 +- .../blue_disk_manipulator.json | 29 +- .../coloring_recipes/blue_fluid_grid.json | 29 +- .../coloring_recipes/blue_grid.json | 29 +- .../blue_network_receiver.json | 29 +- .../blue_network_transmitter.json | 29 +- .../coloring_recipes/blue_pattern_grid.json | 29 +- .../coloring_recipes/blue_relay.json | 29 +- .../blue_security_manager.json | 29 +- .../blue_wireless_transmitter.json | 29 +- .../coloring_recipes/brown_controller.json | 29 +- .../coloring_recipes/brown_crafter.json | 29 +- .../brown_crafter_manager.json | 29 +- .../coloring_recipes/brown_crafting_grid.json | 29 +- .../brown_crafting_monitor.json | 29 +- .../coloring_recipes/brown_detector.json | 29 +- .../brown_disk_manipulator.json | 29 +- .../coloring_recipes/brown_fluid_grid.json | 29 +- .../coloring_recipes/brown_grid.json | 29 +- .../brown_network_receiver.json | 29 +- .../brown_network_transmitter.json | 29 +- .../coloring_recipes/brown_pattern_grid.json | 29 +- .../coloring_recipes/brown_relay.json | 29 +- .../brown_security_manager.json | 29 +- .../brown_wireless_transmitter.json | 29 +- .../coloring_recipes/controller.json | 29 +- .../coloring_recipes/crafter.json | 29 +- .../coloring_recipes/crafter_manager.json | 29 +- .../coloring_recipes/crafting_grid.json | 29 +- .../coloring_recipes/crafting_monitor.json | 29 +- .../coloring_recipes/cyan_controller.json | 29 +- .../coloring_recipes/cyan_crafter.json | 29 +- .../cyan_crafter_manager.json | 29 +- .../coloring_recipes/cyan_crafting_grid.json | 29 +- .../cyan_crafting_monitor.json | 29 +- .../coloring_recipes/cyan_detector.json | 29 +- .../cyan_disk_manipulator.json | 29 +- .../coloring_recipes/cyan_fluid_grid.json | 29 +- .../coloring_recipes/cyan_grid.json | 29 +- .../cyan_network_receiver.json | 29 +- .../cyan_network_transmitter.json | 29 +- .../coloring_recipes/cyan_pattern_grid.json | 29 +- .../coloring_recipes/cyan_relay.json | 29 +- .../cyan_security_manager.json | 29 +- .../cyan_wireless_transmitter.json | 29 +- .../coloring_recipes/detector.json | 29 +- .../coloring_recipes/disk_manipulator.json | 29 +- .../coloring_recipes/fluid_grid.json | 29 +- .../coloring_recipes/gray_controller.json | 29 +- .../coloring_recipes/gray_crafter.json | 29 +- .../gray_crafter_manager.json | 29 +- .../coloring_recipes/gray_crafting_grid.json | 29 +- .../gray_crafting_monitor.json | 29 +- .../coloring_recipes/gray_detector.json | 29 +- .../gray_disk_manipulator.json | 29 +- .../coloring_recipes/gray_fluid_grid.json | 29 +- .../coloring_recipes/gray_grid.json | 29 +- .../gray_network_receiver.json | 29 +- .../gray_network_transmitter.json | 29 +- .../coloring_recipes/gray_pattern_grid.json | 29 +- .../coloring_recipes/gray_relay.json | 29 +- .../gray_security_manager.json | 29 +- .../gray_wireless_transmitter.json | 29 +- .../coloring_recipes/green_controller.json | 29 +- .../coloring_recipes/green_crafter.json | 29 +- .../green_crafter_manager.json | 29 +- .../coloring_recipes/green_crafting_grid.json | 29 +- .../green_crafting_monitor.json | 29 +- .../coloring_recipes/green_detector.json | 29 +- .../green_disk_manipulator.json | 29 +- .../coloring_recipes/green_fluid_grid.json | 29 +- .../coloring_recipes/green_grid.json | 29 +- .../green_network_receiver.json | 29 +- .../green_network_transmitter.json | 29 +- .../coloring_recipes/green_pattern_grid.json | 29 +- .../coloring_recipes/green_relay.json | 29 +- .../green_security_manager.json | 29 +- .../green_wireless_transmitter.json | 29 +- .../coloring_recipes/grid.json | 29 +- .../light_gray_controller.json | 29 +- .../coloring_recipes/light_gray_crafter.json | 29 +- .../light_gray_crafter_manager.json | 29 +- .../light_gray_crafting_grid.json | 29 +- .../light_gray_crafting_monitor.json | 29 +- .../coloring_recipes/light_gray_detector.json | 29 +- .../light_gray_disk_manipulator.json | 29 +- .../light_gray_fluid_grid.json | 29 +- .../coloring_recipes/light_gray_grid.json | 29 +- .../light_gray_network_receiver.json | 29 +- .../light_gray_network_transmitter.json | 29 +- .../light_gray_pattern_grid.json | 29 +- .../coloring_recipes/light_gray_relay.json | 29 +- .../light_gray_security_manager.json | 29 +- .../light_gray_wireless_transmitter.json | 29 +- .../coloring_recipes/lime_controller.json | 29 +- .../coloring_recipes/lime_crafter.json | 29 +- .../lime_crafter_manager.json | 29 +- .../coloring_recipes/lime_crafting_grid.json | 29 +- .../lime_crafting_monitor.json | 29 +- .../coloring_recipes/lime_detector.json | 29 +- .../lime_disk_manipulator.json | 29 +- .../coloring_recipes/lime_fluid_grid.json | 29 +- .../coloring_recipes/lime_grid.json | 29 +- .../lime_network_receiver.json | 29 +- .../lime_network_transmitter.json | 29 +- .../coloring_recipes/lime_pattern_grid.json | 29 +- .../coloring_recipes/lime_relay.json | 29 +- .../lime_security_manager.json | 29 +- .../lime_wireless_transmitter.json | 29 +- .../coloring_recipes/magenta_controller.json | 29 +- .../coloring_recipes/magenta_crafter.json | 29 +- .../magenta_crafter_manager.json | 29 +- .../magenta_crafting_grid.json | 29 +- .../magenta_crafting_monitor.json | 29 +- .../coloring_recipes/magenta_detector.json | 29 +- .../magenta_disk_manipulator.json | 29 +- .../coloring_recipes/magenta_fluid_grid.json | 29 +- .../coloring_recipes/magenta_grid.json | 29 +- .../magenta_network_receiver.json | 29 +- .../magenta_network_transmitter.json | 29 +- .../magenta_pattern_grid.json | 29 +- .../coloring_recipes/magenta_relay.json | 29 +- .../magenta_security_manager.json | 29 +- .../magenta_wireless_transmitter.json | 29 +- .../coloring_recipes/network_receiver.json | 29 +- .../coloring_recipes/network_transmitter.json | 29 +- .../coloring_recipes/orange_controller.json | 29 +- .../coloring_recipes/orange_crafter.json | 29 +- .../orange_crafter_manager.json | 29 +- .../orange_crafting_grid.json | 29 +- .../orange_crafting_monitor.json | 29 +- .../coloring_recipes/orange_detector.json | 29 +- .../orange_disk_manipulator.json | 29 +- .../coloring_recipes/orange_fluid_grid.json | 29 +- .../coloring_recipes/orange_grid.json | 29 +- .../orange_network_receiver.json | 29 +- .../orange_network_transmitter.json | 29 +- .../coloring_recipes/orange_pattern_grid.json | 29 +- .../coloring_recipes/orange_relay.json | 29 +- .../orange_security_manager.json | 29 +- .../orange_wireless_transmitter.json | 29 +- .../coloring_recipes/pattern_grid.json | 29 +- .../coloring_recipes/pink_controller.json | 29 +- .../coloring_recipes/pink_crafter.json | 29 +- .../pink_crafter_manager.json | 29 +- .../coloring_recipes/pink_crafting_grid.json | 29 +- .../pink_crafting_monitor.json | 29 +- .../coloring_recipes/pink_detector.json | 29 +- .../pink_disk_manipulator.json | 29 +- .../coloring_recipes/pink_fluid_grid.json | 29 +- .../coloring_recipes/pink_grid.json | 29 +- .../pink_network_receiver.json | 29 +- .../pink_network_transmitter.json | 29 +- .../coloring_recipes/pink_pattern_grid.json | 29 +- .../coloring_recipes/pink_relay.json | 29 +- .../pink_security_manager.json | 29 +- .../pink_wireless_transmitter.json | 29 +- .../coloring_recipes/purple_controller.json | 29 +- .../coloring_recipes/purple_crafter.json | 29 +- .../purple_crafter_manager.json | 29 +- .../purple_crafting_grid.json | 29 +- .../purple_crafting_monitor.json | 29 +- .../coloring_recipes/purple_detector.json | 29 +- .../purple_disk_manipulator.json | 29 +- .../coloring_recipes/purple_fluid_grid.json | 29 +- .../coloring_recipes/purple_grid.json | 29 +- .../purple_network_receiver.json | 29 +- .../purple_network_transmitter.json | 29 +- .../coloring_recipes/purple_pattern_grid.json | 29 +- .../coloring_recipes/purple_relay.json | 29 +- .../purple_security_manager.json | 29 +- .../purple_wireless_transmitter.json | 29 +- .../coloring_recipes/red_controller.json | 29 +- .../coloring_recipes/red_crafter.json | 29 +- .../coloring_recipes/red_crafter_manager.json | 29 +- .../coloring_recipes/red_crafting_grid.json | 29 +- .../red_crafting_monitor.json | 29 +- .../coloring_recipes/red_detector.json | 29 +- .../red_disk_manipulator.json | 29 +- .../coloring_recipes/red_fluid_grid.json | 29 +- .../coloring_recipes/red_grid.json | 29 +- .../red_network_receiver.json | 29 +- .../red_network_transmitter.json | 29 +- .../coloring_recipes/red_pattern_grid.json | 29 +- .../coloring_recipes/red_relay.json | 29 +- .../red_security_manager.json | 29 +- .../red_wireless_transmitter.json | 29 +- .../coloring_recipes/relay.json | 29 +- .../coloring_recipes/security_manager.json | 29 +- .../coloring_recipes/white_controller.json | 29 +- .../coloring_recipes/white_crafter.json | 29 +- .../white_crafter_manager.json | 29 +- .../coloring_recipes/white_crafting_grid.json | 29 +- .../white_crafting_monitor.json | 29 +- .../coloring_recipes/white_detector.json | 29 +- .../white_disk_manipulator.json | 29 +- .../coloring_recipes/white_fluid_grid.json | 29 +- .../coloring_recipes/white_grid.json | 29 +- .../white_network_receiver.json | 29 +- .../white_network_transmitter.json | 29 +- .../coloring_recipes/white_pattern_grid.json | 29 +- .../coloring_recipes/white_relay.json | 29 +- .../white_security_manager.json | 29 +- .../white_wireless_transmitter.json | 29 +- .../wireless_transmitter.json | 29 +- .../coloring_recipes/yellow_controller.json | 29 +- .../coloring_recipes/yellow_crafter.json | 29 +- .../yellow_crafter_manager.json | 29 +- .../yellow_crafting_grid.json | 29 +- .../yellow_crafting_monitor.json | 29 +- .../coloring_recipes/yellow_detector.json | 29 +- .../yellow_disk_manipulator.json | 29 +- .../coloring_recipes/yellow_fluid_grid.json | 29 +- .../coloring_recipes/yellow_grid.json | 29 +- .../yellow_network_receiver.json | 29 +- .../yellow_network_transmitter.json | 29 +- .../coloring_recipes/yellow_pattern_grid.json | 29 +- .../coloring_recipes/yellow_relay.json | 29 +- .../yellow_security_manager.json | 29 +- .../yellow_wireless_transmitter.json | 29 +- .../crafting_grid/black_crafting_grid.json | 29 +- .../crafting_grid/blue_crafting_grid.json | 29 +- .../crafting_grid/brown_crafting_grid.json | 29 +- .../crafting_grid/crafting_grid.json | 29 +- .../crafting_grid/cyan_crafting_grid.json | 29 +- .../crafting_grid/gray_crafting_grid.json | 29 +- .../crafting_grid/green_crafting_grid.json | 29 +- .../light_gray_crafting_grid.json | 29 +- .../crafting_grid/lime_crafting_grid.json | 29 +- .../crafting_grid/magenta_crafting_grid.json | 29 +- .../crafting_grid/orange_crafting_grid.json | 29 +- .../crafting_grid/pink_crafting_grid.json | 29 +- .../crafting_grid/purple_crafting_grid.json | 29 +- .../crafting_grid/red_crafting_grid.json | 29 +- .../crafting_grid/white_crafting_grid.json | 29 +- .../crafting_grid/yellow_crafting_grid.json | 29 +- .../fluid_grid/black_fluid_grid.json | 29 +- .../fluid_grid/blue_fluid_grid.json | 29 +- .../fluid_grid/brown_fluid_grid.json | 29 +- .../fluid_grid/cyan_fluid_grid.json | 29 +- .../fluid_grid/fluid_grid.json | 29 +- .../fluid_grid/gray_fluid_grid.json | 29 +- .../fluid_grid/green_fluid_grid.json | 29 +- .../fluid_grid/light_gray_fluid_grid.json | 29 +- .../fluid_grid/lime_fluid_grid.json | 29 +- .../fluid_grid/magenta_fluid_grid.json | 29 +- .../fluid_grid/orange_fluid_grid.json | 29 +- .../fluid_grid/pink_fluid_grid.json | 29 +- .../fluid_grid/purple_fluid_grid.json | 29 +- .../fluid_grid/red_fluid_grid.json | 29 +- .../fluid_grid/white_fluid_grid.json | 29 +- .../fluid_grid/yellow_fluid_grid.json | 29 +- .../pattern_grid/black_pattern_grid.json | 29 +- .../pattern_grid/blue_pattern_grid.json | 29 +- .../pattern_grid/brown_pattern_grid.json | 29 +- .../pattern_grid/cyan_pattern_grid.json | 29 +- .../pattern_grid/gray_pattern_grid.json | 29 +- .../pattern_grid/green_pattern_grid.json | 29 +- .../pattern_grid/light_gray_pattern_grid.json | 29 +- .../pattern_grid/lime_pattern_grid.json | 29 +- .../pattern_grid/magenta_pattern_grid.json | 29 +- .../pattern_grid/orange_pattern_grid.json | 29 +- .../pattern_grid/pattern_grid.json | 29 +- .../pattern_grid/pink_pattern_grid.json | 29 +- .../pattern_grid/purple_pattern_grid.json | 29 +- .../pattern_grid/red_pattern_grid.json | 29 +- .../pattern_grid/white_pattern_grid.json | 29 +- .../pattern_grid/yellow_pattern_grid.json | 29 +- .../loot_tables/blocks/black_controller.json | 15 +- .../loot_tables/blocks/black_crafter.json | 15 +- .../blocks/black_crafter_manager.json | 15 +- .../blocks/black_crafting_grid.json | 15 +- .../blocks/black_crafting_monitor.json | 15 +- .../blocks/black_creative_controller.json | 15 +- .../loot_tables/blocks/black_detector.json | 15 +- .../blocks/black_disk_manipulator.json | 15 +- .../loot_tables/blocks/black_fluid_grid.json | 15 +- .../loot_tables/blocks/black_grid.json | 15 +- .../blocks/black_network_receiver.json | 15 +- .../blocks/black_network_transmitter.json | 15 +- .../blocks/black_pattern_grid.json | 15 +- .../loot_tables/blocks/black_relay.json | 15 +- .../blocks/black_security_manager.json | 15 +- .../blocks/black_wireless_transmitter.json | 15 +- .../loot_tables/blocks/blue_controller.json | 15 +- .../loot_tables/blocks/blue_crafter.json | 15 +- .../blocks/blue_crafter_manager.json | 15 +- .../blocks/blue_crafting_grid.json | 15 +- .../blocks/blue_crafting_monitor.json | 15 +- .../blocks/blue_creative_controller.json | 15 +- .../loot_tables/blocks/blue_detector.json | 15 +- .../blocks/blue_disk_manipulator.json | 15 +- .../loot_tables/blocks/blue_fluid_grid.json | 15 +- .../loot_tables/blocks/blue_grid.json | 15 +- .../blocks/blue_network_receiver.json | 15 +- .../blocks/blue_network_transmitter.json | 15 +- .../loot_tables/blocks/blue_pattern_grid.json | 15 +- .../loot_tables/blocks/blue_relay.json | 15 +- .../blocks/blue_security_manager.json | 15 +- .../blocks/blue_wireless_transmitter.json | 15 +- .../loot_tables/blocks/brown_controller.json | 15 +- .../loot_tables/blocks/brown_crafter.json | 15 +- .../blocks/brown_crafter_manager.json | 15 +- .../blocks/brown_crafting_grid.json | 15 +- .../blocks/brown_crafting_monitor.json | 15 +- .../blocks/brown_creative_controller.json | 15 +- .../loot_tables/blocks/brown_detector.json | 15 +- .../blocks/brown_disk_manipulator.json | 15 +- .../loot_tables/blocks/brown_fluid_grid.json | 15 +- .../loot_tables/blocks/brown_grid.json | 15 +- .../blocks/brown_network_receiver.json | 15 +- .../blocks/brown_network_transmitter.json | 15 +- .../blocks/brown_pattern_grid.json | 15 +- .../loot_tables/blocks/brown_relay.json | 15 +- .../blocks/brown_security_manager.json | 15 +- .../blocks/brown_wireless_transmitter.json | 15 +- .../loot_tables/blocks/controller.json | 15 +- .../loot_tables/blocks/crafter.json | 15 +- .../loot_tables/blocks/crafter_manager.json | 15 +- .../loot_tables/blocks/crafting_grid.json | 15 +- .../loot_tables/blocks/crafting_monitor.json | 15 +- .../blocks/creative_controller.json | 15 +- .../loot_tables/blocks/cyan_controller.json | 15 +- .../loot_tables/blocks/cyan_crafter.json | 15 +- .../blocks/cyan_crafter_manager.json | 15 +- .../blocks/cyan_crafting_grid.json | 15 +- .../blocks/cyan_crafting_monitor.json | 15 +- .../blocks/cyan_creative_controller.json | 15 +- .../loot_tables/blocks/cyan_detector.json | 15 +- .../blocks/cyan_disk_manipulator.json | 15 +- .../loot_tables/blocks/cyan_fluid_grid.json | 15 +- .../loot_tables/blocks/cyan_grid.json | 15 +- .../blocks/cyan_network_receiver.json | 15 +- .../blocks/cyan_network_transmitter.json | 15 +- .../loot_tables/blocks/cyan_pattern_grid.json | 15 +- .../loot_tables/blocks/cyan_relay.json | 15 +- .../blocks/cyan_security_manager.json | 15 +- .../blocks/cyan_wireless_transmitter.json | 15 +- .../loot_tables/blocks/detector.json | 15 +- .../loot_tables/blocks/disk_manipulator.json | 15 +- .../loot_tables/blocks/fluid_grid.json | 15 +- .../loot_tables/blocks/gray_controller.json | 15 +- .../loot_tables/blocks/gray_crafter.json | 15 +- .../blocks/gray_crafter_manager.json | 15 +- .../blocks/gray_crafting_grid.json | 15 +- .../blocks/gray_crafting_monitor.json | 15 +- .../blocks/gray_creative_controller.json | 15 +- .../loot_tables/blocks/gray_detector.json | 15 +- .../blocks/gray_disk_manipulator.json | 15 +- .../loot_tables/blocks/gray_fluid_grid.json | 15 +- .../loot_tables/blocks/gray_grid.json | 15 +- .../blocks/gray_network_receiver.json | 15 +- .../blocks/gray_network_transmitter.json | 15 +- .../loot_tables/blocks/gray_pattern_grid.json | 15 +- .../loot_tables/blocks/gray_relay.json | 15 +- .../blocks/gray_security_manager.json | 15 +- .../blocks/gray_wireless_transmitter.json | 15 +- .../loot_tables/blocks/green_controller.json | 15 +- .../loot_tables/blocks/green_crafter.json | 15 +- .../blocks/green_crafter_manager.json | 15 +- .../blocks/green_crafting_grid.json | 15 +- .../blocks/green_crafting_monitor.json | 15 +- .../blocks/green_creative_controller.json | 15 +- .../loot_tables/blocks/green_detector.json | 15 +- .../blocks/green_disk_manipulator.json | 15 +- .../loot_tables/blocks/green_fluid_grid.json | 15 +- .../loot_tables/blocks/green_grid.json | 15 +- .../blocks/green_network_receiver.json | 15 +- .../blocks/green_network_transmitter.json | 15 +- .../blocks/green_pattern_grid.json | 15 +- .../loot_tables/blocks/green_relay.json | 15 +- .../blocks/green_security_manager.json | 15 +- .../blocks/green_wireless_transmitter.json | 15 +- .../loot_tables/blocks/grid.json | 15 +- .../blocks/light_gray_controller.json | 15 +- .../blocks/light_gray_crafter.json | 15 +- .../blocks/light_gray_crafter_manager.json | 15 +- .../blocks/light_gray_crafting_grid.json | 15 +- .../blocks/light_gray_crafting_monitor.json | 15 +- .../light_gray_creative_controller.json | 15 +- .../blocks/light_gray_detector.json | 15 +- .../blocks/light_gray_disk_manipulator.json | 15 +- .../blocks/light_gray_fluid_grid.json | 15 +- .../loot_tables/blocks/light_gray_grid.json | 15 +- .../blocks/light_gray_network_receiver.json | 15 +- .../light_gray_network_transmitter.json | 15 +- .../blocks/light_gray_pattern_grid.json | 15 +- .../loot_tables/blocks/light_gray_relay.json | 15 +- .../blocks/light_gray_security_manager.json | 15 +- .../light_gray_wireless_transmitter.json | 15 +- .../loot_tables/blocks/lime_controller.json | 15 +- .../loot_tables/blocks/lime_crafter.json | 15 +- .../blocks/lime_crafter_manager.json | 15 +- .../blocks/lime_crafting_grid.json | 15 +- .../blocks/lime_crafting_monitor.json | 15 +- .../blocks/lime_creative_controller.json | 15 +- .../loot_tables/blocks/lime_detector.json | 15 +- .../blocks/lime_disk_manipulator.json | 15 +- .../loot_tables/blocks/lime_fluid_grid.json | 15 +- .../loot_tables/blocks/lime_grid.json | 15 +- .../blocks/lime_network_receiver.json | 15 +- .../blocks/lime_network_transmitter.json | 15 +- .../loot_tables/blocks/lime_pattern_grid.json | 15 +- .../loot_tables/blocks/lime_relay.json | 15 +- .../blocks/lime_security_manager.json | 15 +- .../blocks/lime_wireless_transmitter.json | 15 +- .../blocks/magenta_controller.json | 15 +- .../loot_tables/blocks/magenta_crafter.json | 15 +- .../blocks/magenta_crafter_manager.json | 15 +- .../blocks/magenta_crafting_grid.json | 15 +- .../blocks/magenta_crafting_monitor.json | 15 +- .../blocks/magenta_creative_controller.json | 15 +- .../loot_tables/blocks/magenta_detector.json | 15 +- .../blocks/magenta_disk_manipulator.json | 15 +- .../blocks/magenta_fluid_grid.json | 15 +- .../loot_tables/blocks/magenta_grid.json | 15 +- .../blocks/magenta_network_receiver.json | 15 +- .../blocks/magenta_network_transmitter.json | 15 +- .../blocks/magenta_pattern_grid.json | 15 +- .../loot_tables/blocks/magenta_relay.json | 15 +- .../blocks/magenta_security_manager.json | 15 +- .../blocks/magenta_wireless_transmitter.json | 15 +- .../loot_tables/blocks/network_receiver.json | 15 +- .../blocks/network_transmitter.json | 15 +- .../loot_tables/blocks/orange_controller.json | 15 +- .../loot_tables/blocks/orange_crafter.json | 15 +- .../blocks/orange_crafter_manager.json | 15 +- .../blocks/orange_crafting_grid.json | 15 +- .../blocks/orange_crafting_monitor.json | 15 +- .../blocks/orange_creative_controller.json | 15 +- .../loot_tables/blocks/orange_detector.json | 15 +- .../blocks/orange_disk_manipulator.json | 15 +- .../loot_tables/blocks/orange_fluid_grid.json | 15 +- .../loot_tables/blocks/orange_grid.json | 15 +- .../blocks/orange_network_receiver.json | 15 +- .../blocks/orange_network_transmitter.json | 15 +- .../blocks/orange_pattern_grid.json | 15 +- .../loot_tables/blocks/orange_relay.json | 15 +- .../blocks/orange_security_manager.json | 15 +- .../blocks/orange_wireless_transmitter.json | 15 +- .../loot_tables/blocks/pattern_grid.json | 15 +- .../loot_tables/blocks/pink_controller.json | 15 +- .../loot_tables/blocks/pink_crafter.json | 15 +- .../blocks/pink_crafter_manager.json | 15 +- .../blocks/pink_crafting_grid.json | 15 +- .../blocks/pink_crafting_monitor.json | 15 +- .../blocks/pink_creative_controller.json | 15 +- .../loot_tables/blocks/pink_detector.json | 15 +- .../blocks/pink_disk_manipulator.json | 15 +- .../loot_tables/blocks/pink_fluid_grid.json | 15 +- .../loot_tables/blocks/pink_grid.json | 15 +- .../blocks/pink_network_receiver.json | 15 +- .../blocks/pink_network_transmitter.json | 15 +- .../loot_tables/blocks/pink_pattern_grid.json | 15 +- .../loot_tables/blocks/pink_relay.json | 15 +- .../blocks/pink_security_manager.json | 15 +- .../blocks/pink_wireless_transmitter.json | 15 +- .../loot_tables/blocks/purple_controller.json | 15 +- .../loot_tables/blocks/purple_crafter.json | 15 +- .../blocks/purple_crafter_manager.json | 15 +- .../blocks/purple_crafting_grid.json | 15 +- .../blocks/purple_crafting_monitor.json | 15 +- .../blocks/purple_creative_controller.json | 15 +- .../loot_tables/blocks/purple_detector.json | 15 +- .../blocks/purple_disk_manipulator.json | 15 +- .../loot_tables/blocks/purple_fluid_grid.json | 15 +- .../loot_tables/blocks/purple_grid.json | 15 +- .../blocks/purple_network_receiver.json | 15 +- .../blocks/purple_network_transmitter.json | 15 +- .../blocks/purple_pattern_grid.json | 15 +- .../loot_tables/blocks/purple_relay.json | 15 +- .../blocks/purple_security_manager.json | 15 +- .../blocks/purple_wireless_transmitter.json | 15 +- .../loot_tables/blocks/red_controller.json | 15 +- .../loot_tables/blocks/red_crafter.json | 15 +- .../blocks/red_crafter_manager.json | 15 +- .../loot_tables/blocks/red_crafting_grid.json | 15 +- .../blocks/red_crafting_monitor.json | 15 +- .../blocks/red_creative_controller.json | 15 +- .../loot_tables/blocks/red_detector.json | 15 +- .../blocks/red_disk_manipulator.json | 15 +- .../loot_tables/blocks/red_fluid_grid.json | 15 +- .../loot_tables/blocks/red_grid.json | 15 +- .../blocks/red_network_receiver.json | 15 +- .../blocks/red_network_transmitter.json | 15 +- .../loot_tables/blocks/red_pattern_grid.json | 15 +- .../loot_tables/blocks/red_relay.json | 15 +- .../blocks/red_security_manager.json | 15 +- .../blocks/red_wireless_transmitter.json | 15 +- .../loot_tables/blocks/relay.json | 15 +- .../loot_tables/blocks/security_manager.json | 15 +- .../loot_tables/blocks/white_controller.json | 15 +- .../loot_tables/blocks/white_crafter.json | 15 +- .../blocks/white_crafter_manager.json | 15 +- .../blocks/white_crafting_grid.json | 15 +- .../blocks/white_crafting_monitor.json | 15 +- .../blocks/white_creative_controller.json | 15 +- .../loot_tables/blocks/white_detector.json | 15 +- .../blocks/white_disk_manipulator.json | 15 +- .../loot_tables/blocks/white_fluid_grid.json | 15 +- .../loot_tables/blocks/white_grid.json | 15 +- .../blocks/white_network_receiver.json | 15 +- .../blocks/white_network_transmitter.json | 15 +- .../blocks/white_pattern_grid.json | 15 +- .../loot_tables/blocks/white_relay.json | 15 +- .../blocks/white_security_manager.json | 15 +- .../blocks/white_wireless_transmitter.json | 15 +- .../blocks/wireless_transmitter.json | 15 +- .../loot_tables/blocks/yellow_controller.json | 15 +- .../loot_tables/blocks/yellow_crafter.json | 15 +- .../blocks/yellow_crafter_manager.json | 15 +- .../blocks/yellow_crafting_grid.json | 15 +- .../blocks/yellow_crafting_monitor.json | 15 +- .../blocks/yellow_creative_controller.json | 15 +- .../loot_tables/blocks/yellow_detector.json | 15 +- .../blocks/yellow_disk_manipulator.json | 15 +- .../loot_tables/blocks/yellow_fluid_grid.json | 15 +- .../loot_tables/blocks/yellow_grid.json | 15 +- .../blocks/yellow_network_receiver.json | 15 +- .../blocks/yellow_network_transmitter.json | 15 +- .../blocks/yellow_pattern_grid.json | 15 +- .../loot_tables/blocks/yellow_relay.json | 15 +- .../blocks/yellow_security_manager.json | 15 +- .../blocks/yellow_wireless_transmitter.json | 15 +- .../coloring_recipes/black_controller.json | 1 + .../coloring_recipes/black_crafter.json | 1 + .../black_crafter_manager.json | 1 + .../coloring_recipes/black_crafting_grid.json | 1 + .../black_crafting_monitor.json | 1 + .../coloring_recipes/black_detector.json | 1 + .../black_disk_manipulator.json | 1 + .../coloring_recipes/black_fluid_grid.json | 1 + .../recipes/coloring_recipes/black_grid.json | 1 + .../black_network_receiver.json | 1 + .../black_network_transmitter.json | 1 + .../coloring_recipes/black_pattern_grid.json | 1 + .../recipes/coloring_recipes/black_relay.json | 1 + .../black_security_manager.json | 1 + .../black_wireless_transmitter.json | 1 + .../coloring_recipes/blue_controller.json | 1 + .../coloring_recipes/blue_crafter.json | 1 + .../blue_crafter_manager.json | 1 + .../coloring_recipes/blue_crafting_grid.json | 1 + .../blue_crafting_monitor.json | 1 + .../coloring_recipes/blue_detector.json | 1 + .../blue_disk_manipulator.json | 1 + .../coloring_recipes/blue_fluid_grid.json | 1 + .../recipes/coloring_recipes/blue_grid.json | 1 + .../blue_network_receiver.json | 1 + .../blue_network_transmitter.json | 1 + .../coloring_recipes/blue_pattern_grid.json | 1 + .../recipes/coloring_recipes/blue_relay.json | 1 + .../blue_security_manager.json | 1 + .../blue_wireless_transmitter.json | 1 + .../coloring_recipes/brown_controller.json | 1 + .../coloring_recipes/brown_crafter.json | 1 + .../brown_crafter_manager.json | 1 + .../coloring_recipes/brown_crafting_grid.json | 1 + .../brown_crafting_monitor.json | 1 + .../coloring_recipes/brown_detector.json | 1 + .../brown_disk_manipulator.json | 1 + .../coloring_recipes/brown_fluid_grid.json | 1 + .../recipes/coloring_recipes/brown_grid.json | 1 + .../brown_network_receiver.json | 1 + .../brown_network_transmitter.json | 1 + .../coloring_recipes/brown_pattern_grid.json | 1 + .../recipes/coloring_recipes/brown_relay.json | 1 + .../brown_security_manager.json | 1 + .../brown_wireless_transmitter.json | 1 + .../recipes/coloring_recipes/controller.json | 1 + .../recipes/coloring_recipes/crafter.json | 1 + .../coloring_recipes/crafter_manager.json | 1 + .../coloring_recipes/crafting_grid.json | 1 + .../coloring_recipes/crafting_monitor.json | 1 + .../coloring_recipes/cyan_controller.json | 1 + .../coloring_recipes/cyan_crafter.json | 1 + .../cyan_crafter_manager.json | 1 + .../coloring_recipes/cyan_crafting_grid.json | 1 + .../cyan_crafting_monitor.json | 1 + .../coloring_recipes/cyan_detector.json | 1 + .../cyan_disk_manipulator.json | 1 + .../coloring_recipes/cyan_fluid_grid.json | 1 + .../recipes/coloring_recipes/cyan_grid.json | 1 + .../cyan_network_receiver.json | 1 + .../cyan_network_transmitter.json | 1 + .../coloring_recipes/cyan_pattern_grid.json | 1 + .../recipes/coloring_recipes/cyan_relay.json | 1 + .../cyan_security_manager.json | 1 + .../cyan_wireless_transmitter.json | 1 + .../recipes/coloring_recipes/detector.json | 1 + .../coloring_recipes/disk_manipulator.json | 1 + .../recipes/coloring_recipes/fluid_grid.json | 1 + .../coloring_recipes/gray_controller.json | 1 + .../coloring_recipes/gray_crafter.json | 1 + .../gray_crafter_manager.json | 1 + .../coloring_recipes/gray_crafting_grid.json | 1 + .../gray_crafting_monitor.json | 1 + .../coloring_recipes/gray_detector.json | 1 + .../gray_disk_manipulator.json | 1 + .../coloring_recipes/gray_fluid_grid.json | 1 + .../recipes/coloring_recipes/gray_grid.json | 1 + .../gray_network_receiver.json | 1 + .../gray_network_transmitter.json | 1 + .../coloring_recipes/gray_pattern_grid.json | 1 + .../recipes/coloring_recipes/gray_relay.json | 1 + .../gray_security_manager.json | 1 + .../gray_wireless_transmitter.json | 1 + .../coloring_recipes/green_controller.json | 1 + .../coloring_recipes/green_crafter.json | 1 + .../green_crafter_manager.json | 1 + .../coloring_recipes/green_crafting_grid.json | 1 + .../green_crafting_monitor.json | 1 + .../coloring_recipes/green_detector.json | 1 + .../green_disk_manipulator.json | 1 + .../coloring_recipes/green_fluid_grid.json | 1 + .../recipes/coloring_recipes/green_grid.json | 1 + .../green_network_receiver.json | 1 + .../green_network_transmitter.json | 1 + .../coloring_recipes/green_pattern_grid.json | 1 + .../recipes/coloring_recipes/green_relay.json | 1 + .../green_security_manager.json | 1 + .../green_wireless_transmitter.json | 1 + .../recipes/coloring_recipes/grid.json | 1 + .../light_gray_controller.json | 1 + .../coloring_recipes/light_gray_crafter.json | 1 + .../light_gray_crafter_manager.json | 1 + .../light_gray_crafting_grid.json | 1 + .../light_gray_crafting_monitor.json | 1 + .../coloring_recipes/light_gray_detector.json | 1 + .../light_gray_disk_manipulator.json | 1 + .../light_gray_fluid_grid.json | 1 + .../coloring_recipes/light_gray_grid.json | 1 + .../light_gray_network_receiver.json | 1 + .../light_gray_network_transmitter.json | 1 + .../light_gray_pattern_grid.json | 1 + .../coloring_recipes/light_gray_relay.json | 1 + .../light_gray_security_manager.json | 1 + .../light_gray_wireless_transmitter.json | 1 + .../coloring_recipes/lime_controller.json | 1 + .../coloring_recipes/lime_crafter.json | 1 + .../lime_crafter_manager.json | 1 + .../coloring_recipes/lime_crafting_grid.json | 1 + .../lime_crafting_monitor.json | 1 + .../coloring_recipes/lime_detector.json | 1 + .../lime_disk_manipulator.json | 1 + .../coloring_recipes/lime_fluid_grid.json | 1 + .../recipes/coloring_recipes/lime_grid.json | 1 + .../lime_network_receiver.json | 1 + .../lime_network_transmitter.json | 1 + .../coloring_recipes/lime_pattern_grid.json | 1 + .../recipes/coloring_recipes/lime_relay.json | 1 + .../lime_security_manager.json | 1 + .../lime_wireless_transmitter.json | 1 + .../coloring_recipes/magenta_controller.json | 1 + .../coloring_recipes/magenta_crafter.json | 1 + .../magenta_crafter_manager.json | 1 + .../magenta_crafting_grid.json | 1 + .../magenta_crafting_monitor.json | 1 + .../coloring_recipes/magenta_detector.json | 1 + .../magenta_disk_manipulator.json | 1 + .../coloring_recipes/magenta_fluid_grid.json | 1 + .../coloring_recipes/magenta_grid.json | 1 + .../magenta_network_receiver.json | 1 + .../magenta_network_transmitter.json | 1 + .../magenta_pattern_grid.json | 1 + .../coloring_recipes/magenta_relay.json | 1 + .../magenta_security_manager.json | 1 + .../magenta_wireless_transmitter.json | 1 + .../coloring_recipes/network_receiver.json | 1 + .../coloring_recipes/network_transmitter.json | 1 + .../coloring_recipes/orange_controller.json | 1 + .../coloring_recipes/orange_crafter.json | 1 + .../orange_crafter_manager.json | 1 + .../orange_crafting_grid.json | 1 + .../orange_crafting_monitor.json | 1 + .../coloring_recipes/orange_detector.json | 1 + .../orange_disk_manipulator.json | 1 + .../coloring_recipes/orange_fluid_grid.json | 1 + .../recipes/coloring_recipes/orange_grid.json | 1 + .../orange_network_receiver.json | 1 + .../orange_network_transmitter.json | 1 + .../coloring_recipes/orange_pattern_grid.json | 1 + .../coloring_recipes/orange_relay.json | 1 + .../orange_security_manager.json | 1 + .../orange_wireless_transmitter.json | 1 + .../coloring_recipes/pattern_grid.json | 1 + .../coloring_recipes/pink_controller.json | 1 + .../coloring_recipes/pink_crafter.json | 1 + .../pink_crafter_manager.json | 1 + .../coloring_recipes/pink_crafting_grid.json | 1 + .../pink_crafting_monitor.json | 1 + .../coloring_recipes/pink_detector.json | 1 + .../pink_disk_manipulator.json | 1 + .../coloring_recipes/pink_fluid_grid.json | 1 + .../recipes/coloring_recipes/pink_grid.json | 1 + .../pink_network_receiver.json | 1 + .../pink_network_transmitter.json | 1 + .../coloring_recipes/pink_pattern_grid.json | 1 + .../recipes/coloring_recipes/pink_relay.json | 1 + .../pink_security_manager.json | 1 + .../pink_wireless_transmitter.json | 1 + .../coloring_recipes/purple_controller.json | 1 + .../coloring_recipes/purple_crafter.json | 1 + .../purple_crafter_manager.json | 1 + .../purple_crafting_grid.json | 1 + .../purple_crafting_monitor.json | 1 + .../coloring_recipes/purple_detector.json | 1 + .../purple_disk_manipulator.json | 1 + .../coloring_recipes/purple_fluid_grid.json | 1 + .../recipes/coloring_recipes/purple_grid.json | 1 + .../purple_network_receiver.json | 1 + .../purple_network_transmitter.json | 1 + .../coloring_recipes/purple_pattern_grid.json | 1 + .../coloring_recipes/purple_relay.json | 1 + .../purple_security_manager.json | 1 + .../purple_wireless_transmitter.json | 1 + .../coloring_recipes/red_controller.json | 1 + .../recipes/coloring_recipes/red_crafter.json | 1 + .../coloring_recipes/red_crafter_manager.json | 1 + .../coloring_recipes/red_crafting_grid.json | 1 + .../red_crafting_monitor.json | 1 + .../coloring_recipes/red_detector.json | 1 + .../red_disk_manipulator.json | 1 + .../coloring_recipes/red_fluid_grid.json | 1 + .../recipes/coloring_recipes/red_grid.json | 1 + .../red_network_receiver.json | 1 + .../red_network_transmitter.json | 1 + .../coloring_recipes/red_pattern_grid.json | 1 + .../recipes/coloring_recipes/red_relay.json | 1 + .../red_security_manager.json | 1 + .../red_wireless_transmitter.json | 1 + .../recipes/coloring_recipes/relay.json | 1 + .../coloring_recipes/security_manager.json | 1 + .../coloring_recipes/white_controller.json | 1 + .../coloring_recipes/white_crafter.json | 1 + .../white_crafter_manager.json | 1 + .../coloring_recipes/white_crafting_grid.json | 1 + .../white_crafting_monitor.json | 1 + .../coloring_recipes/white_detector.json | 1 + .../white_disk_manipulator.json | 1 + .../coloring_recipes/white_fluid_grid.json | 1 + .../recipes/coloring_recipes/white_grid.json | 1 + .../white_network_receiver.json | 1 + .../white_network_transmitter.json | 1 + .../coloring_recipes/white_pattern_grid.json | 1 + .../recipes/coloring_recipes/white_relay.json | 1 + .../white_security_manager.json | 1 + .../white_wireless_transmitter.json | 1 + .../wireless_transmitter.json | 1 + .../coloring_recipes/yellow_controller.json | 1 + .../coloring_recipes/yellow_crafter.json | 1 + .../yellow_crafter_manager.json | 1 + .../yellow_crafting_grid.json | 1 + .../yellow_crafting_monitor.json | 1 + .../coloring_recipes/yellow_detector.json | 1 + .../yellow_disk_manipulator.json | 1 + .../coloring_recipes/yellow_fluid_grid.json | 1 + .../recipes/coloring_recipes/yellow_grid.json | 1 + .../yellow_network_receiver.json | 1 + .../yellow_network_transmitter.json | 1 + .../coloring_recipes/yellow_pattern_grid.json | 1 + .../coloring_recipes/yellow_relay.json | 1 + .../yellow_security_manager.json | 1 + .../yellow_wireless_transmitter.json | 1 + .../crafting_grid/black_crafting_grid.json | 1 + .../crafting_grid/blue_crafting_grid.json | 1 + .../crafting_grid/brown_crafting_grid.json | 1 + .../recipes/crafting_grid/crafting_grid.json | 1 + .../crafting_grid/cyan_crafting_grid.json | 1 + .../crafting_grid/gray_crafting_grid.json | 1 + .../crafting_grid/green_crafting_grid.json | 1 + .../light_gray_crafting_grid.json | 1 + .../crafting_grid/lime_crafting_grid.json | 1 + .../crafting_grid/magenta_crafting_grid.json | 1 + .../crafting_grid/orange_crafting_grid.json | 1 + .../crafting_grid/pink_crafting_grid.json | 1 + .../crafting_grid/purple_crafting_grid.json | 1 + .../crafting_grid/red_crafting_grid.json | 1 + .../crafting_grid/white_crafting_grid.json | 1 + .../crafting_grid/yellow_crafting_grid.json | 1 + .../recipes/fluid_grid/black_fluid_grid.json | 1 + .../recipes/fluid_grid/blue_fluid_grid.json | 1 + .../recipes/fluid_grid/brown_fluid_grid.json | 1 + .../recipes/fluid_grid/cyan_fluid_grid.json | 1 + .../recipes/fluid_grid/fluid_grid.json | 1 + .../recipes/fluid_grid/gray_fluid_grid.json | 1 + .../recipes/fluid_grid/green_fluid_grid.json | 1 + .../fluid_grid/light_gray_fluid_grid.json | 1 + .../recipes/fluid_grid/lime_fluid_grid.json | 1 + .../fluid_grid/magenta_fluid_grid.json | 1 + .../recipes/fluid_grid/orange_fluid_grid.json | 1 + .../recipes/fluid_grid/pink_fluid_grid.json | 1 + .../recipes/fluid_grid/purple_fluid_grid.json | 1 + .../recipes/fluid_grid/red_fluid_grid.json | 1 + .../recipes/fluid_grid/white_fluid_grid.json | 1 + .../recipes/fluid_grid/yellow_fluid_grid.json | 1 + .../pattern_grid/black_pattern_grid.json | 1 + .../pattern_grid/blue_pattern_grid.json | 1 + .../pattern_grid/brown_pattern_grid.json | 1 + .../pattern_grid/cyan_pattern_grid.json | 1 + .../pattern_grid/gray_pattern_grid.json | 1 + .../pattern_grid/green_pattern_grid.json | 1 + .../pattern_grid/light_gray_pattern_grid.json | 1 + .../pattern_grid/lime_pattern_grid.json | 1 + .../pattern_grid/magenta_pattern_grid.json | 1 + .../pattern_grid/orange_pattern_grid.json | 1 + .../recipes/pattern_grid/pattern_grid.json | 1 + .../pattern_grid/pink_pattern_grid.json | 1 + .../pattern_grid/purple_pattern_grid.json | 1 + .../pattern_grid/red_pattern_grid.json | 1 + .../pattern_grid/white_pattern_grid.json | 1 + .../pattern_grid/yellow_pattern_grid.json | 1 + .../tags/blocks/controller.json | 1 - .../refinedstorage/tags/blocks/crafter.json | 1 - .../tags/blocks/crafter_manager.json | 1 - .../tags/blocks/crafting_grid.json | 1 - .../tags/blocks/crafting_monitor.json | 1 - .../tags/blocks/creative_controller.json | 1 - .../refinedstorage/tags/blocks/detector.json | 1 - .../tags/blocks/disk_manipulator.json | 1 - .../tags/blocks/fluid_grid.json | 1 - .../data/refinedstorage/tags/blocks/grid.json | 1 - .../tags/blocks/network_receiver.json | 1 - .../tags/blocks/network_transmitter.json | 1 - .../tags/blocks/pattern_grid.json | 1 - .../refinedstorage/tags/blocks/relay.json | 1 - .../tags/blocks/security_manager.json | 1 - .../tags/blocks/wireless_transmitter.json | 1 - .../refinedstorage/tags/items/controller.json | 1 - .../refinedstorage/tags/items/crafter.json | 1 - .../tags/items/crafter_manager.json | 1 - .../tags/items/crafting_grid.json | 1 - .../tags/items/crafting_monitor.json | 1 - .../refinedstorage/tags/items/detector.json | 1 - .../tags/items/disk_manipulator.json | 1 - .../refinedstorage/tags/items/fluid_grid.json | 1 - .../data/refinedstorage/tags/items/grid.json | 1 - .../tags/items/network_receiver.json | 1 - .../tags/items/network_transmitter.json | 1 - .../tags/items/pattern_grid.json | 1 - .../data/refinedstorage/tags/items/relay.json | 1 - .../tags/items/security_manager.json | 1 - .../tags/items/wireless_transmitter.json | 1 - .../com/refinedmods/refinedstorage/RS.java | 7 +- .../RSCreativeModeTabItems.java | 188 ++ .../refinedmods/refinedstorage/RSItems.java | 35 +- .../refinedstorage/RSLootFunctions.java | 27 +- .../refinedstorage/RSRecipeSerializers.java | 4 +- .../api/autocrafting/ICraftingPattern.java | 6 +- .../ICraftingMonitorElement.java | 12 +- .../preview/ICraftingPreviewElement.java | 12 +- .../api/network/grid/IGridTab.java | 22 +- .../api/render/IElementDrawer.java | 12 +- .../apiimpl/autocrafting/CraftingPattern.java | 8 +- .../autocrafting/CraftingPatternFactory.java | 2 +- .../autocrafting/InvalidCraftingPattern.java | 3 +- .../ErrorCraftingMonitorElement.java | 10 +- .../FluidCraftingMonitorElement.java | 25 +- .../ItemCraftingMonitorElement.java | 25 +- .../preview/ErrorCraftingPreviewElement.java | 4 +- .../preview/FluidCraftingPreviewElement.java | 13 +- .../preview/ItemCraftingPreviewElement.java | 13 +- .../v6/calculator/CraftingCalculator.java | 2 +- .../task/v6/node/CraftingNode.java | 2 +- .../network/grid/CraftingGridBehavior.java | 2 +- .../apiimpl/network/grid/GridManager.java | 2 +- .../apiimpl/network/grid/GridTab.java | 15 +- .../factory/PortableGridBlockGridFactory.java | 2 +- .../grid/handler/FluidGridHandler.java | 1 - .../network/grid/handler/ItemGridHandler.java | 1 - .../grid/handler/PortableItemGridHandler.java | 1 - .../WirelessCraftingMonitorNetworkItem.java | 1 - .../item/WirelessFluidGridNetworkItem.java | 1 - .../apiimpl/network/node/GridNetworkNode.java | 9 +- .../node/NetworkTransmitterNetworkNode.java | 2 +- .../render/CraftingMonitorElementDrawers.java | 13 +- .../render/CraftingPreviewElementDrawers.java | 5 +- .../refinedstorage/apiimpl/util/Comparer.java | 4 +- .../apiimpl/util/RSSavedData.java | 4 +- .../blockentity/BaseBlockEntity.java | 1 - .../blockentity/InterfaceBlockEntity.java | 1 - .../NetworkTransmitterBlockEntity.java | 1 - .../blockentity/grid/GridBlockEntity.java | 1 - .../grid/portable/PortableGrid.java | 8 +- .../command/disk/CreateDiskCommand.java | 6 +- .../command/disk/ListDiskCommand.java | 2 +- .../disk/ListDiskForPlayerCommand.java | 2 +- .../command/network/ListNetworkCommand.java | 8 +- .../CancelAllAutocraftingCommand.java | 10 +- .../autocrafting/ListAutocraftingCommand.java | 4 +- .../command/pattern/PatternDumpCommand.java | 46 +- .../CraftingMonitorContainerMenu.java | 2 +- .../container/GridContainerMenu.java | 2 +- .../factory/BlockEntityContainerFactory.java | 2 +- .../factory/BlockEntityMenuProvider.java | 2 +- .../CrafterManagerContainerFactory.java | 2 +- .../CraftingMonitorContainerFactory.java | 2 +- .../BlockEntityTagGenerator.java | 101 +- .../datageneration/BlockModelGenerator.java | 5 +- .../datageneration/BlockTagGenerator.java | 45 +- .../datageneration/DataGenerators.java | 43 +- .../datageneration/ItemTagGenerator.java | 14 +- .../datageneration/LootTableGenerator.java | 92 +- .../datageneration/RecipeGenerator.java | 17 +- .../jei/CoverCraftingCategoryExtension.java | 17 +- .../jei/GhostIngredientHandler.java | 9 +- .../integration/jei/GuiContainerHandler.java | 25 +- .../HollowCoverCraftingCategoryExtension.java | 21 +- .../integration/jei/JeiHelper.java | 33 + .../integration/jei/RSJeiPlugin.java | 7 +- .../jei/RecipeTransferCraftingGridError.java | 19 +- .../jei/RecipeTransferPatternGridError.java | 6 +- .../refinedstorage/item/CoreItem.java | 3 +- .../refinedstorage/item/CoverItem.java | 52 +- .../refinedstorage/item/FilterItem.java | 2 +- .../item/FluidStorageDiskItem.java | 2 +- .../item/FluidStoragePartItem.java | 2 +- .../refinedstorage/item/NetworkCardItem.java | 9 +- .../refinedstorage/item/NetworkItem.java | 5 +- .../refinedstorage/item/PatternItem.java | 3 +- .../item/ProcessorBindingItem.java | 3 +- .../refinedstorage/item/ProcessorItem.java | 3 +- .../item/QuartzEnrichedIronItem.java | 3 +- .../refinedstorage/item/SecurityCardItem.java | 3 +- .../refinedstorage/item/SiliconItem.java | 3 +- .../refinedstorage/item/StorageDiskItem.java | 3 +- .../item/StorageHousingItem.java | 3 +- .../refinedstorage/item/StoragePartItem.java | 3 +- .../refinedstorage/item/UpgradeItem.java | 2 +- .../item/WirelessCraftingMonitorItem.java | 2 +- .../item/WirelessFluidGridItem.java | 2 +- .../refinedstorage/item/WirelessGridItem.java | 2 +- .../refinedstorage/item/WrenchItem.java | 2 +- .../item/blockitem/ControllerBlockItem.java | 3 +- .../item/blockitem/FluidStorageBlockItem.java | 3 +- .../item/blockitem/PortableGridBlockItem.java | 3 +- .../item/blockitem/StorageBlockItem.java | 3 +- .../item/group/MainCreativeModeTab.java | 18 - .../loottable/ControllerLootFunction.java | 2 +- .../loottable/CrafterLootFunction.java | 2 +- .../PortableGridBlockLootFunction.java | 2 +- .../loottable/StorageBlockLootFunction.java | 2 +- .../disk/StorageDiskSizeRequestMessage.java | 2 +- .../refinedstorage/recipe/CoverRecipe.java | 13 +- .../recipe/HollowCoverRecipe.java | 12 +- .../UpgradeWithEnchantedBookRecipe.java | 3 +- .../refinedstorage/render/FluidRenderer.java | 12 +- .../PatternItemBlockEntityRenderer.java | 6 +- .../StorageMonitorBlockEntityRenderer.java | 14 +- .../render/model/AbstractUnbakedGeometry.java | 27 - .../render/model/CubeBuilder.java | 2 +- .../model/DiskDriveUnbakedGeometry.java | 67 +- .../model/DiskManipulatorUnbakedGeometry.java | 91 +- .../model/PortableGridUnbakedGeometry.java | 52 +- .../model/baked/CableCoverBakedModel.java | 200 +- .../model/baked/DiskDriveBakedModel.java | 2 +- .../baked/DiskManipulatorBakedModel.java | 4 +- .../render/model/baked/PatternBakedModel.java | 2 +- .../screen/AmountSpecifyingScreen.java | 24 +- .../refinedstorage/screen/BaseScreen.java | 127 +- .../screen/ConstructorScreen.java | 21 +- .../screen/ControllerScreen.java | 37 +- .../screen/CrafterManagerScreen.java | 39 +- .../refinedstorage/screen/CrafterScreen.java | 17 +- .../screen/CraftingMonitorScreen.java | 42 +- .../screen/DestructorScreen.java | 21 +- .../refinedstorage/screen/DetectorScreen.java | 23 +- .../screen/DiskDriveScreen.java | 15 +- .../screen/DiskManipulatorScreen.java | 25 +- .../refinedstorage/screen/ExporterScreen.java | 21 +- .../screen/ExternalStorageScreen.java | 6 +- .../refinedstorage/screen/FilterScreen.java | 21 +- .../screen/FluidAmountScreen.java | 11 +- .../screen/FluidInterfaceScreen.java | 32 +- .../screen/FluidStorageBlockScreen.java | 6 +- .../refinedstorage/screen/ImporterScreen.java | 21 +- .../screen/InterfaceScreen.java | 23 +- .../screen/ItemAmountScreen.java | 11 +- .../screen/NetworkTransmitterScreen.java | 22 +- .../refinedstorage/screen/PriorityScreen.java | 9 +- .../refinedstorage/screen/RelayScreen.java | 19 +- .../screen/SecurityManagerScreen.java | 40 +- .../screen/StorageBlockScreen.java | 6 +- .../screen/StorageMonitorScreen.java | 19 +- .../refinedstorage/screen/StorageScreen.java | 27 +- .../screen/WirelessTransmitterScreen.java | 23 +- .../screen/grid/AlternativesScreen.java | 59 +- .../screen/grid/CraftingPreviewScreen.java | 69 +- .../screen/grid/CraftingSettingsScreen.java | 6 - .../screen/grid/GridScreen.java | 93 +- .../screen/grid/sorting/IdGridSorter.java | 6 +- .../screen/grid/stack/FluidGridStack.java | 8 +- .../screen/grid/stack/IGridStack.java | 4 +- .../screen/grid/stack/ItemGridStack.java | 6 +- .../screen/widget/CheckboxWidget.java | 16 +- .../screen/widget/ScrollbarWidget.java | 22 +- .../screen/widget/SearchWidget.java | 8 +- .../screen/widget/TabListWidget.java | 23 +- .../sidebutton/AccessTypeSideButton.java | 10 +- .../sidebutton/ConstructorDropSideButton.java | 12 +- .../sidebutton/CrafterModeSideButton.java | 12 +- .../DestructorPickupSideButton.java | 7 +- .../sidebutton/DetectorModeSideButton.java | 12 +- .../sidebutton/ExactModeSideButton.java | 7 +- .../sidebutton/FilterTypeSideButton.java | 8 +- .../widget/sidebutton/GridSizeSideButton.java | 8 +- .../GridSortingDirectionSideButton.java | 8 +- .../sidebutton/GridSortingTypeSideButton.java | 10 +- .../sidebutton/GridViewTypeSideButton.java | 8 +- .../widget/sidebutton/IoModeSideButton.java | 12 +- .../sidebutton/RedstoneModeSideButton.java | 7 +- .../sidebutton/SearchBoxModeSideButton.java | 8 +- .../screen/widget/sidebutton/SideButton.java | 33 +- .../widget/sidebutton/TypeSideButton.java | 10 +- .../WhitelistBlacklistSideButton.java | 7 +- .../refinedstorage/setup/ClientSetup.java | 28 +- .../refinedstorage/setup/CommonSetup.java | 10 + .../refinedstorage/util/BlockUtils.java | 6 +- .../refinedstorage/util/ColorMap.java | 2 +- .../refinedstorage/util/LevelUtils.java | 3 +- .../refinedstorage/util/RenderUtils.java | 28 +- src/main/resources/META-INF/mods.toml | 2 +- .../models/block/constructor_destructor.json | 5 +- .../models/block/cube_all_cutout.json | 30 +- .../models/block/cube_cutout.json | 30 +- .../models/block/cube_north_cutout.json | 5 +- .../refinedstorage/models/block/detector.json | 20 +- .../models/block/disks/disk.json | 30 +- .../models/block/disks/disk_full.json | 30 +- .../block/disks/disk_near_capacity.json | 30 +- .../block/disks/portable_grid_disk.json | 30 +- .../block/disks/portable_grid_disk_full.json | 30 +- .../portable_grid_disk_near_capacity.json | 30 +- .../models/block/wireless_transmitter.json | 30 +- src/main/resources/pack.mcmeta | 8 +- 1454 files changed, 13852 insertions(+), 12717 deletions(-) create mode 100644 settings.gradle create mode 100644 src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d create mode 100644 src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e create mode 100644 src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c delete mode 100644 src/generated/resources/.cache/cache create mode 100644 src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 create mode 100644 src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e create mode 100644 src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/black_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/blue_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/brown_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/crafter.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/cyan_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/detector.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/gray_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/green_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_network_transmitter.json (80%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/light_gray_wireless_transmitter.json (80%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/lime_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/magenta_wireless_transmitter.json (80%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/orange_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/pink_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/purple_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_relay.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/red_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/relay.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/white_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_controller.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_crafter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_crafter_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_crafting_monitor.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_detector.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_disk_manipulator.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_fluid_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_network_receiver.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_network_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_relay.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_security_manager.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/coloring_recipes/yellow_wireless_transmitter.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/black_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/blue_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/brown_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/cyan_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/gray_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/green_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/light_gray_crafting_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/lime_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/magenta_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/orange_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/pink_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/purple_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/red_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/white_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/crafting_grid/yellow_crafting_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/black_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/blue_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/brown_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/cyan_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/gray_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/green_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/light_gray_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/lime_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/magenta_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/orange_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/pink_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/purple_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/red_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/white_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/fluid_grid/yellow_fluid_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/black_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/blue_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/brown_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/cyan_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/gray_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/green_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/light_gray_pattern_grid.json (79%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/lime_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/magenta_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/orange_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/pink_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/purple_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/red_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/white_pattern_grid.json (78%) rename src/generated/resources/data/refinedstorage/advancements/recipes/{refinedstorage => misc}/pattern_grid/yellow_pattern_grid.json (78%) create mode 100644 src/main/java/com/refinedmods/refinedstorage/RSCreativeModeTabItems.java create mode 100644 src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiHelper.java delete mode 100644 src/main/java/com/refinedmods/refinedstorage/item/group/MainCreativeModeTab.java delete mode 100644 src/main/java/com/refinedmods/refinedstorage/render/model/AbstractUnbakedGeometry.java diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 6859c6b9e..1399640c8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -35,8 +35,8 @@ body: description: | If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue. options: - - Minecraft 1.18.2 - Minecraft 1.19.2 + - Minecraft 1.20.1 validations: required: true - type: input diff --git a/CHANGELOG.md b/CHANGELOG.md index f1ec18169..384870b98 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + +- Ported to Minecraft 1.20.1. + ## [v1.11.6] - 2023-03-30 ### Fixed diff --git a/build.gradle b/build.gradle index e45962562..7d183c0fd 100755 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,13 @@ -buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } -} - plugins { + id 'eclipse' + id 'maven-publish' id 'com.matthewprenger.cursegradle' version '1.4.0' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' } repositories { maven { - url = "https://dvs1.progwml6.com/files/maven/" + url = "https://maven.blamejared.com/" } maven { url "https://www.cursemaven.com" @@ -27,13 +20,9 @@ repositories { } } -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'eclipse' -apply plugin: 'maven-publish' - group = 'com.refinedmods' archivesBaseName = 'refinedstorage' -version = '1.11.7' +version = '1.12.0' if (System.getenv('GITHUB_SHA') != null) { version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) @@ -50,7 +39,7 @@ tasks.withType(JavaCompile) { } minecraft { - mappings channel: 'official', version: '1.19.2' + mappings channel: 'official', version: '1.20.1' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { @@ -102,18 +91,18 @@ processResources { } dependencies { - minecraft 'net.minecraftforge:forge:1.19.2-43.1.32' + minecraft 'net.minecraftforge:forge:1.20.1-47.0.35' - compileOnly fg.deobf("mezz.jei:jei-1.19.2-common-api:11.3.0.262") - compileOnly fg.deobf("mezz.jei:jei-1.19.2-forge-api:11.3.0.262") - runtimeOnly fg.deobf("mezz.jei:jei-1.19.2-forge:11.3.0.262") + compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.2.0.22") + compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.2.0.22") + runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.2.0.22") - compileOnly fg.deobf('curse.maven:mouse-tweaks-60089:3871353') + compileOnly fg.deobf('curse.maven:mouse-tweaks-60089:4581240') - compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:3914007') + compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:4596466') - runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0") - compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0:api") + //runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:5.2.0-beta.3+1.20.1") + compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:5.2.0-beta.3+1.20.1:api") } jar { @@ -138,7 +127,7 @@ if (System.getenv("CURSEFORGE_TOKEN") != null) { changelog = System.getenv("CHANGELOG") changelogType = 'markdown' releaseType = project.version.toString().contains('beta') ? 'beta' : (project.version.toString().contains('alpha') ? 'alpha' : 'release') - addGameVersion "1.19.2" + addGameVersion "1.20.1" mainArtifact(jar) { displayName = "v$project.version" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10158 zcmaKSbyOWsmn~e}-QC?axCPf>!2<-jxI0|j{UX8L-QC?axDz};a7}ppGBe+Nv*x{5 zy?WI?=j^WT(_Md5*V*xNP>X9&wM>xUvNiMuKDK=Xg!N%oM>Yru2rh7#yD-sW0Ov#$ zCKBSOD3>TM%&1T5t&#FK@|@1f)Ze+EE6(7`}J(Ek4})CD@I+W;L{ zO>K;wokKMA)EC6C|D@nz%D2L3U=Nm(qc>e4GM3WsHGu-T?l^PV6m-T-(igun?PZ8U z{qbiLDMcGSF1`FiKhlsV@qPMRm~h9@z3DZmWp;Suh%5BdP6jqHn}$-gu`_xNg|j{PSJ0n$ zbE;Azwq8z6IBlgKIEKc4V?*##hGW#t*rh=f<;~RFWotXS$vr;Mqz>A99PMH3N5BMi zWLNRjc57*z`2)gBV0o4rcGM(u*EG8_H5(|kThAnp|}u2xz>>X6tN zv)$|P2Nr1D*fk4wvqf(7;NmdRV3eL{!>DO-B98(s*-4$g{)EnRYAw+DP-C`=k)B!* zHU7!ejcbavGCYuz9k@$aZQaU%#K%6`D}=N_m?~^)IcmQZun+K)fSIoS>Ws zwvZ%Rfmw>%c!kCd~Pmf$E%LCj2r>+FzKGDm+%u88|hHprot{*OIVpi`Vd^^aumtx2L}h} zPu$v~zdHaWPF<`LVQX4i7bk82h#RwRyORx*z3I}o&>>eBDCif%s7&*vF6kU%1` zf(bvILch^~>cQ{=Y#?nx(8C-Uuv7!2_YeCfo?zkP;FK zX+KdjKS;HQ+7 zj>MCBI=d$~9KDJ1I2sb_3=T6D+Mu9{O&vcTnDA(I#<=L8csjEqsOe=&`=QBc7~>u2 zfdcO44PUOST%PcN+8PzKFYoR0;KJ$-Nwu#MgSM{_!?r&%rVM}acp>53if|vpH)q=O z;6uAi__am8g$EjZ33?PmCrg@(M!V_@(^+#wAWNu&e3*pGlfhF2<3NobAC zlusz>wMV--3ytd@S047g)-J@eOD;DMnC~@zvS=Gnw3=LnRzkeV`LH4#JGPklE4!Q3 zq&;|yGR0FiuE-|&1p2g{MG!Z3)oO9Jf4@0h*3!+RHv=SiEf*oGQCSRQf=LqT5~sajcJ8XjE>E*@q$n z!4|Rz%Lv8TgI23JV6%)N&`Otk6&RBdS|lCe7+#yAfdyEWNTfFb&*S6-;Q}d`de!}*3vM(z71&3 z37B%@GWjeQ_$lr%`m-8B&Zl4Gv^X{+N{GCsQGr!LLU4SHmLt3{B*z-HP{73G8u>nK zHxNQ4eduv>lARQfULUtIlLx#7ea+O;w?LH}FF28c9pg#*M`pB~{jQmPB*gA;Hik#e zZpz&X#O}}r#O_#oSr4f`zN^wedt>ST791bAZ5(=g<Oj)m9X8J^>Th}fznPY0T zsD9ayM7Hrlb6?jHXL<{kdA*Q#UPCYce0p`fHxoZ7_P`cF-$1YY9Pi;0QFt{CCf%C# zuF60A_NTstTQeFR3)O*ThlWKk08}7Nshh}J-sGY=gzE!?(_ZI4ovF6oZ$)&Zt~WZi z_0@Bk!~R4+<&b6CjI{nGj+P{*+9}6;{RwZ7^?H)xjhiRi;?A|wb0UxjPr?L@$^v|0= z@6d3+eU|&re3+G*XgFS}tih3;>2-R1x>`2hmUb5+Z~eM4P|$ zAxvE$l@sIhf_#YLnF|Wcfp(Gh@@dJ-yh|FhKqsyQp_>7j1)w|~5OKETx2P$~`}5huK;{gw_~HXP6=RsG)FKSZ=VYkt+0z&D zr?`R3bqVV?Zmqj&PQ`G3b^PIrd{_K|Hhqt zAUS#|*WpEOeZ{@h*j6%wYsrL`oHNV=z*^}yT1NCTgk1-Gl(&+TqZhODTKb9|0$3;| z;{UUq7X9Oz`*gwbi|?&USWH?Fr;6=@Be4w=8zu>DLUsrwf+7A`)lpdGykP`^SA8{ok{KE3sM$N@l}kB2GDe7MEN? zWcQ2I0fJ1ZK%s-YKk?QbEBO6`C{bg$%le0FTgfmSan-Kih0A7)rGy|2gd)_gRH7qp z*bNlP0u|S^5<)kFcd&wQg*6QP5;y(3ZgI%vUgWk#`g!sMf`02>@xz{Ie9_-fXllyw zh>P%cK+-HkQ;D$Jh=ig(ASN^zJ7|q*#m;}2M*T#s0a^nF_>jI(L(|*}#|$O&B^t!W zv-^-vP)kuu+b%(o3j)B@do)n*Y0x%YNy`sYj*-z2ncYoggD6l z6{1LndTQUh+GCX;7rCrT z@=vy&^1zyl{#7vRPv;R^PZPaIks8okq)To8!Cks0&`Y^Xy5iOWC+MmCg0Jl?1ufXO zaK8Q5IO~J&E|<;MnF_oXLc=LU#m{6yeomA^Ood;)fEqGPeD|fJiz(`OHF_f*{oWJq z1_$NF&Mo7@GKae#f4AD|KIkGVi~ubOj1C>>WCpQq>MeDTR_2xL01^+K1+ zr$}J>d=fW{65hi2bz&zqRKs8zpDln z*7+Gtfz6rkgfj~#{MB=49FRP;ge*e0=x#czw5N{@T1{EAl;G&@tpS!+&2&Stf<%<+55R18u2%+}`?PZo8xg|Y9Xli(fSQyC7 z+O5{;ZyW$!eYR~gy>;l6cA+e`oXN6a6t(&kUkWus*Kf<m$W7L)w5uXYF)->OeWMSUVXi;N#sY zvz4c?GkBU{D;FaQ)9|HU7$?BX8DFH%hC11a@6s4lI}y{XrB~jd{w1x&6bD?gemdlV z-+ZnCcldFanu`P=S0S7XzwXO(7N9KV?AkgZzm|J&f{l-Dp<)|-S7?*@HBIfRxmo1% zcB4`;Al{w-OFD08g=Qochf9=gb56_FPc{C9N5UAjTcJ(`$>)wVhW=A<8i#!bmKD#6~wMBak^2(p56d2vs&O6s4>#NB0UVr24K z%cw|-Yv}g5`_zcEqrZBaRSoBm;BuXJM^+W$yUVS9?u(`87t)IokPgC_bQ3g_#@0Yg zywb?u{Di7zd3XQ$y!m^c`6~t-7@g-hwnTppbOXckS-^N?w1`kRMpC!mfMY?K#^Ldm zYL>771%d{+iqh4a&4RdLNt3_(^^*{U2!A>u^b{7e@}Azd_PiZ>d~(@(Q@EYElLAx3LgQ5(ZUf*I%EbGiBTG!g#=t zXbmPhWH`*B;aZI)$+PWX+W)z?3kTOi{2UY9*b9bpSU!GWcVu+)!^b4MJhf=U9c?jj z%V)EOF8X3qC5~+!Pmmmd@gXzbycd5Jdn!N#i^50a$4u}8^O}DG2$w-U|8QkR-WU1mk4pF z#_imS#~c2~Z{>!oE?wfYc+T+g=eJL`{bL6=Gf_lat2s=|RxgP!e#L|6XA8w{#(Po(xk1~rNQ4UiG``U`eKy7`ot;xv4 zdv54BHMXIq;#^B%W(b8xt%JRueW5PZsB2eW=s3k^Pe1C$-NN8~UA~)=Oy->22yJ%e zu=(XD^5s{MkmWB)AF_qCFf&SDH%ytqpt-jgs35XK8Ez5FUj?uD3++@2%*9+-65LGQ zvu1eopeQoFW98@kzU{+He9$Yj#`vaQkqu%?1wCoBd%G=)TROYl2trZa{AZ@#^LARR zdzg-?EUnt9dK2;W=zCcVj18RTj-%w^#pREbgpD0aL@_v-XV2&Cd@JB^(}GRBU}9gV z6sWmVZmFZ9qrBN%4b?seOcOdOZ+6cx8-#R(+LYKJu~Y%pF5#85aF9$MnP7r^Bu%D? zT{b-KBujiy>7_*9{8u0|mTJ(atnnnS%qBDM_Gx5>3V+2~Wt=EeT4cXOdud$+weM(>wdBg+cV$}6%(ccP;`!~CzW{0O2aLY z?rQtBB6`ZztPP@_&`kzDzxc==?a{PUPUbbX31Vy?_(;c+>3q*!df!K(LQYZNrZ>$A*8<4M%e8vj1`%(x9)d~);ym4p zoo518$>9Pe| zZaFGj);h?khh*kgUI-Xvj+Dr#r&~FhU=eQ--$ZcOY9;x%&3U(&)q}eJs=)K5kUgi5 zNaI-m&4?wlwFO^`5l-B?17w4RFk(IKy5fpS0K%txp0qOj$e=+1EUJbLd-u>TYNna~ z+m?gU0~xlcnP>J>%m_y_*7hVMj3d&)2xV8>F%J;6ncm)ILGzF2sPAV|uYk5!-F%jL(53^51BKr zc3g7+v^w<4WIhk7a#{N6Ku_u{F`eo;X+u!C(lIaiY#*V5!sMed39%-AgV*`(nI)Im zemHE^2foBMPyIP<*yuD21{6I?Co?_{pqp-*#N6sZRQAzEBV4HQheOyZT5UBd)>G85 zw^xHvCEP4AJk<{v2kQQ;g;C)rCY=X!c8rNpNJ4mHETN}t1rwSe7=s8u&LzW-+6AEB z)LX0o7`EqC94HM{4p}d2wOwj2EB|O;?&^FeG9ZrT%c!J&x`Z3D2!cm(UZbFBb`+h ztfhjq75yuSn2~|Pc)p$Ul6=)}7cfXtBsvc15f&(K{jnEsw5Gh0GM^O=JC+X-~@r1kI$=FH=yBzsO#PxR1xU9+T{KuPx7sMe~GX zSP>AT3%(Xs@Ez**e@GAn{-GvB^oa6}5^2s+Mg~Gw?#$u&ZP;u~mP|FXsVtr>3k9O?%v>`Ha-3QsOG<7KdXlqKrsN25R|K<<;- z8kFY!&J&Yrqx3ptevOHiqPxKo_wwAPD)$DWMz{0>{T5qM%>rMqGZ!dJdK(&tP1#89 zVcu}I1I-&3%nMyF62m%MDpl~p)PM(%YoR zD)=W)E7kjwzAr!?^P*`?=fMHd1q4yjLGTTRUidem^Ocjrfgk2Jp|6SabEVHKC3c>RX@tNx=&Z7gC z0ztZoZx+#o36xH8mv6;^e{vU;G{JW17kn(RO&0L%q^fpWSYSkr1Cb92@bV->VO5P z;=V{hS5wcROQfbah6ND{2a$zFnj>@yuOcw}X~E20g7)5=Z#(y)RC878{_rObmGQ;9 zUy>&`YT^2R@jqR1z9Fx&x)WBstIE#*UhAa>WrMm<10={@$UN@Cog+#pxq{W@l0DOf zJGs^Jv?t8HgIXk(;NFHXun$J{{p})cJ^BWn4BeQo6dMNp%JO@$9z{(}qqEHuZOUQP zZiwo70Oa@lMYL(W*R4(!oj`)9kRggJns-A|w+XL=P07>QBMTEbG^gPS)H zu^@MFTFZtsKGFHgj|hupbK({r>PX3_kc@|4Jdqr@gyyKrHw8Tu<#0&32Hh?S zsVm_kQ2K`4+=gjw1mVhdOz7dI7V!Iu8J1LgI+_rF`Wgx5-XwU~$h>b$%#$U3wWC-ea0P(At2SjPAm57kd;!W5k{do1}X681o}`!c*(w!kCjtGTh7`=!M)$9 zWjTns{<-WX+Xi;&d!lyV&1KT9dKL??8)fu2(?Ox<^?EAzt_(#5bp4wAfgIADYgLU` z;J7f8g%-tfmTI1ZHjgufKcAT4SO(vx?xSo4pdWh`3#Yk;DqPGQE0GD?!_CfXb(E8WoJt6*Yutnkvmb?7H9B zVICAYowwxK;VM4(#~|}~Ooyzm*1ddU_Yg%Ax*_FcZm^AzYc$<+9bv;Eucr(SSF}*JsjTfb*DY>qmmkt z;dRkB#~SylP~Jcmr&Bl9TxHf^DcGUelG%rA{&s)5*$|-ww}Kwx-lWnNeghVm@z zqi3@-oJnN%r2O4t9`5I5Zfc;^ROHmY6C9 z1VRRX*1+aBlbO_p>B+50f1p&%?_A*16R0n+l}HKWI$yIH3oq2`k4O?tEVd~a4~>iI zo{d}b8tr+$q<%%K%Ett*i|RAJEMnk9hU7LtL!lxOB45xO1g)ycDBd=NbpaE3j?Gw& z0M&xx13EkCgNHu%Z8rBLo93XH-zQUfF3{Iy>65-KSPniqIzF+?x$3>`L?oBOBeEsv zs_y7@7>IbS&w2Vju^#vBpPWQuUv=dDRGm(-MH|l+8T?vfgD;{nE_*-h?@D;GN>4hA z9{!G@ANfHZOxMq5kkoh4h*p3+zE7z$13ocDJR$XA*7uKtG5Cn_-ibn%2h{ z;J0m5aCjg(@_!G>i2FDAvcn5-Aby8b;J0u%u)!`PK#%0FS-C3(cq9J{V`DJEbbE|| zYpTDd+ulcjEd5`&v!?=hVgz&S0|C^We?2|>9|2T6?~nn^_CpLn&kuI|VG7_E{Ofu9 zAqe0Reuq5Zunlx@zyTqEL+ssT15X|Z0LUfZAr-i$1_SJ{j}BHmBm}s8{OgK3lm%4F zzC%jz!y!8WUJo2FLkU(mVh7-uzC+gcbkV^bM}&Y6=HTTca{!7ZSoB!)l|v<(3ly!jq&P5A2q(U5~h)))aj-`-6&aM~LBySnAy zA0{Z{FHiUb8rW|Yo%kQwi`Kh>EEE$0g7UxeeeVkcY%~87yCmSjYyxoqq(%Jib*lH; zz`t5y094U`k_o{-*U^dFH~+1I@GsgwqmGsQC9-Vr0X94TLhlV;Kt#`9h-N?oKHqpx zzVAOxltd%gzb_Qu{NHnE8vPp=G$#S)Y%&6drobF_#NeY%VLzeod delta 9041 zcmY*t@kVBCBP!g$Qih>$!M(|j-I?-C8+=cK0w!?cVWy9LXH zd%I}(h%K_>9Qvap&`U=={XcolW-VA%#t9ljo~WmY8+Eb|zcKX3eyx7qiuU|a)zU5cYm5{k5IAa3ibZf_B&=YT!-XyLap%QRdebT+PIcg$KjM3HqA3uZ5|yBj2vv8$L{#$>P=xi+J&zLILkooDarGpiupEiuy`9uy&>yEr95d)64m+~`y*NClGrY|5MLlv!)d5$QEtqW)BeBhrd)W5g1{S@J-t8_J1 zthp@?CJY}$LmSecnf3aicXde(pXfeCei4=~ZN=7VoeU|rEEIW^!UBtxGc6W$x6;0fjRs7Nn)*b9JW5*9uVAwi) zj&N7W;i<Qy80(5gsyEIEQm>_+4@4Ol)F?0{YzD(6V~e=zXmc2+R~P~< zuz5pju;(akH2+w5w!vnpoikD5_{L<6T`uCCi@_Uorr`L(8zh~x!yEK*!LN02Q1Iri z>v*dEX<(+_;6ZAOIzxm@PbfY4a>ws4D82&_{9UHCfll!x`6o8*i0ZB+B#Ziv%RgtG z*S}<4!&COp)*ZMmXzl0A8mWA$)fCEzk$Wex*YdB}_-v|k9>jKy^Y>3me;{{|Ab~AL zQC(naNU=JtU3aP6P>Fm-!_k1XbhdS0t~?uJ$ZvLbvow10>nh*%_Kh>7AD#IflU8SL zMRF1fmMX#v8m=MGGb7y5r!Qf~Y}vBW}fsG<{1CHX7Yz z=w*V9(vOs6eO>CDuhurDTf3DVVF^j~rqP*7S-$MLSW7Ab>8H-80ly;9Q0BWoNV zz8Wr2CdK!rW0`sMD&y{Ue{`mEkXm0%S2k;J^iMe|sV5xQbt$ojzfQE+6aM9LWH`t& z8B;Ig7S<1Dwq`3W*w59L(opjq)ll4E-c?MivCh!4>$0^*=DKI&T2&j?;Z82_iZV$H zKmK7tEs7;MI-Vo(9wc1b)kc(t(Yk? z#Hgo8PG_jlF1^|6ge%;(MG~6fuKDFFd&}>BlhBTh&mmuKsn>2buYS=<5BWw^`ncCb zrCRWR5`IwKC@URU8^aOJjSrhvO>s}O&RBD8&V=Fk2@~zYY?$qO&!9%s>YecVY0zhK zBxKGTTyJ(uF`p27CqwPU1y7*)r}y;{|0FUO)-8dKT^>=LUoU_6P^^utg|* zuj}LBA*gS?4EeEdy$bn#FGex)`#y|vg77NVEjTUn8%t z@l|7T({SM!y$PZy9lb2N;BaF}MfGM%rZk10aqvUF`CDaC)&Av|eED$x_;qSoAka*2 z2rR+OTZTAPBx`vQ{;Z{B4Ad}}qOBqg>P4xf%ta|}9kJ2$od>@gyC6Bf&DUE>sqqBT zYA>(sA=Scl2C_EF8)9d8xwdBSnH5uL=I4hch6KCHj-{99IywUD{HR`d(vk@Kvl)WD zXC(v{ZTsyLy{rio*6Wi6Lck%L(7T~Is-F_`2R}q z!H1ylg_)Mv&_|b1{tVl!t{;PDa!0v6^Zqs_`RdxI%@vR)n|`i`7O<>CIMzqI00y{;` zhoMyy>1}>?kAk~ND6}`qlUR=B+a&bvA)BWf%`@N)gt@@Ji2`p1GzRGC$r1<2KBO3N z++YMLD9c|bxC;za_UVJ*r6&Ea;_YC>-Ebe-H=VAgDmx+?Q=DxCE4=yQXrn z7(0X#oIjyfZUd}fv2$;4?8y|0!L^ep_rMz|1gU-hcgVYIlI~o>o$K&)$rwo(KJO~R zDcGKo-@im7C<&2$6+q-xtxlR`I4vL|wFd<`a|T}*Nt;(~Vwx&2QG_j$r0DktR+6I4W)gUx*cDVBwGe00aa803ZYiwy;d{1p)y0?*IT8ddPS`E~MiS z1d%Vm0Hb4LN2*f8FZ|6xRQev@ZK-?(oPs+mT*{%NqhGL_0dJ$?rAxA{2 z`r3MBv&)xblcd>@hArncJpL~C(_HTo&D&CS!_J5Giz$^2EfR_)xjgPg`Bq^u%1C*+ z7W*HGp|{B?dOM}|E)Cs$61y8>&-rHBw;A8 zgkWw}r$nT%t(1^GLeAVyj1l@)6UkHdM!%LJg|0%BO74M593&LlrksrgoO{iEz$}HK z4V>WXgk|7Ya!Vgm#WO^ZLtVjxwZ&k5wT6RteViH3ds{VO+2xMJZ`hToOz~_+hRfY{ z%M;ZDKRNTsK5#h6goUF(h#VXSB|7byWWle*d0$IHP+FA`y)Q^5W!|&N$ndaHexdTn z{vf?T$(9b&tI&O`^+IqpCheAFth;KY(kSl2su_9|Y1B{o9`mm)z^E`Bqw!n+JCRO) zGbIpJ@spvz=*Jki{wufWm|m`)XmDsxvbJR5dLF=kuf_C>dl}{nGO(g4I$8 zSSW#5$?vqUDZHe_%`Zm?Amd^>I4SkBvy+i}wiQYBxj0F1a$*%T+6}Yz?lX&iQ}zaU zI@%8cwVGtF3!Ke3De$dL5^j-$Bh3+By zrSR3c2a>XtaE#TB}^#hq@!vnZ1(An#bk_eKR{?;Z&0cgh4$cMNU2HL=m=YjMTI zT$BRltXs4T=im;Ao+$Bk3Dz(3!C;rTqelJ?RF)d~dP9>$_6dbz=_8#MQFMMX0S$waWxY#mtDn}1U{4PGeRH5?a>{>TU@1UlucMAmzrd@PCwr|il)m1fooO7Z{Vyr z6wn=2A5z(9g9-OU10X_ei50@~)$}w4u)b+mt)z-sz0X32m}NKTt4>!O{^4wA(|3A8 zkr(DxtMnl$Hol>~XNUE?h9;*pGG&kl*q_pb z&*$lH70zI=D^s)fU~A7cg4^tUF6*Oa+3W0=7FFB*bf$Kbqw1&amO50YeZM)SDScqy zTw$-M$NA<_We!@4!|-?V3CEPnfN4t}AeM9W$iSWYz8f;5H)V$pRjMhRV@Z&jDz#FF zXyWh7UiIc7=0U9L35=$G54RjAupR&4j`(O3i?qjOk6gb!WjNtl1Fj-VmltDTos-Bl z*OLfOleS~o3`?l!jTYIG!V7?c<;Xu(&#~xf-f(-jwow-0Hv7JZG>}YKvB=rRbdMyv zmao*-!L?)##-S#V^}oRm7^Db zT5C2RFY4>ov~?w!3l_H}t=#X=vY-*LQy(w>u%r`zQ`_RukSqIv@WyGXa-ppbk-X=g zyn?TH(`-m*in(w=Ny$%dHNSVxsL|_+X=+kM+v_w{ZC(okof9k1RP5qDvcA-d&u{5U z?)a9LXht1f6|Tdy5FgXo;sqR|CKxDKruU9RjK~P6xN+4;0eAc|^x%UO^&NM4!nK_! z6X14Zkk=5tqpl&d6FYuMmlLGQZep0UE3`fT>xzgH>C*hQ2VzCQlO`^kThU6q%3&K^ zf^kfQm|7SeU#c%f8e?A<9mALLJ-;)p_bv6$pp~49_o;>Y=GyUQ)*prjFbkU;z%HkOW_*a#j^0b@GF|`6c}7>=W{Ef!#dz5lpkN>@IH+(sx~QMEFe4 z1GeKK67;&P%ExtO>}^JxBeHii)ykX8W@aWhJO!H(w)DH4sPatQ$F-Phiqx_clj`9m zK;z7X6gD2)8kG^aTr|oY>vmgOPQ4`_W+xj2j!$YT9x(DH6pF~ zd_C#8c>Gfb)k2Ku4~t=Xb>T^8KW;2HPN#%}@@hC1lNf~Xk)~oj=w-Y11a@DtIyYk8 z9^|_RIAA(1qUSs3rowxr&OuRVFL8(zSqU_rGlqHpkeYT4z7DGdS0q4V-b!3fsv$Yb zPq4UP^3XFd(G%JAN|0y>?&sLzNir30K(lyzNYvCtE2gDyy-nthPlrXXU75fhoS7kA zg%GYyBEFQ(xgdjtv+>?>Q!G!8& z3+F>)4|N+F1a^T?XC8 zxRRx7-{DV%uUYt&*$z2uQTbZDbUn)PozID*(i^{JDjNq`v?;&OW^&~{ZPE_e+?RMk z!7O5CUKJSnGZvjTbLX2$zwYRZs_$f{T!hvVHuTg77|O;zBHlA|GIUu_bh4`Bl?7KE zYB~a`b?O;0SfD?0EZiPYpVf=P4=|zr(u_w}oP0S`YOZziX9cuwpll&%QMv4bBC_JdP#rT3>MliqySv0& zh)r=vw?no&;5T}QVTkHKY%t`%{#*#J;aw!wPs}?q2$(e0Y#cdBG1T09ypI@#-y24+fzhJem1NSZ$TCAjU2|ebYG&&6p(0f>wQoNqVa#6J^W!3$gIWEw7d<^k!U~O5v=8goq$jC`p8CS zrox#Jw3w`k&Ty7UVbm35nZ}FYT5`fN)TO6R`tEUFotxr^BTXZGt|n(Ymqmr^pCu^^w?uX!ONbm?q{y9FehdmcJuV8V%A-ma zgl=n9+op{wkj-}N;6t;(JA1A#VF3S9AFh6EXRa0~7qop~3^~t1>hc6rdS_4!+D?Xh z5y?j}*p@*-pmlTb#7C0x{E(E@%eepK_YycNkhrYH^0m)YR&gRuQi4ZqJNv6Rih0zQ zqjMuSng>Ps;?M0YVyh<;D3~;60;>exDe)Vq3x@GRf!$wgFY5w4=Jo=g*E{76%~jqr zxTtb_L4Cz_E4RTfm@0eXfr1%ho?zP(>dsRarS>!^uAh~bd0lEhe2x7AEZQmBc%rU; z&FUrs&mIt8DL`L4JpiFp3NNyk3N>iL6;Nohp*XbZZn%BDhF_y{&{X3UtX(7aAyG63P zELC;>2L`jnFS#vC->A(hZ!tGi7N7^YtW7-LB6!SVdEM&7N?g}r4rW2wLn{Ni*I~$Y z@#;KwJIl0^?eX{JWiHQxDvccnNKBhHW0h6`j=)OH1`)7)69B$XNT@)l1s25M+~o2_ zpa&X<_vHxN_oR|B#ir2p*VNB~o6Z1OE&~a+_|AxS)(@Dgznq(b(|K8BN_nQ7+>N`= zXOx_@AhcmmcRvp6eX#4z6sn=V0%KonKFVY@+m&)Rx!Z5U@WdyHMCF4_qzJNpzc9Fw z7Bdzx54(e7>wcEqHKqH-Paiut;~ZVJpS6_q>ub)zD#TQ4j*i(I8DvS$BfyX~A%<#} z*=g2$8s;YYjEHl`7cKw!a9PFRt8tVR zM&X|bs?B1#ycjl>AzgbdRkr-@NmBc^ys)aoT75F(yweV&Y-3hNNXj-valA&=)G{NL zX?smr5sQWi3n;GGPW{%vW)xw-#D0QY%zjXxYj?($b4JzpW0sWY!fkwC5bJMkhTp$J z6CNVLd=-Ktt7D<^-f|=wjNjf0l%@iu2dR+zdQ&9NLa(B_okKdRy^!Q!F$Ro=hF$-r z!3@ocUs^7?cvdTMPbn*8S-o!PsF;>FcBkBkg&ET`W`lp?j`Z}4>DF|}9407lK9y~^No&pT7J|rVQ9Dh>qg|%=gxxg=! z>WX$!;7s~gDPmPF<--(?CvEnvV*E1KdXpr>XVv!DN~PyISE7d+K_9+W^pnR6cX&?E ziLr{0`JIs@NcA|;8L|p!3H~9y8mga2Dsm4I?rBS7$3wcT!_l*$^8U3hKUri|_I3N2 zz$xY`)IWA7P*Y1BJtyBEh?8EEvs8Oyl^{(+`gi{9hwpcN#I%Z0j$^yBp?z<;Ny!G$ zra3J_^i0(~LiKuITs%v)qE+YrJr?~w+)`Rcte^O=nwmPg@&!Q7FGTtjpTdI6wH&ZV z)2}VZY6(MbP`tgoew++(pt$jVj- zvPK)pSJ)U(XfUqBqZNo|za#Xx+IVEb?HGQ^wUVH&wTdWgP(z#ijyvXjwk>tFBUn*2 zuj5ENQjT{2&T`k;q54*Z>O~djuUBNwc6l(BzY?Ed4SIt9QA&8+>qaRIck?WdD0rh@ zh`VTZPwSNNCcLH3J}(q zdEtu@HfxDTpEqWruG=86m;QVO{}E&q8qYWhmA>(FjW`V&rg!CEL1oZCZcAX@yX(2tg8`>m1psG0ZpO+Rnph@Bhjj!~|+S=@+U{*ukwGrBj{5xfIHHP7|} z^7@g2;d%FMO8f(MS&6c##mrX2i(5uiX1o(=Vw89IQcHw)n{ZTS@``xT$Af@CQTP#w zl3kn6+MJP+l(;K-rWgjpdBU|CB4>W%cObZBH^Am~EvRO%D>uU^HVRXi$1 zb?Pr~ZlopLfT5l%03SjI7>YiGZZs=n(A!c;N9%%aByY~5(-hS4z_i2wgKYsG%OhhxH#^5i%&9ESb(@# zV_f5${Gf=$BK)1VY=NX#f+M}6f`OWmpC*OU3&+P@n>$Xvco*Nm$c<=`S|lY6S}Ut- z80}ztIpkV>W%^Ox`enpk<25_i7`RPiDugxHfUDBD8$bp9XR15>a?r^#&!1Ne6n{MI z){H`!jwrx}8b-w@@E8H0v)l!5!W8En=u67v+`iNoz<_h4{V*qQK+@)JP^JqsKAedZ zNh4toE+I7;^}7kkj|hzNVFWkZ$N9rxPl9|_@2kbW*4}&o%(L`WpQCN2M?gz>cyWHk zulMwRxpdpx+~P(({@%UY20LwM7sA&1M|`bEoq)Id zyUHt>@vfu**UOL9wiW*C75cc&qBX37qLd`<;$gS+mvL^v3Z8i4p6(@Wv`N|U6Exn< zd`@WxqU^8u^Aw+uw#vuDEIByaD)vucU2{4xRseczf_TJXUwaUK+E_IoItXJq88${0 z=K5jGehPa2)CnH&Lcxv&1jQ=T8>*vgp1^%)c&C2TL69;vSN)Q)e#Hj7!oS0 zlrEmJ=w4N9pID5KEY5qz;?2Q}0|4ESEio&cLrp221LTt~j3KjUB`LU?tP=p;B=WSXo;C?8(pnF6@?-ZD0m3DYZ* z#SzaXh|)hmTC|zQOG>aEMw%4&2XU?prlk5(M3ay-YC^QLRMN+TIB*;TB=wL_atpeD zh-!sS%A`3 z=^?niQx+^za_wQd2hRR=hsR0uzUoyOcrY!z7W)G2|C-_gqc`wrG5qCuU!Z?g*GL^H z?j^<_-A6BC^Dp`p(i0!1&?U{YlF@!|W{E@h=qQ&5*|U~V8wS;m!RK(Q6aX~oH9ToE zZYKXZoRV~!?P1ADJ74J-PFk2A{e&gh2o)@yZOZuBi^0+Hkp`dX;cZs9CRM+##;P!*BlA%M48TuR zWUgfD1DLsLs+-4XC>o>wbv-B)!t*47ON5wgoMX%llnmXG%L8209Vi;yZ`+N2v2Ox+ zMe7JHunQE$ckHHhEYRA+e`A3=XO5L%fMau71`XL7v)b{f1rkTY+WWSIkH#sG=pLqe zA(xZIp>_=4$zKq0t_G7q9@L zZ5D-0{8o%7f>0szA#c;rjL;4Y%hl}wYrx1R`Viq|Pz}c-{{LJY070ym@E~mt*pTyG z79bfcWTGGEje;PLD;N-XHw=`wS^howfzb$%oP8n)lN$o$ZWjZx|6iSsi2piI_7s7z zX#b$@z6kIJ^9{-Y^~wJ!s0V^Td5V7#4&pyU#NHw#9)N&qbpNFDR1jqC00W}91OnnS z{$J@GBz%bka`xsz;rb_iJ|rgmpUVyEZ)Xi*SO5U&|NFkTHb3y@e@%{WrvE&Jp#Lw^ zcj13CbsW+V>i@rj@SEfFf0@yjS@nbPB0)6D`lA;e%61nh`-qhydO!uS7jXGQd%i7opEnOL;| zDn!3EUm(V796;f?fA+RDF<@%qKlo)`0VtL74`!~516_aogYP%QfG#<2kQ!pijthz2 zpaFX3|D$%C7!bL242U?-e@2QZ`q$~lgZbvgfLLyVfT1OC5<8@6lLi=A{stK#zJmWd zlx+(HbgX)l$RGwH|2rV@P3o@xCrxch0$*z1ASpy(n+d4d2XWd~2AYjQm`xZU3af8F p+x$Nxf1895@0bJirXkdpJh+N7@Nb7x007(DEB&^Lm}dWn{T~m64-^0Z diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e0..fae08049a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefaa5..a69d9cb6c 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..f127cfd49 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..2bcf47ff4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} \ No newline at end of file diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d new file mode 100644 index 000000000..3152aa7f3 --- /dev/null +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -0,0 +1,257 @@ +// 1.20.1 2023-07-03T11:19:34.4889238 Loot Tables +24df81614f6b28c4c7e59589d79fd2c929d71727 data/refinedstorage/loot_tables/blocks/black_controller.json +aadbec0f79a3fb95d39e866a453cfec0cbbacd36 data/refinedstorage/loot_tables/blocks/black_crafter.json +a792eb6ac90ce775052c9c4a1b29bf9551477b5d data/refinedstorage/loot_tables/blocks/black_crafter_manager.json +8d35a75c3113cc686903be08841f9947a4e283ac data/refinedstorage/loot_tables/blocks/black_crafting_grid.json +012ad0521b80c1702b2bc3e40f497e7183d026d5 data/refinedstorage/loot_tables/blocks/black_crafting_monitor.json +4c0821c26133436eb65a6d3f9582ace6645022b6 data/refinedstorage/loot_tables/blocks/black_creative_controller.json +637e7efcb6f118e02ccff1ee8a4e942941c5f752 data/refinedstorage/loot_tables/blocks/black_detector.json +7999fa88db679231287dc5f26e6ec806e4f960a8 data/refinedstorage/loot_tables/blocks/black_disk_manipulator.json +b50c133cdeb92695c8dce45b51ddcc38f62170bd data/refinedstorage/loot_tables/blocks/black_fluid_grid.json +63d1d4f37b3ffbeb4fc1ade464d75eecbd6d1bc0 data/refinedstorage/loot_tables/blocks/black_grid.json +c4ae253974a27ea4a2eb4a1886fe1fd563662387 data/refinedstorage/loot_tables/blocks/black_network_receiver.json +c9ac403f6e8cc119e2c0301a2986386458db8c44 data/refinedstorage/loot_tables/blocks/black_network_transmitter.json +ee63465c82f3b6057724a18d4191b75d61e594fb data/refinedstorage/loot_tables/blocks/black_pattern_grid.json +dfdc5c4b6a29d6d09a9f978ae72d416c747d49f5 data/refinedstorage/loot_tables/blocks/black_relay.json +57b43a2820cdc36a1149bdd09787a7ac93261f5a data/refinedstorage/loot_tables/blocks/black_security_manager.json +e304e42fe33afc5255989a8e8d347024b1427128 data/refinedstorage/loot_tables/blocks/black_wireless_transmitter.json +0296cc57b6041564bb8fed5e0a932deb84d4bf05 data/refinedstorage/loot_tables/blocks/blue_controller.json +a08dd8907fc5779207804aa2cb4193c9dd5eab1c data/refinedstorage/loot_tables/blocks/blue_crafter.json +56b6e9d582e51c0dca14235c419c8bf61c8af6ed data/refinedstorage/loot_tables/blocks/blue_crafter_manager.json +a4302c275277be4cf7d0390e6d1ea0992416cf21 data/refinedstorage/loot_tables/blocks/blue_crafting_grid.json +0da6d20c18230429cec259adb30b4424c9778093 data/refinedstorage/loot_tables/blocks/blue_crafting_monitor.json +8a3784d5c3d51182678726274fcc79fdef70d498 data/refinedstorage/loot_tables/blocks/blue_creative_controller.json +050ec8e7340ec97b68f480d7c6901d7d5510dc60 data/refinedstorage/loot_tables/blocks/blue_detector.json +93e877f743d1ccf6bb6eba3c60af1554a429815d data/refinedstorage/loot_tables/blocks/blue_disk_manipulator.json +14921e4a33424e7441d5fd0b4fdc3668460b7e12 data/refinedstorage/loot_tables/blocks/blue_fluid_grid.json +fb0553be84143db66f967729b738b2324e0dca77 data/refinedstorage/loot_tables/blocks/blue_grid.json +6447a482f3af9307a4fd8a8fd1a23cb875639b79 data/refinedstorage/loot_tables/blocks/blue_network_receiver.json +33e0950230a312281fce50d688678b2aff26a474 data/refinedstorage/loot_tables/blocks/blue_network_transmitter.json +be8e6e5fea118107b59f89ce0f404b5fef9761a7 data/refinedstorage/loot_tables/blocks/blue_pattern_grid.json +ecf55accdc040cada2d4e7eefda8cac6f2a4ce14 data/refinedstorage/loot_tables/blocks/blue_relay.json +673c38ad280709ac1662e8bc58a9f8229764b7f4 data/refinedstorage/loot_tables/blocks/blue_security_manager.json +08b72ed148b8e1728c58011ff0ddc8d5a466e940 data/refinedstorage/loot_tables/blocks/blue_wireless_transmitter.json +b3237ea64098bd1fbf71c63fffc759093b874865 data/refinedstorage/loot_tables/blocks/brown_controller.json +914fbbb04e5f9bb9352d875afc3cd63d7abc9f63 data/refinedstorage/loot_tables/blocks/brown_crafter.json +3d3f99a92764bd9d89a40821c0851979b19d3971 data/refinedstorage/loot_tables/blocks/brown_crafter_manager.json +460b1ee39206de106a690b05a4a0a9b4a2f11b00 data/refinedstorage/loot_tables/blocks/brown_crafting_grid.json +18d4fd48da652f3399d464b86445e5dd80188b28 data/refinedstorage/loot_tables/blocks/brown_crafting_monitor.json +eda5a766276ec827ef9d7f0cd6a5270d06036b37 data/refinedstorage/loot_tables/blocks/brown_creative_controller.json +86e9f01aa04c79323d242d46dc5f78663523fea7 data/refinedstorage/loot_tables/blocks/brown_detector.json +902cecd6312f228465cd2997070ae621db076fd2 data/refinedstorage/loot_tables/blocks/brown_disk_manipulator.json +95168aebbc23eba242dab32f7a3cb7ab88918839 data/refinedstorage/loot_tables/blocks/brown_fluid_grid.json +59ec70614a7a75b94522cb20c8e3462496f995bf data/refinedstorage/loot_tables/blocks/brown_grid.json +ed0877cc6b64179d6cc13ebcca44d6b663d90e6b data/refinedstorage/loot_tables/blocks/brown_network_receiver.json +4a23a64fcefa7a944877c0df463989c39c7812ac data/refinedstorage/loot_tables/blocks/brown_network_transmitter.json +4770d6f0799098bb682bc2ef2779c9d6f5f706fe data/refinedstorage/loot_tables/blocks/brown_pattern_grid.json +a5bf6fb6fd9deda0086a8f668f6df4b9a6968020 data/refinedstorage/loot_tables/blocks/brown_relay.json +20844d7fa89051d608178eac9557f56a3e8086b4 data/refinedstorage/loot_tables/blocks/brown_security_manager.json +9e012b0d20c6b027ccbaa244424c48ae1edab87d data/refinedstorage/loot_tables/blocks/brown_wireless_transmitter.json +13eaf1d8f3590c76ae60cad2b0e245946dba0491 data/refinedstorage/loot_tables/blocks/controller.json +b0acafdeb359996979dda5951c75e93b533ed405 data/refinedstorage/loot_tables/blocks/crafter.json +d39773a6d3f107a7068357d69936312e13811046 data/refinedstorage/loot_tables/blocks/crafter_manager.json +5d66d52291db34ac4b2f15572654a73e2f230d06 data/refinedstorage/loot_tables/blocks/crafting_grid.json +8ded2143b0001e35db03f982b69ecde40d8d8f77 data/refinedstorage/loot_tables/blocks/crafting_monitor.json +cce990773ee788735e2a2b683e971b4b23d607c1 data/refinedstorage/loot_tables/blocks/creative_controller.json +67345bd6e3b6c0b8d508a7616181c3115e97cc02 data/refinedstorage/loot_tables/blocks/cyan_controller.json +20fc40541c376fd28727c7836cf7822400e0aa74 data/refinedstorage/loot_tables/blocks/cyan_crafter.json +f0b8b0b499d202ec7e237f15b89ce1025e24339f data/refinedstorage/loot_tables/blocks/cyan_crafter_manager.json +2eab8b310091b32b0ab453b9debb156c23d200a0 data/refinedstorage/loot_tables/blocks/cyan_crafting_grid.json +7e4f01e9c94edbd6c216be21658f044340207df9 data/refinedstorage/loot_tables/blocks/cyan_crafting_monitor.json +11074d09ba1cc7c04b17b07f9f481b408d07a807 data/refinedstorage/loot_tables/blocks/cyan_creative_controller.json +db6b92cae914d6e33b365da52b1d1a1a50b5d90c data/refinedstorage/loot_tables/blocks/cyan_detector.json +23dd314b2db7817a2a506a6ddcb6cd46828e98c0 data/refinedstorage/loot_tables/blocks/cyan_disk_manipulator.json +7ce3366b8ca5a0fbeb460118b4fe4511054343b4 data/refinedstorage/loot_tables/blocks/cyan_fluid_grid.json +40aac1ca0fcde10b0cd17bfd1fa21d9a0972e5dd data/refinedstorage/loot_tables/blocks/cyan_grid.json +f05d82fea559ca7e2d45e246b577eaf6b5c49ba4 data/refinedstorage/loot_tables/blocks/cyan_network_receiver.json +a3dc355c2a4c4d38a90662bf9ebaedb606d42280 data/refinedstorage/loot_tables/blocks/cyan_network_transmitter.json +4c5ceb9196f030d7aef1716556f205a7ce79c583 data/refinedstorage/loot_tables/blocks/cyan_pattern_grid.json +c2d4acd3c98dd473b0d80b5961592a8d61f96191 data/refinedstorage/loot_tables/blocks/cyan_relay.json +295d129c7fd49180e9b14058567269571acda43e data/refinedstorage/loot_tables/blocks/cyan_security_manager.json +56ca30fdf4d256d1392fa90a474094a2ed81a442 data/refinedstorage/loot_tables/blocks/cyan_wireless_transmitter.json +156eabe81e2ac096f6ca34c39805dec8f1370346 data/refinedstorage/loot_tables/blocks/detector.json +1d5bc2eaa70e29576d05a2dcd1df639402c34b7e data/refinedstorage/loot_tables/blocks/disk_manipulator.json +107bc53a7e09fbbc5db214fe0c8a7679456b333d data/refinedstorage/loot_tables/blocks/fluid_grid.json +2ad4c836fac06bbee7121f506feec44dc1b7c65f data/refinedstorage/loot_tables/blocks/gray_controller.json +b9857a36d6ee90f53c1c59df8fbc892359394e6b data/refinedstorage/loot_tables/blocks/gray_crafter.json +6ac770d2b9a4bc57efb306fe9aa94479fa6b4852 data/refinedstorage/loot_tables/blocks/gray_crafter_manager.json +0f0c0ed12a2d37258914f28b9b3d319cdbac158c data/refinedstorage/loot_tables/blocks/gray_crafting_grid.json +5e89a416f0f116493c95ced55cc77d14c7fc1e3b data/refinedstorage/loot_tables/blocks/gray_crafting_monitor.json +376724ab7bff219a1bc7d7f59141fd8fd79b43be data/refinedstorage/loot_tables/blocks/gray_creative_controller.json +894e4868a4b56b51df079b8d082a8a539c0aa349 data/refinedstorage/loot_tables/blocks/gray_detector.json +ccce676f74305b63d7a45e76d1093d2881cc2d1b data/refinedstorage/loot_tables/blocks/gray_disk_manipulator.json +9e818613128f3e24f938ea39519998606b2f6107 data/refinedstorage/loot_tables/blocks/gray_fluid_grid.json +ef34eceddddeb3777ba114d25a3b093bb1985139 data/refinedstorage/loot_tables/blocks/gray_grid.json +7463992e4ea9b61d3dbfcd81341dd8b756a94531 data/refinedstorage/loot_tables/blocks/gray_network_receiver.json +4f662f4d38ef075c010b0a337a2cd45c9710fcf4 data/refinedstorage/loot_tables/blocks/gray_network_transmitter.json +ce1871ff8079907c0de3e50ceb40802145f98f72 data/refinedstorage/loot_tables/blocks/gray_pattern_grid.json +c739c4afad2147f0902a1013d53da59e7eb1e656 data/refinedstorage/loot_tables/blocks/gray_relay.json +fd4af6d41f5612a4ac464d465ad21dce414984dc data/refinedstorage/loot_tables/blocks/gray_security_manager.json +e1353552c7aed55619efb3ed643fd33eadb13087 data/refinedstorage/loot_tables/blocks/gray_wireless_transmitter.json +2dd7488f69441e242618f0e9dfeb93abd0bc0ad3 data/refinedstorage/loot_tables/blocks/green_controller.json +32ccfda148ce86567f186607ae93b2c4117e8d7e data/refinedstorage/loot_tables/blocks/green_crafter.json +d363818fcbcdd2c51401a534c00065d44fddc0e9 data/refinedstorage/loot_tables/blocks/green_crafter_manager.json +e1e0d283fdaa6ff9904e1e60f005bedb767b0798 data/refinedstorage/loot_tables/blocks/green_crafting_grid.json +1d12d626542f20ad4c52ad9f6b6e87db8757b8b2 data/refinedstorage/loot_tables/blocks/green_crafting_monitor.json +56164ad40e03763835fcbb68d2ff9fbdf5e8171d data/refinedstorage/loot_tables/blocks/green_creative_controller.json +d2ff277a9a0c37c996e042ce59ddc9c7fe1b92d7 data/refinedstorage/loot_tables/blocks/green_detector.json +d10680065650631f22d28bc7aade92b2cbb4aada data/refinedstorage/loot_tables/blocks/green_disk_manipulator.json +e0ce4fd2d89fd0e021dc7d52f48dd107a242f1ec data/refinedstorage/loot_tables/blocks/green_fluid_grid.json +5c4dff25ce16c01e1bf0fc0e0cd83f87ac195dcf data/refinedstorage/loot_tables/blocks/green_grid.json +71545b38180cb9bde153577f710bed49e86cbc1d data/refinedstorage/loot_tables/blocks/green_network_receiver.json +772a687694d40153439ee486788c1072c630dfde data/refinedstorage/loot_tables/blocks/green_network_transmitter.json +764ac435e57b29770189f5c7a792802540f4dd1a data/refinedstorage/loot_tables/blocks/green_pattern_grid.json +65321612e15b70f4feb7a0c682a13ed20e22008e data/refinedstorage/loot_tables/blocks/green_relay.json +95e279728c3bf38953213a3a3e8b4a3df84da9f8 data/refinedstorage/loot_tables/blocks/green_security_manager.json +d64a37db61317d3c0952740116f231b94602b0d8 data/refinedstorage/loot_tables/blocks/green_wireless_transmitter.json +8686ebf23a0c2f933f83cb6199fe4df0caf20605 data/refinedstorage/loot_tables/blocks/grid.json +e9ed2e584a1dcab850e7bae6c0dd92a872b278f4 data/refinedstorage/loot_tables/blocks/light_gray_controller.json +053a94f2151f2764149cf7d8aa54fc2e70b70c2e data/refinedstorage/loot_tables/blocks/light_gray_crafter.json +184c45a8c184817e1dbbd6feb03167f1fdcae7d6 data/refinedstorage/loot_tables/blocks/light_gray_crafter_manager.json +de4a69f0aac181b36d60f145b2b35766b5a09401 data/refinedstorage/loot_tables/blocks/light_gray_crafting_grid.json +9dbeb212f1973177f8d46dd3e252ac4675c7d65d data/refinedstorage/loot_tables/blocks/light_gray_crafting_monitor.json +aa648985c345347e5e01f8409c0f45727592c4c6 data/refinedstorage/loot_tables/blocks/light_gray_creative_controller.json +748f422c40c96f5bf2532ecb0d67d8d9fc2fde73 data/refinedstorage/loot_tables/blocks/light_gray_detector.json +4c4f9259bb20324d683bb3edd6601b6cdfd99d3a data/refinedstorage/loot_tables/blocks/light_gray_disk_manipulator.json +05b5b11c7a048ff3c00c48321d9b0d64ff28ba50 data/refinedstorage/loot_tables/blocks/light_gray_fluid_grid.json +4a850d2a9905c8977e6de3d21105945f2442de1f data/refinedstorage/loot_tables/blocks/light_gray_grid.json +3a83c78d233ba5d80a2cdbb293474fdab177b003 data/refinedstorage/loot_tables/blocks/light_gray_network_receiver.json +2d66d17b758a77419bb11b2ecdf6f4cd352e0d30 data/refinedstorage/loot_tables/blocks/light_gray_network_transmitter.json +a85a5cc9a326b786474fb9efad32abc3d0afff9b data/refinedstorage/loot_tables/blocks/light_gray_pattern_grid.json +d780c67d377d8c95afc37f00cf3b41bed969dd5c data/refinedstorage/loot_tables/blocks/light_gray_relay.json +c47f072a53c7becbab85b2a1fa1e1bcb874f182e data/refinedstorage/loot_tables/blocks/light_gray_security_manager.json +34300f1c0f498b6525eb884dc828f7f08740644c data/refinedstorage/loot_tables/blocks/light_gray_wireless_transmitter.json +496511df85e27278e47953fed29d8fd799309e71 data/refinedstorage/loot_tables/blocks/lime_controller.json +ca310f08455606ac4e396fd5bac020693bce6caf data/refinedstorage/loot_tables/blocks/lime_crafter.json +b1423335fa0c8a09a9e259353399a503466224f2 data/refinedstorage/loot_tables/blocks/lime_crafter_manager.json +ffd8c0eb615b97d850fcef854a769e493c4716ff data/refinedstorage/loot_tables/blocks/lime_crafting_grid.json +783e77a1007c4493722cfbf350ae87d4de3c7709 data/refinedstorage/loot_tables/blocks/lime_crafting_monitor.json +63df35073fd082358f319ddfa9151680c8c11a97 data/refinedstorage/loot_tables/blocks/lime_creative_controller.json +963a9cf50e1637f58168564b8a3e6c79b6f7df31 data/refinedstorage/loot_tables/blocks/lime_detector.json +5108afbce6b00ba5aebecf5a1b830676c9ab46e0 data/refinedstorage/loot_tables/blocks/lime_disk_manipulator.json +36c2b8de89a3be3b9c94eb888172f14c597397a1 data/refinedstorage/loot_tables/blocks/lime_fluid_grid.json +3f06f52d23473176254ded743c65f1a0f705c274 data/refinedstorage/loot_tables/blocks/lime_grid.json +f7f89777329a9947b78d44aa598130eeeaf46e56 data/refinedstorage/loot_tables/blocks/lime_network_receiver.json +de0bd3f51fb36d84a1e878e1c245873fdf8d5092 data/refinedstorage/loot_tables/blocks/lime_network_transmitter.json +7f6e0347cd73c6c32f049bc24b31615774bafb5c data/refinedstorage/loot_tables/blocks/lime_pattern_grid.json +54b79f03c436a14c01c7336ea7990737c7f0d1a5 data/refinedstorage/loot_tables/blocks/lime_relay.json +224b225bcfdc170f0e252f5b24cc3ad1cdd22c35 data/refinedstorage/loot_tables/blocks/lime_security_manager.json +8a1c7b13a82323edf98d35dea2d58a7f67f1be1e data/refinedstorage/loot_tables/blocks/lime_wireless_transmitter.json +ee7f558dcd74223058695bd556e7c9fb4822ab1a data/refinedstorage/loot_tables/blocks/magenta_controller.json +6c9af4551b92ab22898ef23c97c800fd9f9ecfa8 data/refinedstorage/loot_tables/blocks/magenta_crafter.json +eb99d699ca7fc009e42c9b1ade0cfd15f01a9318 data/refinedstorage/loot_tables/blocks/magenta_crafter_manager.json +b62eca644682ccb4330ce0bb859887a3699d0e20 data/refinedstorage/loot_tables/blocks/magenta_crafting_grid.json +c83c3e0c58d11f59777a19417aa95f4d875471a8 data/refinedstorage/loot_tables/blocks/magenta_crafting_monitor.json +e17fd6f969351f971c45fb4d57d4df9e281f9ba8 data/refinedstorage/loot_tables/blocks/magenta_creative_controller.json +6a953eb2d9ca8af562bb0d45fc2fe36b40cabb6a data/refinedstorage/loot_tables/blocks/magenta_detector.json +1301940aa011c199a3317cd69dd6eaf0b1620e54 data/refinedstorage/loot_tables/blocks/magenta_disk_manipulator.json +ffdede2468925a2b10dff6bf5af3b1431c0ca9d8 data/refinedstorage/loot_tables/blocks/magenta_fluid_grid.json +d7047c8c229ede6bf7ac65047603d25e6f1ed2a2 data/refinedstorage/loot_tables/blocks/magenta_grid.json +b815c5765403df1462e93a6071ff09cbba46e475 data/refinedstorage/loot_tables/blocks/magenta_network_receiver.json +ac54dab195ac0ab0f50a2839d294784f0521f31b data/refinedstorage/loot_tables/blocks/magenta_network_transmitter.json +400364c11c26cd3d8f7b71b5ae879fa1d10663fb data/refinedstorage/loot_tables/blocks/magenta_pattern_grid.json +70fd6ab4e7a23fae99b040cd9af85fb3c45b9ccc data/refinedstorage/loot_tables/blocks/magenta_relay.json +eb72984254ac782338bda19317d843137c19c275 data/refinedstorage/loot_tables/blocks/magenta_security_manager.json +d14a7e2df81a8227effd234e29d7463aa736d567 data/refinedstorage/loot_tables/blocks/magenta_wireless_transmitter.json +3b996feb6bb950269703c8b8c739631146ddc9ab data/refinedstorage/loot_tables/blocks/network_receiver.json +b6fff20f89fe4b20fadb246103f78a02076d6e31 data/refinedstorage/loot_tables/blocks/network_transmitter.json +9b81c9aa19ae65d547fd9bfb517022eb9999d9a0 data/refinedstorage/loot_tables/blocks/orange_controller.json +1bef1c8c51963a2e3d6c165fe93d65e6cdfd223e data/refinedstorage/loot_tables/blocks/orange_crafter.json +f9a701ef8fd365eb00036f7386d1e7fef483ffdf data/refinedstorage/loot_tables/blocks/orange_crafter_manager.json +b052347226c701e3fbd6fcce2704cdd6a5eec7d2 data/refinedstorage/loot_tables/blocks/orange_crafting_grid.json +fa4e843e3ece45877f5aa4eb581bb415bb843b2e data/refinedstorage/loot_tables/blocks/orange_crafting_monitor.json +2c5fdb4fdcbeceda862b78415a46d544d6c799e4 data/refinedstorage/loot_tables/blocks/orange_creative_controller.json +feed8d697c60b9e3f5c350495dd09d88c5166186 data/refinedstorage/loot_tables/blocks/orange_detector.json +d6bed8b23f4f4ca4423e8c7ec2c7ef6508c73883 data/refinedstorage/loot_tables/blocks/orange_disk_manipulator.json +8b2b1669f6de2119226e7aac025930bbf0547786 data/refinedstorage/loot_tables/blocks/orange_fluid_grid.json +47d683086d96acd03df1e0a3f39d1650f5042f43 data/refinedstorage/loot_tables/blocks/orange_grid.json +6028ef5f54524256be2614bf74e6d5a2cd9f37d8 data/refinedstorage/loot_tables/blocks/orange_network_receiver.json +5eb2338f90194901fde0223b2b8f9cf4df7a1dc5 data/refinedstorage/loot_tables/blocks/orange_network_transmitter.json +a345f55acce3a08adcfa989b466e665b132eaac5 data/refinedstorage/loot_tables/blocks/orange_pattern_grid.json +05f957b8c247c9ff8e3a52ba2e9eacda9e833901 data/refinedstorage/loot_tables/blocks/orange_relay.json +40e68229e3680b257c6d27393e3605099d3e1d2d data/refinedstorage/loot_tables/blocks/orange_security_manager.json +3b406197bc87c8eee2ffff10a3ad8a6b26dd26e1 data/refinedstorage/loot_tables/blocks/orange_wireless_transmitter.json +e734a87e44a3ab72b839061e2c410b280976abf5 data/refinedstorage/loot_tables/blocks/pattern_grid.json +7d432b1ca2685d96c5a075eb627c643f1c238478 data/refinedstorage/loot_tables/blocks/pink_controller.json +aabd2cb525aedd90574528aac116e616febae44b data/refinedstorage/loot_tables/blocks/pink_crafter.json +f95958233f8404103e2e3b12a1f67c65bcda91ad data/refinedstorage/loot_tables/blocks/pink_crafter_manager.json +c6008a683980e41ecfe85e6eb28b5172e8ea1647 data/refinedstorage/loot_tables/blocks/pink_crafting_grid.json +f2b276ed4fcee2b2496f618865b81ba9d20ef349 data/refinedstorage/loot_tables/blocks/pink_crafting_monitor.json +de731f64d79adb6d72a7718fcbf8a08057364429 data/refinedstorage/loot_tables/blocks/pink_creative_controller.json +1fa8402228b423d6837db0f0f0a89b2b977386e3 data/refinedstorage/loot_tables/blocks/pink_detector.json +7b6aedb2e39cfd039c12fa965e544874fec3bb6e data/refinedstorage/loot_tables/blocks/pink_disk_manipulator.json +8b68b1adfaf61ec47065b240780486093fa44d8d data/refinedstorage/loot_tables/blocks/pink_fluid_grid.json +5aad68b152ce93baacdd3782e9741a23a86bff66 data/refinedstorage/loot_tables/blocks/pink_grid.json +1cd050c613c6ebf27dbc7b600b35ff5209c92da3 data/refinedstorage/loot_tables/blocks/pink_network_receiver.json +1ffe3968b44d6412c7d46998b1b8dceb059d8e38 data/refinedstorage/loot_tables/blocks/pink_network_transmitter.json +4a23c78a95c2a5d8acc68fc6f291565b209c7a9e data/refinedstorage/loot_tables/blocks/pink_pattern_grid.json +467014d74cf161a2c3a6361a8ee6c22533ce55f2 data/refinedstorage/loot_tables/blocks/pink_relay.json +64038f767f4cf1328f997b40bb40a172d13b8c55 data/refinedstorage/loot_tables/blocks/pink_security_manager.json +c07f1e1a05d68d8a35b1fc5dcd432cf8b578e2cf data/refinedstorage/loot_tables/blocks/pink_wireless_transmitter.json +f0e9df045caf7a2a5ab026acaee0c0b63467459d data/refinedstorage/loot_tables/blocks/purple_controller.json +ecf72bb58c1416d231041cdf6597d5985ac3bf63 data/refinedstorage/loot_tables/blocks/purple_crafter.json +58b286402377dd10c026710ee30c6c3210a65a07 data/refinedstorage/loot_tables/blocks/purple_crafter_manager.json +2427fc724d952fc259157b04e7e47e9a9adf9aef data/refinedstorage/loot_tables/blocks/purple_crafting_grid.json +913e0ef93af29c19bbefe95061b5a95894b3d77f data/refinedstorage/loot_tables/blocks/purple_crafting_monitor.json +f3175f9f9415c65280c9d43a8deae5825afecdbd data/refinedstorage/loot_tables/blocks/purple_creative_controller.json +8281ca3173c8f137dca52f4d8b15e8ae62328323 data/refinedstorage/loot_tables/blocks/purple_detector.json +69c32db236c4a4c5ab97f17f1b6c7e9470c24180 data/refinedstorage/loot_tables/blocks/purple_disk_manipulator.json +6a5cd1a241a9824a80020daf0bdf86b36eebf2e1 data/refinedstorage/loot_tables/blocks/purple_fluid_grid.json +91c69a86c61dfaa9183548f9a4b9d3bb6d457ae6 data/refinedstorage/loot_tables/blocks/purple_grid.json +d142bb7058ad7ab11a69fa3cdda0d493dd0fd8e5 data/refinedstorage/loot_tables/blocks/purple_network_receiver.json +12410d1595702c613b4dd65e1292e604c808e002 data/refinedstorage/loot_tables/blocks/purple_network_transmitter.json +f40cad0e109abd767ef8dd083f29ecf81eec4021 data/refinedstorage/loot_tables/blocks/purple_pattern_grid.json +7b2a23a5f7d5ef7768dcad8f1e1dddbed80911f0 data/refinedstorage/loot_tables/blocks/purple_relay.json +447952f40fbbce47c420ea597a23e6c93ef38efe data/refinedstorage/loot_tables/blocks/purple_security_manager.json +9ba20dab86f37397695805c8db0f572e96e541b6 data/refinedstorage/loot_tables/blocks/purple_wireless_transmitter.json +43229da34d37f4560833a9742b3f4b6138da89b3 data/refinedstorage/loot_tables/blocks/red_controller.json +056331455eb87d28a0cb1659d0724282a4ea1449 data/refinedstorage/loot_tables/blocks/red_crafter.json +3972629af5458ffb1c03cea0740e62a78a7b2666 data/refinedstorage/loot_tables/blocks/red_crafter_manager.json +9fb2d4f0c6bed2c9060f4aebe78475ffb75cf83b data/refinedstorage/loot_tables/blocks/red_crafting_grid.json +f75544f8ce7efc64fb91d354af1d5f50dda4c9a1 data/refinedstorage/loot_tables/blocks/red_crafting_monitor.json +22c7826e4cec1b9fd4756427bf1a3b0b187c52df data/refinedstorage/loot_tables/blocks/red_creative_controller.json +f437c5db37d754b96df4dd9c7761f3412b9a3e53 data/refinedstorage/loot_tables/blocks/red_detector.json +9ce161f040fa06eef72775d51f531fd07bef6ed3 data/refinedstorage/loot_tables/blocks/red_disk_manipulator.json +dd1f509da29f69f311d66deb6becf87e75be7e57 data/refinedstorage/loot_tables/blocks/red_fluid_grid.json +e1cb6154faac93b2ca63f1a3c8d894361a532b58 data/refinedstorage/loot_tables/blocks/red_grid.json +02f5ccdccc47354ca9690b347f32a96f5b0051f2 data/refinedstorage/loot_tables/blocks/red_network_receiver.json +600ec0b5ee923cfb7f8ed9d14e24b132660cb413 data/refinedstorage/loot_tables/blocks/red_network_transmitter.json +2e79450eba074c46756b16be391901f2b89daa48 data/refinedstorage/loot_tables/blocks/red_pattern_grid.json +d20b27a7c016c29a431eb70542110a1e7f4ef797 data/refinedstorage/loot_tables/blocks/red_relay.json +3c21b2588322b43c7ceb5b8ef276416c0aa972af data/refinedstorage/loot_tables/blocks/red_security_manager.json +baa1d85de292567f37bb3c4fa082d5f202caea19 data/refinedstorage/loot_tables/blocks/red_wireless_transmitter.json +d2f04a0605843de064981d3ee6d2b7e782c37356 data/refinedstorage/loot_tables/blocks/relay.json +6cc2e8ee53e0bcf6753c2d8d69a9891b27110eb0 data/refinedstorage/loot_tables/blocks/security_manager.json +1ca249351ca9e410362047b3502e3b4e32613cbb data/refinedstorage/loot_tables/blocks/white_controller.json +a0827f3368539eb492d03ff2f8dbc98d530add20 data/refinedstorage/loot_tables/blocks/white_crafter.json +c40e7a90edda22be3940886ee5246677ef82c09d data/refinedstorage/loot_tables/blocks/white_crafter_manager.json +045e2477745e4972ff05638a8191755dcb1766b0 data/refinedstorage/loot_tables/blocks/white_crafting_grid.json +e465dc037c72ffbe767857ff51d0c20dadb37e72 data/refinedstorage/loot_tables/blocks/white_crafting_monitor.json +7d8f3d222b0f155c0f31e6c0f8b456cfc0626701 data/refinedstorage/loot_tables/blocks/white_creative_controller.json +8475b4c7c0ca24facdd93443761d032fcfa4d240 data/refinedstorage/loot_tables/blocks/white_detector.json +04a87335b56c2935578c64257b534fcb0c6ccaf5 data/refinedstorage/loot_tables/blocks/white_disk_manipulator.json +7d84c9cbcc4dba2429375001785ea4730baf985a data/refinedstorage/loot_tables/blocks/white_fluid_grid.json +9e62382949bfad25fd8c83ec0973d4e7297908d2 data/refinedstorage/loot_tables/blocks/white_grid.json +b355304a9aeb739c07d9f9f4c3eed2238423c37a data/refinedstorage/loot_tables/blocks/white_network_receiver.json +4dd2e115fa2d37ad228fe037693fdfb7f3a6d74d data/refinedstorage/loot_tables/blocks/white_network_transmitter.json +130caa289363874ab2dc96a9c3171be4bd4a4140 data/refinedstorage/loot_tables/blocks/white_pattern_grid.json +d7d36879c59cbeebfa0851e428ef6252e04128e3 data/refinedstorage/loot_tables/blocks/white_relay.json +f990de5e3803c7a3c620228fb398e25a84a98524 data/refinedstorage/loot_tables/blocks/white_security_manager.json +1e8bc1858a3dcd0bfaa5b2a5d13bcdec0dce5438 data/refinedstorage/loot_tables/blocks/white_wireless_transmitter.json +b6211ce48a7aef9cbd64f4435ad43b41cdccaaff data/refinedstorage/loot_tables/blocks/wireless_transmitter.json +8009a288908306e879924346d0d4d5f2123b88a0 data/refinedstorage/loot_tables/blocks/yellow_controller.json +641acf6da9b5f838171a42bae45dc19f0fa51299 data/refinedstorage/loot_tables/blocks/yellow_crafter.json +74f175474b5f74c4139b0c85deae09104ed3ef1a data/refinedstorage/loot_tables/blocks/yellow_crafter_manager.json +33fc0a6833d600569ded23cf55dc4c8e2a0883c4 data/refinedstorage/loot_tables/blocks/yellow_crafting_grid.json +a600997dc1478e5d290f171ebbdb42a5a86501d3 data/refinedstorage/loot_tables/blocks/yellow_crafting_monitor.json +dd06b6d13cec49ac1290f89d3ce232daba4fdcb7 data/refinedstorage/loot_tables/blocks/yellow_creative_controller.json +b04dae60c3996c52d86ebaa5a6a876afb5faa536 data/refinedstorage/loot_tables/blocks/yellow_detector.json +a9a6c1a6f9e145dc6f55b6acae994983c41f0918 data/refinedstorage/loot_tables/blocks/yellow_disk_manipulator.json +352d37f7117556cb2c53de4b0846e8ef5ee84682 data/refinedstorage/loot_tables/blocks/yellow_fluid_grid.json +80659f567c1fb6fdad99f9b79522f2b25d1365c9 data/refinedstorage/loot_tables/blocks/yellow_grid.json +288f81f67a969225f871be891af29ff90cf86ea5 data/refinedstorage/loot_tables/blocks/yellow_network_receiver.json +5c016e53badfba708081c8c21e000e7cb591ad7c data/refinedstorage/loot_tables/blocks/yellow_network_transmitter.json +ec629e7f9a1efb517c49e38666e27f141c0c815d data/refinedstorage/loot_tables/blocks/yellow_pattern_grid.json +9a61fb36d749298451e7baec7ec965b91fb3a142 data/refinedstorage/loot_tables/blocks/yellow_relay.json +f7111d534c44737bb7f8e8e15c6484b314a10dc8 data/refinedstorage/loot_tables/blocks/yellow_security_manager.json +3d20f6b4a0f17c42d79516f2bf66647154ef57e7 data/refinedstorage/loot_tables/blocks/yellow_wireless_transmitter.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e new file mode 100644 index 000000000..de34118af --- /dev/null +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -0,0 +1,577 @@ +// 1.20.1 2023-07-03T11:19:34.5209453 Recipes +1ccdc8b9da42fbc8d8c954215c76634af2d5254e data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_controller.json +b4936ab0116ecd65cc2ca1f8342b18d9019d9bf4 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter.json +6632b2a29739b77ca01b29a33688640d63ba85fb data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter_manager.json +dfb6f96fee39c5ffbf7227302b424752bd96cb4e data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_grid.json +d03caf131a0dcd2942d54c66d10f921df05e149a data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_monitor.json +e49cb73e29615572656fc27c641451f3b2053673 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_detector.json +f9ebe5a81e03ff43985503ca425a575a64493a79 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_disk_manipulator.json +f8781871b25cb6a2e8f6ec42659690a474773f71 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_fluid_grid.json +f8c4ac736579666746b17f8301b60537a9b46833 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_grid.json +f4a26844fd0acceb68bee4b3de6c93dfd4ea9f28 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_receiver.json +50a7274debf31eafdcbf3103a58bbcd2c26ba060 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_transmitter.json +3c5aebd9a874b9c4d3156c38202c036d5b26bec7 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_pattern_grid.json +778b87dbf016ca5a7a5fee3ce4526beda7439e23 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_relay.json +f06567303b4c2dee6f6100c260745f5d19dcb4c5 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_security_manager.json +d734c8b60a3e35a9716b308706c692e8e983c285 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_wireless_transmitter.json +c755ceedb07b4af47c16126b443bac132d2e05a7 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_controller.json +8be6a3c6f40769b0309ad247b243e39656318e79 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter.json +bb53afd105480032415f72f32e1634f5ef40f1a1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter_manager.json +7ade31d5936c05ab150ad9f14fdd21072406b4bc data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_grid.json +d12002c95a061d81f405689b460d64700fbb1b79 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_monitor.json +fa341e9a3e245a475fb9dffb234e3988d678d935 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_detector.json +7ebe98659edaf3d6ba1b285a450936e0fe6281c6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_disk_manipulator.json +87710a24f3a6e7397c6dc5e6222043ae34294956 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_fluid_grid.json +c04170319c90f5eadbb769217455b86654866674 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_grid.json +cc9737501f4382cdee9b1fae84b7b1b9594c2d91 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_receiver.json +7c7d01dadf2904fcdfb6bc5b1285382c92e23c8e data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_transmitter.json +759a4a5e27af0fdf244e86a248e725014af5a290 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_pattern_grid.json +2ebd01490a03143442c2fd66839c159c7cb8376e data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_relay.json +f073ceb7820ba2ea1bc70f4306fd217e686318d0 data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_security_manager.json +2ae9d5a36534c7e8d899a6ee83ce30b5f0d17c4e data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_wireless_transmitter.json +a962590bd43162299e488cda8128550e73a2abbb data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_controller.json +02db26c014c699618d90dab3fcd6d52cd3e9577b data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter.json +17049baf2ed41b59aa284523f00bfb154fb1c931 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter_manager.json +49fd7d990e90eff0f7537b6ebd5b10fc052f91ca data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_grid.json +08a262b821efbfb765119893e6292c698158a012 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_monitor.json +c4172a9d49c41cc4a8606f6b8e131b49c1e345fe data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_detector.json +83a9b7b5e28b95d00f32f6de0e31703c8908feb7 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_disk_manipulator.json +3ad9edf8c93fb28841efc120a9a56600cb898394 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_fluid_grid.json +d164d3c222f46a879c44d42650991b14aa643648 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_grid.json +05564ecbe70a47ed7912a4f3218e9cae49dce528 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_receiver.json +321dbf56bb7d859b5e99e1517c544a9024ec6062 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_transmitter.json +a15d9917fbc85ec8b5185b08c8e263d17fb47092 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_pattern_grid.json +e675eb7b2c6b8d71db400fb1ea149b700b84f705 data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_relay.json +f0e88f15d96163c5d9cc2e2817c5b9c499e61c2f data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_security_manager.json +b69d3de671fb3b746849bae11cee180ef79e5e0f data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_wireless_transmitter.json +2a55e44da7ef9b6a549c84a4ff25cd7a3ce7f312 data/refinedstorage/advancements/recipes/misc/coloring_recipes/controller.json +b42a44fb9c0667b93697b22e2eef1e65decfd8a3 data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter.json +2fd383dfa9b7fbce85c9f89e4d8af24197e24fdc data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter_manager.json +85ba23bc44ae70ec8ba527ed63cf8b3427dce466 data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_grid.json +73a18a5e2fcb6e1f744962ac7f7456f4ee6f5077 data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_monitor.json +02d1dbef0efde8ab54edba5f644e429b3649316d data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_controller.json +ba52982be0062793cf98da498a95c6a93b1e9f1c data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter.json +b93f769b6b476e231298aa733c60332ea3d8df46 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter_manager.json +d8a181a34c3731dc1e23b2127bc8857aef71eaa1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_grid.json +5c67bba3d3909b1ce4fdfb08016e59911199cd34 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_monitor.json +2668c3d0ce71dcfc0df44a7e90ea07e0d223126c data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_detector.json +995cb4a15cc7cff1dfe36ca75a47eb499b0d378b data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_disk_manipulator.json +2cddc5ef1e4dd28ac805c39ad1ee8f60f7351ef5 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_fluid_grid.json +956abef1471d8013ae15653a41787cb6d3d151ee data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_grid.json +2be09373525ff8093b579540d71511e906d1bc31 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_receiver.json +cabae7c1c3a796fd25e33501f5079e6f4ac8e778 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_transmitter.json +3c2bbca788aa4f868c48cb4847c19c7b31558db2 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_pattern_grid.json +5335e91909ff0d30c8bb9b83a9aa4cb4be25f2a1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_relay.json +c17be270ad3761c3c124590db795e89c6fa8d82d data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_security_manager.json +48af43bd8ff92c1796d7d204b51fc734a82b3177 data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_wireless_transmitter.json +09e4bdac8cf9419ef4d3f40ae9cf86408dc2840e data/refinedstorage/advancements/recipes/misc/coloring_recipes/detector.json +ab8db3ddaf2f9a753c467cd00de6c588d9305998 data/refinedstorage/advancements/recipes/misc/coloring_recipes/disk_manipulator.json +51aa309ea61ff680d5bf0ec946552ffb5fd5316d data/refinedstorage/advancements/recipes/misc/coloring_recipes/fluid_grid.json +4fd054a312f4eb0a8b3a9bb56be3dbdb6d68c525 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_controller.json +db61afd3745ebc421148c22b434ef8281e915e94 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter.json +9b13889708f6db33997a7ed35ec927805d9e5107 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter_manager.json +54b0b535d8c4d617ca09fd3d861d1ca20bf7fdac data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_grid.json +1a2db04ced6fc1779aa256c52ac70b4ec6cddbc1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_monitor.json +2eca756e6ce9e186a22b34fd4a01f223089e2b95 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_detector.json +59af22598f6675242358b30e227646581d0e873b data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_disk_manipulator.json +78c4724488992e08cb082938fc910ec787afbe66 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_fluid_grid.json +d9fe2664981bdc3e45c64f75403b9b6fed5bedd3 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_grid.json +2fecb3c4e5d8cabd50e87de5fe6bb3c06d563ad1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_receiver.json +ba95b2e29f1533d80473787fbfd3a153a1de0a83 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_transmitter.json +72b99d2987d8b676123f0a3fd5340ab9f7d9c5da data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_pattern_grid.json +189cda08fbefd83bdde9dd4c134c466ecbc9926c data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_relay.json +bab9902be76f2fd373f8dbfd887014d747592ed0 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_security_manager.json +90d2b60fa84e4a92c83c64dff5d68fcda6d66806 data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_wireless_transmitter.json +699029e1d6b8df56b26268a2ac0ea3f33c8b8603 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_controller.json +7189e507d38ffb3f7464bf73f3c41eccf6464df0 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter.json +40afbe52700e25895475941994e0c80a5ca285ef data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter_manager.json +a60727cbee9590245c0d164241e8eba4d58b6a90 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_grid.json +de1fc954196b0d8f2252a5d7dfcadcb8bda764e5 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_monitor.json +c3f929ff17599ff9711858e7ec13d88e31836c19 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_detector.json +0316d3e1959064644d0634e210b1cc1e24093c47 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_disk_manipulator.json +634a44a191ed9d6aeafbb8d21829302c4d9ae1f5 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_fluid_grid.json +56da4b8e41528e3a464bffec026fd6e9e74e265a data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_grid.json +0b4c0cbcf4ecffe9d3dcd77911e785af7bde7ed5 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_receiver.json +36ae0dedb42a509c84ed248f5aedb5080cd90985 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_transmitter.json +77415d3217445c1a0339fe1a9ffdae26306068af data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_pattern_grid.json +dbdb0874c76b51c43946eca003889373d99a7b86 data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_relay.json +bdb9efd5b1395d39bae15ac611d5f66d111ac15d data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_security_manager.json +4d2be8248b6e9efd7bd75d2d5f63c1ebb6ecf66d data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_wireless_transmitter.json +af2bc4406c4c60341b5e28bf65f4b2e7c4d0261f data/refinedstorage/advancements/recipes/misc/coloring_recipes/grid.json +b879554557bafdfd39bb57a9ecc6aaa2f2cfe307 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_controller.json +19605f469bf4528dca56858e55b604baf0f2eb39 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter.json +d7c210cf9d044ead0597e44b1d63bb83784e6a49 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter_manager.json +3c715dcc65cfa6de80c96dc550d0aca6d8460576 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_grid.json +444c4e9d072601dde3690d0c639eeeff892f5a99 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_monitor.json +5466e9b0aadc821af73ffdc7520f4f3cfc4421bd data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_detector.json +d770a4a3a3527dcd3cc909a3d17e7d81f3424429 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_disk_manipulator.json +604bf9ad3df20ee4f711e8f75130923a0e0a2b8b data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_fluid_grid.json +ca9685f1f9ad32b1f924fd135d2178e9be40bb32 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_grid.json +56823e07a537aadd9bd095d762dae28444afea19 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_receiver.json +36d5f0a9dc4e4961b03c7c930a35f1cecf5749f9 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_transmitter.json +804d06426c69215198c3b4948a87cb3e5912111e data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_pattern_grid.json +6add2b426e5491325152008443bad863fc04daef data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_relay.json +9bb39b418c11dc655b4b3cd516ee31b19d006fe7 data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_security_manager.json +c5897bb4707fbc6eaa48477fd5c59573f22fa9dd data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_wireless_transmitter.json +e490273ac7208440555bb7333e7ab24cc8cc9d80 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_controller.json +0614163b7b7655d414774c030ada737696f9c93b data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter.json +70deeabbf468d7f165ae5254f55b039bad8585dd data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter_manager.json +f2cbd6430988083a89b8c0f536cb19c70990a23f data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_grid.json +e910857dafcc27a411d3edb2a2167ffa0d8681b9 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_monitor.json +0361396d80fee4c9db88c50af70e9b04f9ae4cb6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_detector.json +9d73c4275266e65b17be19d1717f0451e0d2c949 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_disk_manipulator.json +3477ac09d2e3301f5deb58c883a06489f983f429 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_fluid_grid.json +8a4e1988875db560e6e5a6b481c7fc2e41b893ab data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_grid.json +cf79f45bbaf41497f5c12efdf0e55ba02a512023 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_receiver.json +fa1f79c714853119c3a7cda05bccf73ec86d0f20 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_transmitter.json +a39b9c44b438f03f809ebe3d8dda726197a5acce data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_pattern_grid.json +c4a94e9ece99c55662d029cb53438cec0ef7c420 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_relay.json +54c6bb830d659fa05f810d09ed3ddda1d6b66e98 data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_security_manager.json +3470866b7f96df1fcbdc93078eafa4d6d27e988a data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_wireless_transmitter.json +c4d64ce24647bf739038ce0c3b457a0f836a185d data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_controller.json +97953ad5365a9155272cd4ea068c11d43b2b26d9 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter.json +5719b301c1503b26e3525601f930fc61b1912e0a data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter_manager.json +9706d3b8f740ee711628c48b663b8e3cc777daf5 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_grid.json +4f13977b66a44c09644bdbe006e9dcfb3de72a47 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_monitor.json +a8a2b92d1a5e234baddc3ea6314f38bb46c780f6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_detector.json +03ca6efc1693208521a8d3c1209aed51745a1615 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_disk_manipulator.json +2eae278a2f561ca5959847a936eb74ae4785d6e8 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_fluid_grid.json +a8243c9dc90661e5416471ff245dc412fc820747 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_grid.json +88ed49b3609565b5b6ecfd0709657603b6edddbe data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_receiver.json +3493050d89f527a02693c41af5865588da5e270d data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_transmitter.json +dbc7081a31195a49a23647059d6bcd8581dec29f data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_pattern_grid.json +be24bae310b62f6546762f520821905b30d8631e data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_relay.json +f308b488e9e71af8b23e244f0714eac5396b6cf1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_security_manager.json +e022cab4e77209c243944f557a526ac916ca08a0 data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_wireless_transmitter.json +52b4b5375c0324d2d8a40f9357b68c87f79df04a data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_receiver.json +862382143572c47cf50bc8bbccb4541f0b817f7a data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_transmitter.json +df24602e1c1c5d3d91fb46597ba799f204bac9ea data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_controller.json +d4618b2cdb01659cbe2b3031190e623e81dcf22e data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter.json +25e94414f3c14fbdd7180184a7d6aa365ea8464f data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter_manager.json +bdc0a38ca44158d5f8c817b3fe30e1ad9daa5158 data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_grid.json +f3b377b67d7f1f8bdd656e587d226ff7a36e4d7e data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_monitor.json +0021989425af1537ec0ef53e2a525ab9c9b94f02 data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_detector.json +576e3d0f691966df6766df9a32588ed2ba208396 data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_disk_manipulator.json +29bd7853448c0c2fc0a049264bed1ea805737002 data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_fluid_grid.json +081e3672fe8aa54a1946eb59b81ca8902448affd data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_grid.json +54c02681bd4ffd2e2fb3c68650d8a9e4f417308c data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_receiver.json +3cdd104d17d05d0fede9542f64d427a18658d40b data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_transmitter.json +7a0a1f51e073ca6484579511972204a8ab76969b data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_pattern_grid.json +e91db73dfe9ad4b78d91b689f82d1b3c233d7cc5 data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_relay.json +9445173b11608182944ea45123f27391a8294b8a data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_security_manager.json +88d61e9428e53267f7edd048e08fdd658cac9131 data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_wireless_transmitter.json +f684cb1751a6b036a66136b61b2a5fb24406ab30 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pattern_grid.json +617817f73fdc6d5e72bde4ba2e5f08f7b286d7c1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_controller.json +e03f4775054d6497f51cca12ee0476e2b4f5c34d data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter.json +a2acc3ed31696c0d61f306adc7545a0d03f24078 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter_manager.json +3f2ad02fbc5330ae4927db57185b42967f09c3d6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_grid.json +bd7fc663ca4208b36c1666dc62b0a45ee96ba7ac data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_monitor.json +d98c7510828fc1b6c3c8612d418fb108200f2ed0 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_detector.json +ecb2320154336f33491cf130a930580ffc9b7323 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_disk_manipulator.json +e442045d3d4e66789d5dccaa3b285fbef7cfa33a data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_fluid_grid.json +f3a231743120b2810984af017a299c41e4e00dfb data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_grid.json +908754201a278d836911d60d3d02f6f727442367 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_receiver.json +ec34f0708c2652a3cd6d77b6cd01f217fc6c4940 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_transmitter.json +232e7e5ce602dd5f1006800dfce32c3687aae425 data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_pattern_grid.json +a16db207cb78778a363725424383c60bfb49db8e data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_relay.json +1d3856b4b21618211dd0d1083ad75b0a90a59c8f data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_security_manager.json +16bb828d0a348eaf5cffd9975ffd22b5274d473b data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_wireless_transmitter.json +4eb43764eff9d1b06bbf4485b7489021e337dc2b data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_controller.json +bd921dc82b484cd6d3cf76ce05d063fa6e740093 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter.json +5819d28c054ec6dbab0e84302e12a5b7978d7e00 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter_manager.json +9a1a926064acda161def7c59ea6885e01df09ca4 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_grid.json +160e81d20baaee77c90a87c496213b52cbfdb7b8 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_monitor.json +126b4e2197e57df8c1c4716af163108b4275d0e6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_detector.json +c5e54d4c7865581a72f291a6b3d04402ae8e5d78 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_disk_manipulator.json +904e836e3626651fd7420b2f67c221112b30c377 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_fluid_grid.json +029c065a27503cecc81d303a45af23b1a7daf787 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_grid.json +d602d4ac45eddc124cd79fc141a55b5f0f144d1c data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_receiver.json +fecaf6a5c5449164c9225d913ee53807cf81edc4 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_transmitter.json +2db942785bbce5ec8c07c664dafb5f7e8bbe369e data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_pattern_grid.json +3d8131ea7f8988f8c27ba74706a511d78237d2a6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_relay.json +c54a211d3531658c6ba9bd0eb90aaa48ca51e443 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_security_manager.json +cf0e7d9373c3f430235947b6d224702245cdba08 data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_wireless_transmitter.json +66b08a96e305d24c56353bba057a008c58e9e48f data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_controller.json +35fba66c17086789574d8d62d8c8c18f588664c1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter.json +4f6b19c1321488f3336493d5c5ffe8a0d0315650 data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter_manager.json +600e0dfb0e9c017057513f6e0b78d4d2a7a1c3c8 data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_grid.json +734703b80957a93b0066a9e682dae219284a697d data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_monitor.json +f52a36f19ec0345c48913dfd73415e9fc1636c8c data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_detector.json +a9ef187ded9964021b101abab322540c5d83070f data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_disk_manipulator.json +05302283273bcc5e51a4987ae471ea2311d3039a data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_fluid_grid.json +b54d0ec218296a963e630b4555385cf9add9260f data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_grid.json +d9bd8f7831d1d4d182044fa9dbf3f12610d565be data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_receiver.json +03c625999d65e0566343d1aea36bc8b695564b7c data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_transmitter.json +81d67e0a1de3c6c3b31aee2f3b00a198a5bada7c data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_pattern_grid.json +1190663774ffe5073bcbef474514968129aa10f8 data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_relay.json +a090e13eaa23db5bd8d32ee503eca0041ec7361a data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_security_manager.json +807746a3f4e939d20b7135f0148dc633364e9b3d data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_wireless_transmitter.json +75974f2c006691bef16f8efe2a6d63274a9d78fe data/refinedstorage/advancements/recipes/misc/coloring_recipes/relay.json +5d0c3266f6cdb465a5c19c552ac5fba4c7cde68a data/refinedstorage/advancements/recipes/misc/coloring_recipes/security_manager.json +7e559b0cb8a411c0edba159b642bc731a9f2f38f data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_controller.json +a4c4968ca66146409eff18594cdbfef2aec3699d data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter.json +6300765005ed782bd98e6bd1830745132e910c85 data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter_manager.json +079b9e4c700caf048c40bf183ac3016c632345ec data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_grid.json +7a5ef65d5ea2a4e7caf1458837c83d7e469b4883 data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_monitor.json +3d387cec08633612e8d8cadf7a0eacab1dd10303 data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_detector.json +8f7db0273cd114ad9106ec8d4475089a964a2e08 data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_disk_manipulator.json +fd314e1043ed70a9096fcea2a4d4e8ac7e72441b data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_fluid_grid.json +6b40be8890f069f45b5b19f063c430cd65e0f858 data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_grid.json +38eae4009978b81bc6fec1507f2bcd6f4ca5b46a data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_receiver.json +c13bbe7e47941e94a5a5ae2091d33bb8aed8f2fe data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_transmitter.json +8653e6982c7c3a64427f2ccec2afaefa53f7de43 data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_pattern_grid.json +5bab7e83a3bd425758f3a8c239f63961bd3ac949 data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_relay.json +b3be48c1b1e587efc0e0f512dcce48ff1e5116dd data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_security_manager.json +7234d5f762c86442ddee18d705a119c13573f79b data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_wireless_transmitter.json +f59a4e2908dbb825bdcef3208263e3df48df760b data/refinedstorage/advancements/recipes/misc/coloring_recipes/wireless_transmitter.json +2fcddbf4c50c7f52d91b008d0866c566bedca3bc data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_controller.json +0fa365d5a96bf9f0f3d1b6a776fc35ed3b0893cd data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter.json +475c68795098be03f5a404dfd5e261a93a69f123 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter_manager.json +95118ff17f8dfdbd672475050f2ea5319e9208fc data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_grid.json +f0e12984a37434c19d9b65701ecf5804b1f963c7 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_monitor.json +0816417040e1a4919d20db8c3f99d8ddd77710f7 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_detector.json +eae49d7931f88dbf52b9b6402cfee5c46a7d4cc6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_disk_manipulator.json +ae5ebdb3b556b67e0175cba8d9daa15d2e164db6 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_fluid_grid.json +24176fe9e4d3fb783ba39b69a2c20e8b8e7f99e1 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_grid.json +3ca0bdd3d90dca9b7581446c72d37add6b9f13c2 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_receiver.json +c4b2a8bbf30835842836aa9887fa56c82b2e807f data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_transmitter.json +3a813110425a79a68c5ef0f60752b1ca0ff7ef55 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_pattern_grid.json +098d4e5a83437f6d0e5d3745dfbd7f54e0be6294 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_relay.json +0e8fb2bd4a6dbba7d9673cbbd9747f917d983d9b data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_security_manager.json +247094b5916ba8f2e77ca1c1329ae18446ae6823 data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_wireless_transmitter.json +c278e82a523f0bde1dc7e962acf28e026c6914a4 data/refinedstorage/advancements/recipes/misc/crafting_grid/black_crafting_grid.json +cba2456ea48766262a52530c56117c02af77b4c3 data/refinedstorage/advancements/recipes/misc/crafting_grid/blue_crafting_grid.json +7240a29ca09be1128603f29e7baa8e663010c261 data/refinedstorage/advancements/recipes/misc/crafting_grid/brown_crafting_grid.json +37cd10fc6c848954777919cdf3eb5b2ff8032c28 data/refinedstorage/advancements/recipes/misc/crafting_grid/crafting_grid.json +cba30f93946a4032b3565a95d4b55c1a2efd0080 data/refinedstorage/advancements/recipes/misc/crafting_grid/cyan_crafting_grid.json +92005a46776d1cd4bb0b0ccd63682c6cee9e8039 data/refinedstorage/advancements/recipes/misc/crafting_grid/gray_crafting_grid.json +f08f02320eb125413d070f7a6540dad9c2349806 data/refinedstorage/advancements/recipes/misc/crafting_grid/green_crafting_grid.json +8d08b717a5cb964344555acf3f20440b8f83bae5 data/refinedstorage/advancements/recipes/misc/crafting_grid/light_gray_crafting_grid.json +2f520f3301dc223607645e87a504757f30942701 data/refinedstorage/advancements/recipes/misc/crafting_grid/lime_crafting_grid.json +ab8065e18037b2edd54b30f1eb756750e3909e93 data/refinedstorage/advancements/recipes/misc/crafting_grid/magenta_crafting_grid.json +dce8d97b2c11f963955fc20ebabc5f91bc7eede8 data/refinedstorage/advancements/recipes/misc/crafting_grid/orange_crafting_grid.json +1ffc1d3dc31e4ebce2f6a91daa1f5e8efb03bfa9 data/refinedstorage/advancements/recipes/misc/crafting_grid/pink_crafting_grid.json +d16aafd0145f791eb7866af313c3750553a99923 data/refinedstorage/advancements/recipes/misc/crafting_grid/purple_crafting_grid.json +9fd78da8cd719cf5ea0d10e07c792d4f622a2348 data/refinedstorage/advancements/recipes/misc/crafting_grid/red_crafting_grid.json +38170e3578eacbf40af3328ab4f83f48aa5cbf8b data/refinedstorage/advancements/recipes/misc/crafting_grid/white_crafting_grid.json +13451b84c28e54f613acbb6dc4b05645feeecd6a data/refinedstorage/advancements/recipes/misc/crafting_grid/yellow_crafting_grid.json +d8f038336881dbbcb8dbc40c2ebb1cdb5e6451e9 data/refinedstorage/advancements/recipes/misc/fluid_grid/black_fluid_grid.json +6839dd7c6ba57cbb403cf6e514c2e11b3dc1fb7c data/refinedstorage/advancements/recipes/misc/fluid_grid/blue_fluid_grid.json +2b464c95d08a3a0090d6c3806b9d012b6d0cfa18 data/refinedstorage/advancements/recipes/misc/fluid_grid/brown_fluid_grid.json +89eb673877c24960ca7621cf591b2b9327e55545 data/refinedstorage/advancements/recipes/misc/fluid_grid/cyan_fluid_grid.json +c95223c8e79e76488b4f4f580655d751c5de1394 data/refinedstorage/advancements/recipes/misc/fluid_grid/fluid_grid.json +82171367532f884c939a16172fac036775ecf938 data/refinedstorage/advancements/recipes/misc/fluid_grid/gray_fluid_grid.json +59e1f7d684ed762a4eb01f70aa9c9f10cd889579 data/refinedstorage/advancements/recipes/misc/fluid_grid/green_fluid_grid.json +3adffdc0ea1601e4f291e7aa12ee1f4be8a945ca data/refinedstorage/advancements/recipes/misc/fluid_grid/light_gray_fluid_grid.json +bfd57337bb7815c010fefcf181349f5d4002c48e data/refinedstorage/advancements/recipes/misc/fluid_grid/lime_fluid_grid.json +1c56b7fa8747564b7c0ef894d50f1991ee48538a data/refinedstorage/advancements/recipes/misc/fluid_grid/magenta_fluid_grid.json +73b0f5a2a02d8ec4903df6f04a8ef2e498298315 data/refinedstorage/advancements/recipes/misc/fluid_grid/orange_fluid_grid.json +3663e13f857557edb6b55e47abb125d90be4623c data/refinedstorage/advancements/recipes/misc/fluid_grid/pink_fluid_grid.json +f262028ad077f74030bd4edfbbe3b78a427f7d5f data/refinedstorage/advancements/recipes/misc/fluid_grid/purple_fluid_grid.json +a69a13878382bd9f7c18819fe673e9e2ebbe79b3 data/refinedstorage/advancements/recipes/misc/fluid_grid/red_fluid_grid.json +3610edeaf6f345fd26f29bbfe7792ef2fd730e49 data/refinedstorage/advancements/recipes/misc/fluid_grid/white_fluid_grid.json +955db7cb08d1c76c0d73fbf1afb5bdd4d5eb9b70 data/refinedstorage/advancements/recipes/misc/fluid_grid/yellow_fluid_grid.json +d828b990c35bb65bbc98cfd8b17e54dd7004bcdb data/refinedstorage/advancements/recipes/misc/pattern_grid/black_pattern_grid.json +cac073d4400a67e258679dde739edcc93fc17bb0 data/refinedstorage/advancements/recipes/misc/pattern_grid/blue_pattern_grid.json +6b03eb2affdf19243411630f5ba215fa96302982 data/refinedstorage/advancements/recipes/misc/pattern_grid/brown_pattern_grid.json +4e8f2fcf76069e9ad40c6391da05724290b22485 data/refinedstorage/advancements/recipes/misc/pattern_grid/cyan_pattern_grid.json +0348c20cd109493000abae61f69a4271126bc743 data/refinedstorage/advancements/recipes/misc/pattern_grid/gray_pattern_grid.json +911af972906ac33b035be5c08718e34578b3bfa7 data/refinedstorage/advancements/recipes/misc/pattern_grid/green_pattern_grid.json +ec5acdaf46cf7f941c1b9dac5c611e394558e103 data/refinedstorage/advancements/recipes/misc/pattern_grid/light_gray_pattern_grid.json +6a612c8ba02289414f0adb5ab1e10d6e264ba51c data/refinedstorage/advancements/recipes/misc/pattern_grid/lime_pattern_grid.json +45b2f9d529c1837cac47c9a8c6b14bc8751e2d56 data/refinedstorage/advancements/recipes/misc/pattern_grid/magenta_pattern_grid.json +6b9ff2c5785e403b9404aed9cbaa30e65154f6b7 data/refinedstorage/advancements/recipes/misc/pattern_grid/orange_pattern_grid.json +2ea839bcfc17011a62f43291be4a73be4251deb9 data/refinedstorage/advancements/recipes/misc/pattern_grid/pattern_grid.json +84ab4c4711dc5b2ac41091efa36bd3e7528915a8 data/refinedstorage/advancements/recipes/misc/pattern_grid/pink_pattern_grid.json +4d2b2422136aaa5b353088648cd5717ee85e608e data/refinedstorage/advancements/recipes/misc/pattern_grid/purple_pattern_grid.json +c09b30d89b1cffa81abd224f5249f520ced536b9 data/refinedstorage/advancements/recipes/misc/pattern_grid/red_pattern_grid.json +7d0da920f6891ec150ab41ac1cb165d40be1bb40 data/refinedstorage/advancements/recipes/misc/pattern_grid/white_pattern_grid.json +4d80986fe46f228e235c020ea19ebee019e10e41 data/refinedstorage/advancements/recipes/misc/pattern_grid/yellow_pattern_grid.json +1e484115999fa62d482da0ba86c36e3a7568513c data/refinedstorage/recipes/coloring_recipes/black_controller.json +837df99fec4b00d059e5f258c8c51040989fd59b data/refinedstorage/recipes/coloring_recipes/black_crafter.json +cc777c1de15ee96706565e3032d8a17962452316 data/refinedstorage/recipes/coloring_recipes/black_crafter_manager.json +71a7d1ce09686c97292c9f7fe90397a4ee0b3d0e data/refinedstorage/recipes/coloring_recipes/black_crafting_grid.json +bf9c9f4ab628826aacb1b310c0997946ed42a023 data/refinedstorage/recipes/coloring_recipes/black_crafting_monitor.json +5c13f67cd1a2c12b948039fef5e5bbe7988e2104 data/refinedstorage/recipes/coloring_recipes/black_detector.json +2ba43fdfa0c9c2e558f5437c63f9629934c1a818 data/refinedstorage/recipes/coloring_recipes/black_disk_manipulator.json +8976bd18990aa165753024ab57e6d4ca0db78e4b data/refinedstorage/recipes/coloring_recipes/black_fluid_grid.json +1931c84a99f99264cfecfa442f0fb7a0f0120aec data/refinedstorage/recipes/coloring_recipes/black_grid.json +7ef51e8c9d67a75733dd35a2147de292476a5b92 data/refinedstorage/recipes/coloring_recipes/black_network_receiver.json +1771e330ab8ed131f3599fbbb384adb0975e998b data/refinedstorage/recipes/coloring_recipes/black_network_transmitter.json +091051a710572811a3667d8e0080c3871bd45daf data/refinedstorage/recipes/coloring_recipes/black_pattern_grid.json +fd71581f200ecffd14e85f248329039379222479 data/refinedstorage/recipes/coloring_recipes/black_relay.json +e0f4c9cbc082845a2b9b22036600136241594aa7 data/refinedstorage/recipes/coloring_recipes/black_security_manager.json +5e200307f6317b2efa641e2c8616417086d57aac data/refinedstorage/recipes/coloring_recipes/black_wireless_transmitter.json +558cdfb9ab1e1b58165aff5d9cfabc7c18f2ff81 data/refinedstorage/recipes/coloring_recipes/blue_controller.json +877ce0de12f2d1242d436ecc33e7668418afc51c data/refinedstorage/recipes/coloring_recipes/blue_crafter.json +c3ecb5dee328da9c2573852eb5f1277c424803e9 data/refinedstorage/recipes/coloring_recipes/blue_crafter_manager.json +af1dad13103c12463cc19735b459918785b555a1 data/refinedstorage/recipes/coloring_recipes/blue_crafting_grid.json +e1abdfc940501d07568d8e2ff5f4b1305826e907 data/refinedstorage/recipes/coloring_recipes/blue_crafting_monitor.json +f82fc0d730557fb523376a6624bba58af1608787 data/refinedstorage/recipes/coloring_recipes/blue_detector.json +fa010026eb95b4ae2abe4380c39c412419feeb97 data/refinedstorage/recipes/coloring_recipes/blue_disk_manipulator.json +d393aaf88281d449a54345a62db43488f7d9ab35 data/refinedstorage/recipes/coloring_recipes/blue_fluid_grid.json +a8f7bda8af1dbbdf0812dca695b352e692d95957 data/refinedstorage/recipes/coloring_recipes/blue_grid.json +9258bde68dc2ca0bc4d1becf182f893cb1427281 data/refinedstorage/recipes/coloring_recipes/blue_network_receiver.json +bf71db6ca317ef6cdac9c474869a1506970d759a data/refinedstorage/recipes/coloring_recipes/blue_network_transmitter.json +09e04694c20f5dbf70756431efa00eb10a1e1767 data/refinedstorage/recipes/coloring_recipes/blue_pattern_grid.json +c053aa38a5f0bb3b14a3b4d1e835f9db7ad270bb data/refinedstorage/recipes/coloring_recipes/blue_relay.json +2e3eaad4c458805972415b0bb5b6706b98977a19 data/refinedstorage/recipes/coloring_recipes/blue_security_manager.json +3aa1f2ec541238abcd590d042e484cd91041a393 data/refinedstorage/recipes/coloring_recipes/blue_wireless_transmitter.json +fe702b3093653416d11cac5c75307b6bf1f523ee data/refinedstorage/recipes/coloring_recipes/brown_controller.json +85f7c531571ce0a8ca574598752a5abf7eb07329 data/refinedstorage/recipes/coloring_recipes/brown_crafter.json +847dc405eb66a48ba1aa44c952f41a0cececcb46 data/refinedstorage/recipes/coloring_recipes/brown_crafter_manager.json +2a0599e860048197e6f09e1ad280733ae4cf6584 data/refinedstorage/recipes/coloring_recipes/brown_crafting_grid.json +41aad04c9677225d7c25aa82737b727bec3f7bc5 data/refinedstorage/recipes/coloring_recipes/brown_crafting_monitor.json +c261128142cd85f1cc795f7bd39448af67b3e4de data/refinedstorage/recipes/coloring_recipes/brown_detector.json +af05ffb684495cd67a14c42a20bc845a365e1b7c data/refinedstorage/recipes/coloring_recipes/brown_disk_manipulator.json +572f7f49be2f807e698f00f4e4f30bb56ea3aa0b data/refinedstorage/recipes/coloring_recipes/brown_fluid_grid.json +ab73cfdade881ba269a8a06397aeb2b82f2a21bd data/refinedstorage/recipes/coloring_recipes/brown_grid.json +85762417f1d46f81d9d74ed1353bd8817dbcde6c data/refinedstorage/recipes/coloring_recipes/brown_network_receiver.json +cc4e328b53e6e9d7a064e87b66a3e5cfa6b9fa4f data/refinedstorage/recipes/coloring_recipes/brown_network_transmitter.json +f33c81984de9bc038d6c03236fa60dfd52d419a5 data/refinedstorage/recipes/coloring_recipes/brown_pattern_grid.json +210c2b7b92c48d2f32458cc5c3d5910392f9e997 data/refinedstorage/recipes/coloring_recipes/brown_relay.json +d895b41ada1d66ab9e7b8632b837f57276d306a7 data/refinedstorage/recipes/coloring_recipes/brown_security_manager.json +b60379a43934b84994a7080dcfe007b7a0f3a6ec data/refinedstorage/recipes/coloring_recipes/brown_wireless_transmitter.json +ea0e5be25c24c1397a61995e60ad77b0e4957c7b data/refinedstorage/recipes/coloring_recipes/controller.json +0e52aa0f87bd8b55cbe9d2a60d8c3e1e130636f0 data/refinedstorage/recipes/coloring_recipes/crafter.json +5f1a68aeefb616316bf4e30238d59649a731c64a data/refinedstorage/recipes/coloring_recipes/crafter_manager.json +b1513edf52ff9f3af93ebf0ca0d305be5d104a41 data/refinedstorage/recipes/coloring_recipes/crafting_grid.json +a11298d3883765d7873763e3526ba367c8a46284 data/refinedstorage/recipes/coloring_recipes/crafting_monitor.json +5129a9870a709ff9f4e18855e8b141b760880a72 data/refinedstorage/recipes/coloring_recipes/cyan_controller.json +2c75c39bce50b9759d0ab241cc4a7ebc0ff633b3 data/refinedstorage/recipes/coloring_recipes/cyan_crafter.json +c3f47e396862e9aa944348aaf9f254ac50532d11 data/refinedstorage/recipes/coloring_recipes/cyan_crafter_manager.json +c1b2a9c366d5062d5c800605b78958f7c34d650f data/refinedstorage/recipes/coloring_recipes/cyan_crafting_grid.json +10b9f12e753b31044f4cb6100f355c88e7fef7f3 data/refinedstorage/recipes/coloring_recipes/cyan_crafting_monitor.json +4d4e1643279662793291a7b24ceb89e44bfcc689 data/refinedstorage/recipes/coloring_recipes/cyan_detector.json +8a1ad5686442737bf11437a1b5a62cff756ccac7 data/refinedstorage/recipes/coloring_recipes/cyan_disk_manipulator.json +4fc265412a18f392c22af9fa4674f9a609e08209 data/refinedstorage/recipes/coloring_recipes/cyan_fluid_grid.json +332fc9c1e21f70e6fe1dda7bb1c964f0ed7715ad data/refinedstorage/recipes/coloring_recipes/cyan_grid.json +819b91726b96bd57eae98d6d8b0b9be99e3db11d data/refinedstorage/recipes/coloring_recipes/cyan_network_receiver.json +7f00009bd87defab006770026bb7a3528a7ce236 data/refinedstorage/recipes/coloring_recipes/cyan_network_transmitter.json +4d77311bce6a5ed341b1e69fa8e808a158e7d767 data/refinedstorage/recipes/coloring_recipes/cyan_pattern_grid.json +0a69efd0b4e23d7225016f731f5e00f176762356 data/refinedstorage/recipes/coloring_recipes/cyan_relay.json +911b3bb449c468e0c45a1fa2eace3649871f80a8 data/refinedstorage/recipes/coloring_recipes/cyan_security_manager.json +545821250a3e514540af53d58c302fd7a53d0964 data/refinedstorage/recipes/coloring_recipes/cyan_wireless_transmitter.json +96fd9b436a78b7a0b40a96768589f609bedb9248 data/refinedstorage/recipes/coloring_recipes/detector.json +0c2555ef2ad11844b1224bcec144f67a109e5449 data/refinedstorage/recipes/coloring_recipes/disk_manipulator.json +fd119bae8fc3daee094d892d1197f9ec7152d346 data/refinedstorage/recipes/coloring_recipes/fluid_grid.json +87791b279165a6792585449159085151230b5f50 data/refinedstorage/recipes/coloring_recipes/gray_controller.json +127c027aca2912960a2fef6704eabdb326a60f3b data/refinedstorage/recipes/coloring_recipes/gray_crafter.json +428babaa3af6dbb524c7af06710766f486ad7e93 data/refinedstorage/recipes/coloring_recipes/gray_crafter_manager.json +dcee57ab0ba8233854f0db8fe665051d201a5fdd data/refinedstorage/recipes/coloring_recipes/gray_crafting_grid.json +4c499c7feac78f060c224f7da65c24ee57725e9e data/refinedstorage/recipes/coloring_recipes/gray_crafting_monitor.json +372b40564dbb3152f8be6f416a7711b7b65f60cd data/refinedstorage/recipes/coloring_recipes/gray_detector.json +c1e9273af3ca3b242e14945fc90a57aea5117f01 data/refinedstorage/recipes/coloring_recipes/gray_disk_manipulator.json +9cecd6f9d03722b87a26f9705db8a253d6f1796d data/refinedstorage/recipes/coloring_recipes/gray_fluid_grid.json +aff07f6c78363a60c4c21672ebaecf7cf22ee159 data/refinedstorage/recipes/coloring_recipes/gray_grid.json +f0ecd6ccd48024dc2215e73a281ff7a51c8d03c8 data/refinedstorage/recipes/coloring_recipes/gray_network_receiver.json +8e2ee645d974e0c729d1062d91c70bedf6011dfd data/refinedstorage/recipes/coloring_recipes/gray_network_transmitter.json +a8adbf5e2f8f4b56a057d070e9888a8c034504f3 data/refinedstorage/recipes/coloring_recipes/gray_pattern_grid.json +c9a3e09908a7ea0ab06fe3479147ecad4109f392 data/refinedstorage/recipes/coloring_recipes/gray_relay.json +18c39313de520b58c932425124636d2372e0eb36 data/refinedstorage/recipes/coloring_recipes/gray_security_manager.json +9636a002ade247edd0b2050d26ccb378f04eec9f data/refinedstorage/recipes/coloring_recipes/gray_wireless_transmitter.json +571222e11b04c8c6674d2f16271d3bb58036353d data/refinedstorage/recipes/coloring_recipes/green_controller.json +a06ff50f11e287f88c2becff762dfda010752889 data/refinedstorage/recipes/coloring_recipes/green_crafter.json +a9ddaf744dcb1157b29604db33cd6bd46a60579f data/refinedstorage/recipes/coloring_recipes/green_crafter_manager.json +5db8a75ccc60e014d9ad80d0610eb15125a55c49 data/refinedstorage/recipes/coloring_recipes/green_crafting_grid.json +cd581941ade93fef9c8cbc05a0b52378663ee89c data/refinedstorage/recipes/coloring_recipes/green_crafting_monitor.json +d61ba813c27e1eed5e5dd2ace77662bfc60d3ef2 data/refinedstorage/recipes/coloring_recipes/green_detector.json +509a9d12aeba7d2342d7ba2b08b8286d7ac5c356 data/refinedstorage/recipes/coloring_recipes/green_disk_manipulator.json +84d16780e7d8c5eec35b2d0916bbf3ac2558f7d9 data/refinedstorage/recipes/coloring_recipes/green_fluid_grid.json +19e0ac130c216c62826c4505ac0fae1e1ecbde56 data/refinedstorage/recipes/coloring_recipes/green_grid.json +333f3249ffc14e2e69c85a6f4f9d218ae25815f2 data/refinedstorage/recipes/coloring_recipes/green_network_receiver.json +a3324bdd1f7f735696680c49e0d03e688ccb2ca0 data/refinedstorage/recipes/coloring_recipes/green_network_transmitter.json +e7b213d23d8b95e5d694e4be4eda9ad5b1473e64 data/refinedstorage/recipes/coloring_recipes/green_pattern_grid.json +e930e7e251ff813fa59b994a1e9269b5e7dee126 data/refinedstorage/recipes/coloring_recipes/green_relay.json +697124ea286b4ba093101fe9b76fa11da2385b82 data/refinedstorage/recipes/coloring_recipes/green_security_manager.json +8b96cdcfa7cbdb2b89df3ce19e951d7f39be5616 data/refinedstorage/recipes/coloring_recipes/green_wireless_transmitter.json +23e96eb30da11115b605fdca12bf1e05ecdff4de data/refinedstorage/recipes/coloring_recipes/grid.json +5e9675aaef7ddc77b12556cbb9791598a92a07f3 data/refinedstorage/recipes/coloring_recipes/light_gray_controller.json +98fff324cb8b935b7a9516b1eba2fb784b65a3be data/refinedstorage/recipes/coloring_recipes/light_gray_crafter.json +b126c981954923e0a320c860cce9ddca6d672f66 data/refinedstorage/recipes/coloring_recipes/light_gray_crafter_manager.json +17cb71c9405814aba06b457d6af6af4d32901859 data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_grid.json +2fb5bc2a239347cc3ae4d6740ac230f04ef4e983 data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_monitor.json +7d22c72c3cec2222329b798d080674403dcdc123 data/refinedstorage/recipes/coloring_recipes/light_gray_detector.json +1b4a0a0deeb2df01e6f73e2ef4a894bd9b060f28 data/refinedstorage/recipes/coloring_recipes/light_gray_disk_manipulator.json +b2a284139ae79e1338d89b06452ef8efec0b3e90 data/refinedstorage/recipes/coloring_recipes/light_gray_fluid_grid.json +67373e80a26d1da083b85922524dab408bf53839 data/refinedstorage/recipes/coloring_recipes/light_gray_grid.json +bff40091f772b9f2a24fa7e5e2470f6c2c2de55b data/refinedstorage/recipes/coloring_recipes/light_gray_network_receiver.json +a1e2bef7f7482107903171d5132cdf12c3ac6ab8 data/refinedstorage/recipes/coloring_recipes/light_gray_network_transmitter.json +4cab0eece82ffdd908f52dd4e1a060fdfa0d308c data/refinedstorage/recipes/coloring_recipes/light_gray_pattern_grid.json +06b1dd6edafe4a8dc03688e65d2540abce6b385f data/refinedstorage/recipes/coloring_recipes/light_gray_relay.json +b1042ed6d8ec775933db67d4fec619056d659bba data/refinedstorage/recipes/coloring_recipes/light_gray_security_manager.json +3111fcc735ef720b9bc762606c710f45ffd48400 data/refinedstorage/recipes/coloring_recipes/light_gray_wireless_transmitter.json +ae13a92dbc4744a003148eff1d3dcecaa47e0d23 data/refinedstorage/recipes/coloring_recipes/lime_controller.json +b5d9f3882743a3ef34d5b25024002824ea96baf2 data/refinedstorage/recipes/coloring_recipes/lime_crafter.json +9896b152c54adc37cdbe7878ad5b6a8c6bdd3121 data/refinedstorage/recipes/coloring_recipes/lime_crafter_manager.json +1db21f1300c4cbb3265c556c6744549383b9a555 data/refinedstorage/recipes/coloring_recipes/lime_crafting_grid.json +0fb2a066450b1de109aa9caba9be689215170c35 data/refinedstorage/recipes/coloring_recipes/lime_crafting_monitor.json +c6edccdb599a1cfc0b03bb79ac9b85c809419ec2 data/refinedstorage/recipes/coloring_recipes/lime_detector.json +934dd2b4e0b12f5f5f988d01a3963bde832920be data/refinedstorage/recipes/coloring_recipes/lime_disk_manipulator.json +2b7c26801fd95c0a24d58d0305d6bad8e79090c5 data/refinedstorage/recipes/coloring_recipes/lime_fluid_grid.json +65ef043e374ee6f59f65dbdc88b286da12af3c71 data/refinedstorage/recipes/coloring_recipes/lime_grid.json +b0cfb3da8622f05ed21921f924fa51b415b84f38 data/refinedstorage/recipes/coloring_recipes/lime_network_receiver.json +efef0d233db0be3a0fe2fffb14388058b7a0dbbf data/refinedstorage/recipes/coloring_recipes/lime_network_transmitter.json +8d1f6f9e387d8b0d83ad97846148a1aafe0d3a5e data/refinedstorage/recipes/coloring_recipes/lime_pattern_grid.json +fbf0f28d64c918570d519417f1b1cd65ec368066 data/refinedstorage/recipes/coloring_recipes/lime_relay.json +20bfcb5904525581d2a0c921f3ed18a951629cf5 data/refinedstorage/recipes/coloring_recipes/lime_security_manager.json +80bccc5833f48612764a8c84c30e5abfed586f6f data/refinedstorage/recipes/coloring_recipes/lime_wireless_transmitter.json +fb508d9df420507adde445a14bf861f1757cb25c data/refinedstorage/recipes/coloring_recipes/magenta_controller.json +9a09eaaf701c1c109e58a173844a3e4ef4f1c17f data/refinedstorage/recipes/coloring_recipes/magenta_crafter.json +e45c83d5bc6d79866d797052d0315368b97b3b7e data/refinedstorage/recipes/coloring_recipes/magenta_crafter_manager.json +a149625b63cf3f12a4cf2348c4a1b0b5c6c91bea data/refinedstorage/recipes/coloring_recipes/magenta_crafting_grid.json +ca44b8335b9f2b9cae96039e0ff0cda5a2ecfb19 data/refinedstorage/recipes/coloring_recipes/magenta_crafting_monitor.json +826f3b02b1cddf927e6815d28cda43c7c3c6bcd0 data/refinedstorage/recipes/coloring_recipes/magenta_detector.json +f4160ad5703892ac81539dfe5d42dfa56a66fb5e data/refinedstorage/recipes/coloring_recipes/magenta_disk_manipulator.json +1677d3ffae4312141d2e0aa0cba00241074172b5 data/refinedstorage/recipes/coloring_recipes/magenta_fluid_grid.json +a2c152975047b74488665e2ae2680ca5542a6831 data/refinedstorage/recipes/coloring_recipes/magenta_grid.json +5140b7d4b1035670e5a42744a8c911e22bfb7d8b data/refinedstorage/recipes/coloring_recipes/magenta_network_receiver.json +db1ab8b0c13236fb4179d20df1854baafb84698b data/refinedstorage/recipes/coloring_recipes/magenta_network_transmitter.json +e75b8d1066fb2d9e3077952993df6a9081603181 data/refinedstorage/recipes/coloring_recipes/magenta_pattern_grid.json +81801f29a3e554e4c4ed98b8b0f71418319f8f8c data/refinedstorage/recipes/coloring_recipes/magenta_relay.json +857f71c7ceaf827efd01ba574c88881e4980e3ef data/refinedstorage/recipes/coloring_recipes/magenta_security_manager.json +369e62e1080765c60d0781de53ab3859c4b665c4 data/refinedstorage/recipes/coloring_recipes/magenta_wireless_transmitter.json +e5e382659de78fdab2030e7e5d462e7556c7988a data/refinedstorage/recipes/coloring_recipes/network_receiver.json +e0183a74741e0d5768c9336f64a26aafffd46f73 data/refinedstorage/recipes/coloring_recipes/network_transmitter.json +52473cf95f53e31da36cb43f40b6e102840ca392 data/refinedstorage/recipes/coloring_recipes/orange_controller.json +6524d474a295f6852121e19ee55f2a82991d3cb9 data/refinedstorage/recipes/coloring_recipes/orange_crafter.json +670d38ae734ddbd110daed5a621b268084ccc5d9 data/refinedstorage/recipes/coloring_recipes/orange_crafter_manager.json +53d29ecc2217e48f4c8a9f38c5be6eba9876f6ba data/refinedstorage/recipes/coloring_recipes/orange_crafting_grid.json +302a81df05265e4e59b4d84a14e7bb64ba5af729 data/refinedstorage/recipes/coloring_recipes/orange_crafting_monitor.json +9887bc0031479ed703e976e5470e9f0b0fa2af35 data/refinedstorage/recipes/coloring_recipes/orange_detector.json +3a032d126abb017dea46201f92afec58c7850ec5 data/refinedstorage/recipes/coloring_recipes/orange_disk_manipulator.json +8c681ffaa103480ebc523ac1fd957a02ffe0ad6c data/refinedstorage/recipes/coloring_recipes/orange_fluid_grid.json +2531c751e09a4eef9adea51ccb7f251a8df371ab data/refinedstorage/recipes/coloring_recipes/orange_grid.json +0b51e2aaec752b3849c9add94c685fa21ce241c1 data/refinedstorage/recipes/coloring_recipes/orange_network_receiver.json +8cda1a4f63ab5dac7fb1931630f4a36766ace3a0 data/refinedstorage/recipes/coloring_recipes/orange_network_transmitter.json +b454a0ce04a16e18d6d1d9b3a82f356c2f5a5a43 data/refinedstorage/recipes/coloring_recipes/orange_pattern_grid.json +bc3e05adc7957579b49485cdc44ae48c84fdfce9 data/refinedstorage/recipes/coloring_recipes/orange_relay.json +e6d772ca91f90cd3fba8c6c1686f025cdcabebbd data/refinedstorage/recipes/coloring_recipes/orange_security_manager.json +44cf2cc6eecb342b06434db9ee1c9bcc4e5fb096 data/refinedstorage/recipes/coloring_recipes/orange_wireless_transmitter.json +96c9e64ac6b1fda884e583c3dfc578f17523185d data/refinedstorage/recipes/coloring_recipes/pattern_grid.json +44379d03945259c390aeb7bfcc83d2dbbb789cd5 data/refinedstorage/recipes/coloring_recipes/pink_controller.json +7b324217e4253b4c26813ad51bc799e983d73a0e data/refinedstorage/recipes/coloring_recipes/pink_crafter.json +cdbca04e29f809d3ad67ff02679a24ba2a4aa07d data/refinedstorage/recipes/coloring_recipes/pink_crafter_manager.json +d2c7a7a5eccea5262864f88a4e5154a0d1d8d96b data/refinedstorage/recipes/coloring_recipes/pink_crafting_grid.json +5b8eb35ccf50004142d698fcbe605185a3d72b8a data/refinedstorage/recipes/coloring_recipes/pink_crafting_monitor.json +fbc20d7148217e2160e8ffa22059c441c761d720 data/refinedstorage/recipes/coloring_recipes/pink_detector.json +a2abdb193c34df50760d3cb1f4c5704ee39b41df data/refinedstorage/recipes/coloring_recipes/pink_disk_manipulator.json +2f2a5446b775976b62915a43f4ff9e21631ebaf9 data/refinedstorage/recipes/coloring_recipes/pink_fluid_grid.json +8f8fde9aece7f5dd15c5579e5686be03085fdb9d data/refinedstorage/recipes/coloring_recipes/pink_grid.json +ece30292dfe346d4c25778388932635753380621 data/refinedstorage/recipes/coloring_recipes/pink_network_receiver.json +ff5a0d844e0a2390a54a07ac9edeacd2e219592d data/refinedstorage/recipes/coloring_recipes/pink_network_transmitter.json +47dc1079808dd60981c2eab6135fefe6d0c3dc74 data/refinedstorage/recipes/coloring_recipes/pink_pattern_grid.json +3ba8e454038a8a504d5f64954484a735fefe3265 data/refinedstorage/recipes/coloring_recipes/pink_relay.json +6c06e158f115242158aa4f9bef345c22697e6c95 data/refinedstorage/recipes/coloring_recipes/pink_security_manager.json +9b988f2425d07acf55a04cd8310a5ad7dc18370f data/refinedstorage/recipes/coloring_recipes/pink_wireless_transmitter.json +040afa4d28b2bc0a8fba9551c2f9a83a8a55275d data/refinedstorage/recipes/coloring_recipes/purple_controller.json +bce4dd6a44a136d2415edec1ac9c53b1c3f51219 data/refinedstorage/recipes/coloring_recipes/purple_crafter.json +98eb23aaa064bd5e4b9099f67218ef11643e68ae data/refinedstorage/recipes/coloring_recipes/purple_crafter_manager.json +12f97e8bcfcc92e85e26365dc23650c4f1790a8c data/refinedstorage/recipes/coloring_recipes/purple_crafting_grid.json +3bb0c59da1362c330c8427933c44a274933bff30 data/refinedstorage/recipes/coloring_recipes/purple_crafting_monitor.json +4ad1ceb85568ac121220d3ad1911d7335b68e783 data/refinedstorage/recipes/coloring_recipes/purple_detector.json +67b741e5a74bba2d24dc22f3b9c59ed8e9ab8ee2 data/refinedstorage/recipes/coloring_recipes/purple_disk_manipulator.json +0bcbdf519eabf09e3818588558b3e9ce7d6fceb3 data/refinedstorage/recipes/coloring_recipes/purple_fluid_grid.json +4eefec69f667cf88eb3a1e651fd2beba93870597 data/refinedstorage/recipes/coloring_recipes/purple_grid.json +8a5e04a5d6130b299bacf95a62fab5f8e707877b data/refinedstorage/recipes/coloring_recipes/purple_network_receiver.json +4f2e6f74509c70d312b71632f4c38be3cfeba77c data/refinedstorage/recipes/coloring_recipes/purple_network_transmitter.json +7309f883662ccbbaa97fa3cdb479674c2cdc7516 data/refinedstorage/recipes/coloring_recipes/purple_pattern_grid.json +ea8f6b5d26335c64f511f8d854a6f18c944acdcb data/refinedstorage/recipes/coloring_recipes/purple_relay.json +661e9d811201abfb56b7b27175b9ec1e10de1584 data/refinedstorage/recipes/coloring_recipes/purple_security_manager.json +384938122caeca74c92e8047e386244db2e19985 data/refinedstorage/recipes/coloring_recipes/purple_wireless_transmitter.json +5213d1fc2c6269321b78a23eafc533968677631e data/refinedstorage/recipes/coloring_recipes/red_controller.json +8d9ca91c28c9ca40c932688bccb88261f6c6402c data/refinedstorage/recipes/coloring_recipes/red_crafter.json +98b6fb4a2141356fb7e18995288935d5b0617c4e data/refinedstorage/recipes/coloring_recipes/red_crafter_manager.json +e424d6daf7fdfa9f62c920b8f551dafb6907ea9c data/refinedstorage/recipes/coloring_recipes/red_crafting_grid.json +0160755468a19e98b4dbc4447b1efae7dec53e0f data/refinedstorage/recipes/coloring_recipes/red_crafting_monitor.json +1a9cbbb583120ee079d3191bbf399651cd89577a data/refinedstorage/recipes/coloring_recipes/red_detector.json +29148381c6707e3b7181d534255baee78917ac95 data/refinedstorage/recipes/coloring_recipes/red_disk_manipulator.json +4d63aa706daf331f47978f66e0fd3dc29ae223ac data/refinedstorage/recipes/coloring_recipes/red_fluid_grid.json +c8be1ebdf463794c8aeb52003d035ebac78be94d data/refinedstorage/recipes/coloring_recipes/red_grid.json +4a3d94a64b099bd47c84e15b3fabba7fc985f065 data/refinedstorage/recipes/coloring_recipes/red_network_receiver.json +dc1c971e5d0f8874c294b975309ea8f01ea51e5e data/refinedstorage/recipes/coloring_recipes/red_network_transmitter.json +ee5aeaeb62cef55b5538018706a83d624748ef00 data/refinedstorage/recipes/coloring_recipes/red_pattern_grid.json +9dc5bda9e6a365c83a50b039935603ef7c977938 data/refinedstorage/recipes/coloring_recipes/red_relay.json +35215d8666e19b9c91e32b20d461f2b098f5f734 data/refinedstorage/recipes/coloring_recipes/red_security_manager.json +dd2d8f572913d26f79cfee38a679fec72ba27a40 data/refinedstorage/recipes/coloring_recipes/red_wireless_transmitter.json +1bfa44597a6301d570a09ac73be6bca9da6f9483 data/refinedstorage/recipes/coloring_recipes/relay.json +83f1a7f20933935059cf86c44b4194718c3cff1d data/refinedstorage/recipes/coloring_recipes/security_manager.json +b42095cd9222c36d358a578f48af359a0bfdf026 data/refinedstorage/recipes/coloring_recipes/white_controller.json +c8b886a2890b64e3f746ae55f3dcc9c526fc390d data/refinedstorage/recipes/coloring_recipes/white_crafter.json +1564dc43ec03da2e6bf11e7ee9a73a65a3506690 data/refinedstorage/recipes/coloring_recipes/white_crafter_manager.json +0efeb724bf6b11cb03f91f1c1de6dfe0f7731704 data/refinedstorage/recipes/coloring_recipes/white_crafting_grid.json +4ed50e1f8369240d1f87e9be9190ad7244b2e996 data/refinedstorage/recipes/coloring_recipes/white_crafting_monitor.json +b8123ca500d032d5cf14fa4eb6acf94819735c8f data/refinedstorage/recipes/coloring_recipes/white_detector.json +27bdf73bccced8c2f694be1327f6e59d38e667fe data/refinedstorage/recipes/coloring_recipes/white_disk_manipulator.json +37681dbb38a2cae990001cadda98107f7a85d8ba data/refinedstorage/recipes/coloring_recipes/white_fluid_grid.json +746481e67dc39802296560c6286a1896162f656e data/refinedstorage/recipes/coloring_recipes/white_grid.json +d3fabfda138031705c70e6f558e89a80b6304f7f data/refinedstorage/recipes/coloring_recipes/white_network_receiver.json +f0e6c4760dd916b3f27c67d9d372a12d7438eefd data/refinedstorage/recipes/coloring_recipes/white_network_transmitter.json +88d61adc326d663112475ea2eeafc39e2c00dfb1 data/refinedstorage/recipes/coloring_recipes/white_pattern_grid.json +fc289082d30d79a6901963f169c96cc9bb13c2db data/refinedstorage/recipes/coloring_recipes/white_relay.json +6a813bd5fe61dfa8f8843c0a41eb63c8a179d24c data/refinedstorage/recipes/coloring_recipes/white_security_manager.json +d10924039deb155dbe8626c1a122f7a4a2b5a1ba data/refinedstorage/recipes/coloring_recipes/white_wireless_transmitter.json +de06ff58be01086d2db6708903219a6d30e54dbd data/refinedstorage/recipes/coloring_recipes/wireless_transmitter.json +5ab08310c1bca2d1e6fc97f1611db8dce66b01d3 data/refinedstorage/recipes/coloring_recipes/yellow_controller.json +d988c6e9533eb8e93ec8b219b5d032596d89ae8d data/refinedstorage/recipes/coloring_recipes/yellow_crafter.json +79cfee17ee03565aa0a27ada8d9f375b4cb665bc data/refinedstorage/recipes/coloring_recipes/yellow_crafter_manager.json +8a4c6b78bb4fef3ceef338ac655c80503190059d data/refinedstorage/recipes/coloring_recipes/yellow_crafting_grid.json +a1b1f47a605beccad8acacfbaf77964e991f0a4f data/refinedstorage/recipes/coloring_recipes/yellow_crafting_monitor.json +10f0ea9ac167aee81a610da0c4b16465be3c39e0 data/refinedstorage/recipes/coloring_recipes/yellow_detector.json +335a728979bc32d15ed7d72a84e3eddfa9c55b95 data/refinedstorage/recipes/coloring_recipes/yellow_disk_manipulator.json +0393b2ce55a6202b4eee5ce0b2d3344ab2b8e11b data/refinedstorage/recipes/coloring_recipes/yellow_fluid_grid.json +9cef292a0457b7987442d04572047f286bc20fc0 data/refinedstorage/recipes/coloring_recipes/yellow_grid.json +63c20b0f45f8453a2588da8e0f915de07d91073f data/refinedstorage/recipes/coloring_recipes/yellow_network_receiver.json +0c0e1fc0dd6d4251b655e3c3232ab393f380722c data/refinedstorage/recipes/coloring_recipes/yellow_network_transmitter.json +d66efb72494084b29a32b81c1f72bc5b37088689 data/refinedstorage/recipes/coloring_recipes/yellow_pattern_grid.json +513f415c4ba145ab71bfa892a04ddb02cfaa80c8 data/refinedstorage/recipes/coloring_recipes/yellow_relay.json +656ab81fea0782a64a0b129f50095cbcff47dc41 data/refinedstorage/recipes/coloring_recipes/yellow_security_manager.json +7fc4f29327366fb10065e0fad63df119c706d55e data/refinedstorage/recipes/coloring_recipes/yellow_wireless_transmitter.json +bc35cb59ff004ffc78886d46608b3c81072bfdbd data/refinedstorage/recipes/crafting_grid/black_crafting_grid.json +97f1bd4e344764dbdefd260fb35c749d4b7fdb21 data/refinedstorage/recipes/crafting_grid/blue_crafting_grid.json +867de3ece15a35979d7ed3e0d1a10c581a825ab7 data/refinedstorage/recipes/crafting_grid/brown_crafting_grid.json +0f17bd970606073347d35401d2fe7bbf66033052 data/refinedstorage/recipes/crafting_grid/crafting_grid.json +41fe7509aa8bfa0dba6e26641ee318c89b4f583a data/refinedstorage/recipes/crafting_grid/cyan_crafting_grid.json +16256265f3c2a6ad33fc3dde40c588f94de97cbb data/refinedstorage/recipes/crafting_grid/gray_crafting_grid.json +554f972cfa470f77b2ed03e3c580a489d981200e data/refinedstorage/recipes/crafting_grid/green_crafting_grid.json +246bd2536f0109a299f4d8f46e820dbaa94f8f83 data/refinedstorage/recipes/crafting_grid/light_gray_crafting_grid.json +f8264879f798b5977e2fa8598b7b70895f18bc77 data/refinedstorage/recipes/crafting_grid/lime_crafting_grid.json +2e50e2eb39657b2dbe7a804ac8fc520f5f90d2cb data/refinedstorage/recipes/crafting_grid/magenta_crafting_grid.json +a4b7575e6a11a3717c1a72cff0273c621b6f3a0d data/refinedstorage/recipes/crafting_grid/orange_crafting_grid.json +580d7623cbe6b53a1f0d84dcd5fdfd77716251e1 data/refinedstorage/recipes/crafting_grid/pink_crafting_grid.json +806d5168ce1cc39a8fd39e0eda55de1f4ab20484 data/refinedstorage/recipes/crafting_grid/purple_crafting_grid.json +defa112e99475c51d55edabbbc54a8ae26e32257 data/refinedstorage/recipes/crafting_grid/red_crafting_grid.json +b4d1347ed742afbde81c5b14c132a21eaf9ca884 data/refinedstorage/recipes/crafting_grid/white_crafting_grid.json +c9a5db4ebcd1924d32787987fed38a164acb360f data/refinedstorage/recipes/crafting_grid/yellow_crafting_grid.json +06566cbfe62a2783dab30391f8353175214a2071 data/refinedstorage/recipes/fluid_grid/black_fluid_grid.json +dba62f4ae40b27bdf17803904fab31d8e3c1b481 data/refinedstorage/recipes/fluid_grid/blue_fluid_grid.json +84c68d2bcc4831e93d3da768e49ce193474193c3 data/refinedstorage/recipes/fluid_grid/brown_fluid_grid.json +81db210076da3b665841bd4eb17ce80c881aa782 data/refinedstorage/recipes/fluid_grid/cyan_fluid_grid.json +3f27e8e601206031c607f74ffb8bfa27434c4eea data/refinedstorage/recipes/fluid_grid/fluid_grid.json +772ec2b3e75670f3f574fd1f9a0a50229df71c23 data/refinedstorage/recipes/fluid_grid/gray_fluid_grid.json +c1c3ca490a74e17f20ff413d8300f5bf4dadce28 data/refinedstorage/recipes/fluid_grid/green_fluid_grid.json +7e5ac70a9cad754664b18caba3995c2df2edafbc data/refinedstorage/recipes/fluid_grid/light_gray_fluid_grid.json +4eb90edc1dd25cd99eb7f171afd84d647e9f3a5d data/refinedstorage/recipes/fluid_grid/lime_fluid_grid.json +12993cc922c42d66ea486143178bde12814d6f72 data/refinedstorage/recipes/fluid_grid/magenta_fluid_grid.json +ad42253972dde97319fc963cca9f276cd682a434 data/refinedstorage/recipes/fluid_grid/orange_fluid_grid.json +42fa4ba965eb143060edc58fd354fd166d7d7ee3 data/refinedstorage/recipes/fluid_grid/pink_fluid_grid.json +a3cd500967a7ca8bbdc63b5f7e28cda83332f764 data/refinedstorage/recipes/fluid_grid/purple_fluid_grid.json +acc3d1c9823a56f4fcd3ed4a10800017b3470308 data/refinedstorage/recipes/fluid_grid/red_fluid_grid.json +f82ad46f703166947701746f367fb3e9c9ee13e6 data/refinedstorage/recipes/fluid_grid/white_fluid_grid.json +0493642eb294a1ddd03aea909e9412c6e7d7cb13 data/refinedstorage/recipes/fluid_grid/yellow_fluid_grid.json +cf865a91fe46c1a6d177eba5bd659d7306e4b752 data/refinedstorage/recipes/pattern_grid/black_pattern_grid.json +595c344e5a3ee10eedbb3911adb7d1637d2d25c5 data/refinedstorage/recipes/pattern_grid/blue_pattern_grid.json +78ce90102d193d4d1dac5c93a1aef10188e63258 data/refinedstorage/recipes/pattern_grid/brown_pattern_grid.json +77f667c9bb96f33e8d753b54bf770b63fca33e7c data/refinedstorage/recipes/pattern_grid/cyan_pattern_grid.json +fc5e7f25f6a72af1623604cfa64a978f5ccffeec data/refinedstorage/recipes/pattern_grid/gray_pattern_grid.json +dc03f0e09c3b4ab00ef3ee40c7cc09ec9b82e30e data/refinedstorage/recipes/pattern_grid/green_pattern_grid.json +7ea662fadd5ab396382788cce9b9f3b46a454f29 data/refinedstorage/recipes/pattern_grid/light_gray_pattern_grid.json +e7affc6561b15e1ae04bce3daa9824fe137bf909 data/refinedstorage/recipes/pattern_grid/lime_pattern_grid.json +65f0ef8dfae6e58433b9c59def75afaf5c0b632c data/refinedstorage/recipes/pattern_grid/magenta_pattern_grid.json +37dcf0cd09c15ece8123456213b0d510d754ab22 data/refinedstorage/recipes/pattern_grid/orange_pattern_grid.json +bda3a866c990f55409a0ff0d5643184d73e23961 data/refinedstorage/recipes/pattern_grid/pattern_grid.json +cfbc0ab0d39fca6ddc432c497427019bb7e70dad data/refinedstorage/recipes/pattern_grid/pink_pattern_grid.json +a9d41d0fd2a9eb83673ce0c4015d40a249f9afa5 data/refinedstorage/recipes/pattern_grid/purple_pattern_grid.json +151b980298e4968ef4227cc62a351cd2c17c2331 data/refinedstorage/recipes/pattern_grid/red_pattern_grid.json +ef55bc909cc5ac605db1a673a310942549072eab data/refinedstorage/recipes/pattern_grid/white_pattern_grid.json +abd03dded7af5ea3d4d05f192496760d1a07470a data/refinedstorage/recipes/pattern_grid/yellow_pattern_grid.json diff --git a/src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c b/src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c new file mode 100644 index 000000000..46cfc689f --- /dev/null +++ b/src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c @@ -0,0 +1,2 @@ +// 1.20.1 2023-07-03T11:19:34.4768009 Block Entity Type Tags +98555d946827da8ddb7a7c451a1c99f4d0184ad3 data/packingtape/tags/block_entity_type/blacklist/problematic.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache deleted file mode 100644 index b490a4165..000000000 --- a/src/generated/resources/.cache/cache +++ /dev/null @@ -1,1634 +0,0 @@ -4bf24703627f7eff7148eb1d7344ed0c78bee42a assets/refinedstorage/blockstates/black_controller.json -cd57246f1fcdedcf56baa1a58579d85b7488999b assets/refinedstorage/blockstates/black_crafter.json -edaad8715d1c840af651c8159bb31583052dcae8 assets/refinedstorage/blockstates/black_crafter_manager.json -8f81849e82283593341ed4d5f1c8e3c69e94a582 assets/refinedstorage/blockstates/black_crafting_grid.json -ce598a79640cfd88104b74087e9148eb5fc0c09a assets/refinedstorage/blockstates/black_crafting_monitor.json -4bf24703627f7eff7148eb1d7344ed0c78bee42a assets/refinedstorage/blockstates/black_creative_controller.json -b38b2b24b56b5030258e226f932bd89aee3a5563 assets/refinedstorage/blockstates/black_detector.json -cdae403f52d07df64d5c07dfd04f1e87a1047bef assets/refinedstorage/blockstates/black_disk_manipulator.json -c95de4d36b163efc9cc8a9b609b6a89e60348805 assets/refinedstorage/blockstates/black_fluid_grid.json -2faf67718562f04633caf6aa70310e068ccb6e79 assets/refinedstorage/blockstates/black_grid.json -793ac17b180c46c81e3237e0a3fd16a9fb351c9c assets/refinedstorage/blockstates/black_network_receiver.json -5ac3def1a7b8c6360b6401764ab8b13315ec53e4 assets/refinedstorage/blockstates/black_network_transmitter.json -7c8df646cdd9d78973d464824a2913d60fb4d582 assets/refinedstorage/blockstates/black_pattern_grid.json -689b99628f081a9c0f2af9b6fd54c58cb450091b assets/refinedstorage/blockstates/black_relay.json -07bcdd8d863e2eed4da10741eaea435e63865152 assets/refinedstorage/blockstates/black_security_manager.json -0bd8a4722a8f50a86766c7222684ed9c2c522ac2 assets/refinedstorage/blockstates/black_wireless_transmitter.json -f9873081118a6c640802ec500a52b2176fa9b5f2 assets/refinedstorage/blockstates/blue_controller.json -cd2c3fd41621f0f1319d7c995a214b979438785e assets/refinedstorage/blockstates/blue_crafter.json -ee6af55fe478baaf0aa45d81b297146674279ad0 assets/refinedstorage/blockstates/blue_crafter_manager.json -5635948f5945a227a8a41b2379d034d6e333257c assets/refinedstorage/blockstates/blue_crafting_grid.json -c869a7ae005babef0b706ed608d1a98a62a566e0 assets/refinedstorage/blockstates/blue_crafting_monitor.json -f9873081118a6c640802ec500a52b2176fa9b5f2 assets/refinedstorage/blockstates/blue_creative_controller.json -be14e48f66eb98ba2a3bea6b34bc914795a92fb5 assets/refinedstorage/blockstates/blue_detector.json -34b6e8b4770f708dd4bce44fbb56aba0e4820ee5 assets/refinedstorage/blockstates/blue_disk_manipulator.json -d5728b8bb4243b86e8281453c3639dd5edd5a35e assets/refinedstorage/blockstates/blue_fluid_grid.json -4864aa025192fc7efcf99ab3b8361de8000c93fe assets/refinedstorage/blockstates/blue_grid.json -0cbbf92fca6cfebc4f611f0fcf7bb04d6550de6e assets/refinedstorage/blockstates/blue_network_receiver.json -7d892774c8bc431c3d795a085833ea1d1fc7000f assets/refinedstorage/blockstates/blue_network_transmitter.json -855cb6aa5bccb644bc9adc4e11e8a15d7c35dcec assets/refinedstorage/blockstates/blue_pattern_grid.json -bc64830e59c8f19b7f1cface2d7508bb279f9a09 assets/refinedstorage/blockstates/blue_relay.json -8db5ce2e850bc8092b8bef0d2acda733a38eefee assets/refinedstorage/blockstates/blue_security_manager.json -b1e38f16443b9aa0bd70505b8e76f709198cca69 assets/refinedstorage/blockstates/blue_wireless_transmitter.json -0a7314f69449a3ce2540f9db41daa0684c964fd6 assets/refinedstorage/blockstates/brown_controller.json -3c7c72b0c2cace741f663dac5b7b8317486b54ea assets/refinedstorage/blockstates/brown_crafter.json -a030569487303d7d16f4522fb7e69a248badb80d assets/refinedstorage/blockstates/brown_crafter_manager.json -8dd58c5846527a97f2fdbbd969c353cbbb05bdb1 assets/refinedstorage/blockstates/brown_crafting_grid.json -e029cfb9e42b23cb6664d8b13f70bfe7236cbc8f assets/refinedstorage/blockstates/brown_crafting_monitor.json -0a7314f69449a3ce2540f9db41daa0684c964fd6 assets/refinedstorage/blockstates/brown_creative_controller.json -5bee138d62066faa6357db1b577b3d80042c7e5a assets/refinedstorage/blockstates/brown_detector.json -61d8473b86dc4efab963ed798c877498848a3167 assets/refinedstorage/blockstates/brown_disk_manipulator.json -35fabca37d2412657796985f8373fc151527940e assets/refinedstorage/blockstates/brown_fluid_grid.json -9106da5e0c13f03f7aa858c440d64c497550c573 assets/refinedstorage/blockstates/brown_grid.json -c6eebc8e0dd6e5a0f8628e222e5be06350023841 assets/refinedstorage/blockstates/brown_network_receiver.json -5aa7c5a2800f541fc5442383a8f21764982e04b5 assets/refinedstorage/blockstates/brown_network_transmitter.json -d62ee59b023ed3833fe95304f512114f1509da26 assets/refinedstorage/blockstates/brown_pattern_grid.json -57e0aa8131636c16460a3cb9340a749eaaeebde6 assets/refinedstorage/blockstates/brown_relay.json -9d5f8636aeaa07b7b247562f4932dd905e980a69 assets/refinedstorage/blockstates/brown_security_manager.json -c3740d8920c84d709f92086089bce29998f87a01 assets/refinedstorage/blockstates/brown_wireless_transmitter.json -c91535ebee0d52a355b401ca665cf5932d86a991 assets/refinedstorage/blockstates/controller.json -a45a46d9962da05c647d2dc186164aef54034ce8 assets/refinedstorage/blockstates/crafter.json -32acd7bebd601d96c9600f7598364acb21b243c7 assets/refinedstorage/blockstates/crafter_manager.json -338dd53c88fa4b8c34f4fb5262b0bfd83abea282 assets/refinedstorage/blockstates/crafting_grid.json -9c30776c6d68dfa6bf698bb484e45124095d8891 assets/refinedstorage/blockstates/crafting_monitor.json -c91535ebee0d52a355b401ca665cf5932d86a991 assets/refinedstorage/blockstates/creative_controller.json -2ce0d178f15d08aed93524582801bf84ef32872d assets/refinedstorage/blockstates/cyan_controller.json -904a6081e5dc6acfbc87493f5089291aef93b261 assets/refinedstorage/blockstates/cyan_crafter.json -b254453065a94886580445a16869add5c86bf1ca assets/refinedstorage/blockstates/cyan_crafter_manager.json -16e73fc87f58267361c4c08d18ccdf9efecd4359 assets/refinedstorage/blockstates/cyan_crafting_grid.json -8ec02f6fb58922f96f987c76cae19c1fb73d43d6 assets/refinedstorage/blockstates/cyan_crafting_monitor.json -2ce0d178f15d08aed93524582801bf84ef32872d assets/refinedstorage/blockstates/cyan_creative_controller.json -e2e33e030b666de9d45f7bafa6570d1ab68ffd78 assets/refinedstorage/blockstates/cyan_detector.json -3b75934b7b603891623819cfa5ee08d9317541c0 assets/refinedstorage/blockstates/cyan_disk_manipulator.json -3f1cc627bd838fbb8e72b37200614b87b9911b14 assets/refinedstorage/blockstates/cyan_fluid_grid.json -5a493c39c9817372a8695873951d10e873b876af assets/refinedstorage/blockstates/cyan_grid.json -ce07356b8fb0030bea880e93beac367334860cf5 assets/refinedstorage/blockstates/cyan_network_receiver.json -41cb23e7475278462401a904abf06f8eeda42816 assets/refinedstorage/blockstates/cyan_network_transmitter.json -1798c202594684b4507d0fd6119735bb53e607b5 assets/refinedstorage/blockstates/cyan_pattern_grid.json -d60ba6e3e44dc7a1163e8ae333cffb797e3e0b5d assets/refinedstorage/blockstates/cyan_relay.json -2591054e43b3e2bf431dc8e9e39f642059569ca9 assets/refinedstorage/blockstates/cyan_security_manager.json -d76ec380da3ecaf1f181bfe59a77e69c2317c4dd assets/refinedstorage/blockstates/cyan_wireless_transmitter.json -2f6971c385c9ab42ad56ca4030cfba9bc5907a86 assets/refinedstorage/blockstates/detector.json -1679b9036d691cdffbef760bdd548176116d0d77 assets/refinedstorage/blockstates/disk_manipulator.json -512e986e15028fc79466846c7a4242346cebf054 assets/refinedstorage/blockstates/fluid_grid.json -cac5f62f4b6c5e90a8234335778d7d959a9b6279 assets/refinedstorage/blockstates/gray_controller.json -9cbce49f5ad13ffe9f2ca38789052a0d1eb3718d assets/refinedstorage/blockstates/gray_crafter.json -0ebcbcee27e174456f19e2f45f2adc681c9acdc2 assets/refinedstorage/blockstates/gray_crafter_manager.json -c5757428d5a93d636c681c5eed1a5901eddb2666 assets/refinedstorage/blockstates/gray_crafting_grid.json -5efffccea566f45c223604e5be3826857b0b56f4 assets/refinedstorage/blockstates/gray_crafting_monitor.json -cac5f62f4b6c5e90a8234335778d7d959a9b6279 assets/refinedstorage/blockstates/gray_creative_controller.json -3c9c8edb013ed0af2a881d6838cd76aace7ed574 assets/refinedstorage/blockstates/gray_detector.json -3cd8da77bf735678bd82aeffaaefccf4d380d6f2 assets/refinedstorage/blockstates/gray_disk_manipulator.json -f58061557c9832bc9c2b8d6071ab1c06877597dc assets/refinedstorage/blockstates/gray_fluid_grid.json -16c5b012c8fe0429ca8e8860a8a832c304507347 assets/refinedstorage/blockstates/gray_grid.json -c1e2764924546763ae93bd820a3a14ed34bca687 assets/refinedstorage/blockstates/gray_network_receiver.json -2779c9aff016fc09a701b98f0daa60652c2f4d02 assets/refinedstorage/blockstates/gray_network_transmitter.json -594f8311d33991e74cf5dfaab9e061b8a70a5078 assets/refinedstorage/blockstates/gray_pattern_grid.json -b0d4a60cefdd04fbf318060268fad2313ed9ac0f assets/refinedstorage/blockstates/gray_relay.json -43933d5ae3d857e87638ee8194e70e0ae9362afa assets/refinedstorage/blockstates/gray_security_manager.json -7e45f8ab738ac41e255038d955a9489982c79826 assets/refinedstorage/blockstates/gray_wireless_transmitter.json -bd3b9c5ed6ed1ea89a069292618cf9d2c92e4d51 assets/refinedstorage/blockstates/green_controller.json -fcdafe0f3c7f8c46427e530c35f1e6e7e1dceba0 assets/refinedstorage/blockstates/green_crafter.json -45c33e3ab3eb4d3d2c56a29d727da67d7f199737 assets/refinedstorage/blockstates/green_crafter_manager.json -2257fdc26a4140db0cccbf7af9b0d4f3ef987086 assets/refinedstorage/blockstates/green_crafting_grid.json -96ead31dcb167541d6c5c89bc35737505803a170 assets/refinedstorage/blockstates/green_crafting_monitor.json -bd3b9c5ed6ed1ea89a069292618cf9d2c92e4d51 assets/refinedstorage/blockstates/green_creative_controller.json -92bdeffdf69a6c6c30863b8fd18e868909f9f68d assets/refinedstorage/blockstates/green_detector.json -da7decad72a80a41843464905190c4b1248ecd66 assets/refinedstorage/blockstates/green_disk_manipulator.json -31edfd1bb290be9a08037ae3218392a85ea8af16 assets/refinedstorage/blockstates/green_fluid_grid.json -2d40e50aea8bba6413cf347344087fb26f1929d0 assets/refinedstorage/blockstates/green_grid.json -dbf7cbab9e36a10ead7612c1fcdd0ad26c235d49 assets/refinedstorage/blockstates/green_network_receiver.json -4ca6efc26797510d1fe5f062b012f5193632ae2b assets/refinedstorage/blockstates/green_network_transmitter.json -af089cd26670ac3b92aab122618f1d26562db554 assets/refinedstorage/blockstates/green_pattern_grid.json -eb71d250a0f9871345c4ad33f618b8235aad5859 assets/refinedstorage/blockstates/green_relay.json -f9552182449036feb29762c148eacc3bab2742cf assets/refinedstorage/blockstates/green_security_manager.json -c1f8b39938467ea0b318a5aa632a1e7b383d0427 assets/refinedstorage/blockstates/green_wireless_transmitter.json -20c5848dddac123914dedba37198dbd24b13abf0 assets/refinedstorage/blockstates/grid.json -f4245d377f5dc7819d786dc8a5ea0c7ad2b62f3a assets/refinedstorage/blockstates/light_gray_controller.json -5d8ccc1e8217f3819f3e9f1c092f0761ffdb038b assets/refinedstorage/blockstates/light_gray_crafter.json -ad14af59b7769af3add77895c19d91f293592ca9 assets/refinedstorage/blockstates/light_gray_crafter_manager.json -c632dadf33b4f8c5a6cbe5a41f6e9584f6b9f2f8 assets/refinedstorage/blockstates/light_gray_crafting_grid.json -0ca95db0ebf845d8cf2afb50c8777621198fb22e assets/refinedstorage/blockstates/light_gray_crafting_monitor.json -f4245d377f5dc7819d786dc8a5ea0c7ad2b62f3a assets/refinedstorage/blockstates/light_gray_creative_controller.json -9de4119cde387473b46f2581d50f7673dd66d3b5 assets/refinedstorage/blockstates/light_gray_detector.json -046c4e1f82ecc14b2decf89506e5d740e9cd678e assets/refinedstorage/blockstates/light_gray_disk_manipulator.json -8f9270c44626c5d716542232d4b32b434d14688d assets/refinedstorage/blockstates/light_gray_fluid_grid.json -0a45765c95f809277489608ecda1be51abf3ceef assets/refinedstorage/blockstates/light_gray_grid.json -f95c3ce0407a43ef9fe46c2fe393a28f43bbbd24 assets/refinedstorage/blockstates/light_gray_network_receiver.json -86251e16543b3fdb8acfe75a77e07585b976db5a assets/refinedstorage/blockstates/light_gray_network_transmitter.json -cbb0fe0468ac72d294fb4a20621bc0f3156d9f7a assets/refinedstorage/blockstates/light_gray_pattern_grid.json -c4a6806970f54d2c2b13b57cda15757f6ee815c3 assets/refinedstorage/blockstates/light_gray_relay.json -18fbf71e01eec9b0abae6a722ddb5ef4bf406a93 assets/refinedstorage/blockstates/light_gray_security_manager.json -92aab4d8665bd4dd2ed2924a0cfd64c4c2dba99a assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json -208cf0cba21dbed377985e76bfdabb1de72e753e assets/refinedstorage/blockstates/lime_controller.json -7eda77ae426881abebd6c2a7367a6f5b3bd04b88 assets/refinedstorage/blockstates/lime_crafter.json -4ff8d521d8ac983d5282d5eb3cce13e811eae7a1 assets/refinedstorage/blockstates/lime_crafter_manager.json -9d612e9d42dd4dc3cf0571c35351e3c59615f371 assets/refinedstorage/blockstates/lime_crafting_grid.json -5db204931ba05e9fa61bc43062079bddaf2f5c82 assets/refinedstorage/blockstates/lime_crafting_monitor.json -208cf0cba21dbed377985e76bfdabb1de72e753e assets/refinedstorage/blockstates/lime_creative_controller.json -e4df464beae234e87a662a3fefb9550466fede0e assets/refinedstorage/blockstates/lime_detector.json -b8d6d66e36729f932cbb26f6d01ed8b449e2123c assets/refinedstorage/blockstates/lime_disk_manipulator.json -dfd009993477662d6b729916cf1d0b503fe5331f assets/refinedstorage/blockstates/lime_fluid_grid.json -a4db993654af31f9e665d93141d6a347d583ff7d assets/refinedstorage/blockstates/lime_grid.json -65ce0d24c56b25f0700595897ad6e8d219ffc0c6 assets/refinedstorage/blockstates/lime_network_receiver.json -de68c1bb96aca8124232255064181ea7c77061cb assets/refinedstorage/blockstates/lime_network_transmitter.json -e65aafd44f1884664870369b7a06f20139accbf6 assets/refinedstorage/blockstates/lime_pattern_grid.json -f41e417b87fc7ccd15bce319d8db35a8f3542d40 assets/refinedstorage/blockstates/lime_relay.json -074afe4a468737e3f448d2caea50d62db74fa171 assets/refinedstorage/blockstates/lime_security_manager.json -59a6dc92b167bc453ebf2ba6bcc961d9bbec8a5b assets/refinedstorage/blockstates/lime_wireless_transmitter.json -bcfd49578ba1a1fc0da8c407929577924cd7ac91 assets/refinedstorage/blockstates/magenta_controller.json -fd6b2b751b90db9328141a387489ebd5fe8c51bf assets/refinedstorage/blockstates/magenta_crafter.json -6f1e9ceaeef79abcb27700e94fdfe650a204ed51 assets/refinedstorage/blockstates/magenta_crafter_manager.json -85132f76ef89ff60523f8d6f1af34f5c0e99a0bc assets/refinedstorage/blockstates/magenta_crafting_grid.json -6eff49c1d5977de919d850ba62daa09e71cff06f assets/refinedstorage/blockstates/magenta_crafting_monitor.json -bcfd49578ba1a1fc0da8c407929577924cd7ac91 assets/refinedstorage/blockstates/magenta_creative_controller.json -f68d377d6f30da7a7d978c5df58299d48d5b8e7b assets/refinedstorage/blockstates/magenta_detector.json -092a116c8cb79a00167f02e82850a402e3114525 assets/refinedstorage/blockstates/magenta_disk_manipulator.json -7ed59dc94571418ed8ccaf6182d79ed94365e02d assets/refinedstorage/blockstates/magenta_fluid_grid.json -fea9685aa26cacbe610ca3a4f4397ea06e6805d2 assets/refinedstorage/blockstates/magenta_grid.json -c73fac24fe45d150fa576d522e77dfea224ad848 assets/refinedstorage/blockstates/magenta_network_receiver.json -e39e9cce3b04deafe103cc8226b6622796efa990 assets/refinedstorage/blockstates/magenta_network_transmitter.json -1c65b8cc717384f28359aaa46f09b0f9ae8fc1dc assets/refinedstorage/blockstates/magenta_pattern_grid.json -4f553ed6c5dd064d77265c2babec2d14df5a47e1 assets/refinedstorage/blockstates/magenta_relay.json -70eca5da1d756238e3a0a6b7f8792f45e77cc6ac assets/refinedstorage/blockstates/magenta_security_manager.json -e795fe43229e6985e200879ea7616ee7dffc2600 assets/refinedstorage/blockstates/magenta_wireless_transmitter.json -66104c5422c0e808192782b6e8d7e1c67f2613fb assets/refinedstorage/blockstates/network_receiver.json -4d9694980f05e93a65df54dc873988b735a45a44 assets/refinedstorage/blockstates/network_transmitter.json -dbb15fd6ee8bc3e03a5fa75eef67573c1a038c09 assets/refinedstorage/blockstates/orange_controller.json -fd553335669d3efabfe1aa6b13bc5af170a865b9 assets/refinedstorage/blockstates/orange_crafter.json -74587839aa5906d50091eeea016d65eea4e84b49 assets/refinedstorage/blockstates/orange_crafter_manager.json -db25b802807ad07ac44636e622b96fe15d17280c assets/refinedstorage/blockstates/orange_crafting_grid.json -ff236adf85f55793d8d154305bfa824b71fe5b8d assets/refinedstorage/blockstates/orange_crafting_monitor.json -dbb15fd6ee8bc3e03a5fa75eef67573c1a038c09 assets/refinedstorage/blockstates/orange_creative_controller.json -98d51f375b141b3d61188bee3dd0bbd8aa681d13 assets/refinedstorage/blockstates/orange_detector.json -9f3c7e3709406e8b90461c04acea67b1c733f254 assets/refinedstorage/blockstates/orange_disk_manipulator.json -a67f02cbfcbd24fc16eb22cc69b537acf39a9a13 assets/refinedstorage/blockstates/orange_fluid_grid.json -4d9b553ee2d7c4d47a57d9e3216a1c2857687144 assets/refinedstorage/blockstates/orange_grid.json -56729736f5a373e9d794044d2fa22b29f43d431a assets/refinedstorage/blockstates/orange_network_receiver.json -a413e577115e9e66da66348143ee4f3de798ebf4 assets/refinedstorage/blockstates/orange_network_transmitter.json -c476b695e1d44cde24e4abe1addc8271ba450ceb assets/refinedstorage/blockstates/orange_pattern_grid.json -3dfdf387ecfabbb8ae5dae1d52ed075e23d20a6e assets/refinedstorage/blockstates/orange_relay.json -e53bdc13ae17b4c8ec6961697adc3637a0febe99 assets/refinedstorage/blockstates/orange_security_manager.json -3a72f0d271ad2a788fc838d2020a4f20c771c32a assets/refinedstorage/blockstates/orange_wireless_transmitter.json -10932bd54e5bf8824c7e59ec543fe892fb1612e3 assets/refinedstorage/blockstates/pattern_grid.json -d7af6cb8443caa1a8e8939a5fdd7b6ddaa6ffe2b assets/refinedstorage/blockstates/pink_controller.json -2f0634684e33495d9a1cac556d8fedadfee593c6 assets/refinedstorage/blockstates/pink_crafter.json -8d1c6a5d2e9af62772ccb6f021eab45e0e28b12a assets/refinedstorage/blockstates/pink_crafter_manager.json -ad91f083b14233acbc92b78913b8ea15a7deca05 assets/refinedstorage/blockstates/pink_crafting_grid.json -aee96b1ab60d7b5fcf893e6aa6f99269f6947c7d assets/refinedstorage/blockstates/pink_crafting_monitor.json -d7af6cb8443caa1a8e8939a5fdd7b6ddaa6ffe2b assets/refinedstorage/blockstates/pink_creative_controller.json -b34e6a31f3fdf64bf4d5f34a44f8c88fc4829653 assets/refinedstorage/blockstates/pink_detector.json -313059168cfbe78d7952f07e98014a385dd1333c assets/refinedstorage/blockstates/pink_disk_manipulator.json -fd7f11e836995f92f1a749c44eabd9799ec5c10b assets/refinedstorage/blockstates/pink_fluid_grid.json -b7ee82a34757ac0d86454fa723c966d05150fcea assets/refinedstorage/blockstates/pink_grid.json -37b0f33169601018894facc80ce2819845cf74ed assets/refinedstorage/blockstates/pink_network_receiver.json -7dc7eff86084689c59a760fa34ed8427f3c57ebd assets/refinedstorage/blockstates/pink_network_transmitter.json -72c3c0ba249fecea6fe7ae7a972c2e1c5d6a5e2e assets/refinedstorage/blockstates/pink_pattern_grid.json -2d02a7b11a417ee247aee629c269e3d9a537a418 assets/refinedstorage/blockstates/pink_relay.json -80ba257c92f749d14149b280fd697204514a861c assets/refinedstorage/blockstates/pink_security_manager.json -8cec8ab89d2a79c2e842b82da823214f22948156 assets/refinedstorage/blockstates/pink_wireless_transmitter.json -d0516f329071e10c335454362d128a0bcd899740 assets/refinedstorage/blockstates/purple_controller.json -1ab5a34dcffcfe247518841e5137425b1e3120c4 assets/refinedstorage/blockstates/purple_crafter.json -b476a5db807ae4f533c28801fcce48f6bdbcb4e3 assets/refinedstorage/blockstates/purple_crafter_manager.json -b1a644999c72eac39184391a1dcfd752279f9a71 assets/refinedstorage/blockstates/purple_crafting_grid.json -ae04819de3e4751def4fe6213dd5c5b1e72d6b2a assets/refinedstorage/blockstates/purple_crafting_monitor.json -d0516f329071e10c335454362d128a0bcd899740 assets/refinedstorage/blockstates/purple_creative_controller.json -c47182eb92226e48b0fbc4ee1f276ca3b6175c98 assets/refinedstorage/blockstates/purple_detector.json -2ecd49eb47ba2d9da41530f0278057ec2692786d assets/refinedstorage/blockstates/purple_disk_manipulator.json -419239b2b88077401977f89ba44d37734c01e949 assets/refinedstorage/blockstates/purple_fluid_grid.json -58737592c3930912d9c326936ca1dbf46362e18d assets/refinedstorage/blockstates/purple_grid.json -e46851393ddea9531cd05228f6cb674409a9125c assets/refinedstorage/blockstates/purple_network_receiver.json -f11d65c8670f236ff7ed3ad79c0f61dc8cbfe62c assets/refinedstorage/blockstates/purple_network_transmitter.json -6dec5bae1c65f77a314bd88581f119ca35c6b96e assets/refinedstorage/blockstates/purple_pattern_grid.json -8bef967778065d9e8ffcb3c9a389e3b0bdeb0bff assets/refinedstorage/blockstates/purple_relay.json -2276ce498b7774001ed3b9d0ac4bc4f02389192d assets/refinedstorage/blockstates/purple_security_manager.json -208a0e9492114bc2916d6a6ff4f8905b4419f7cb assets/refinedstorage/blockstates/purple_wireless_transmitter.json -425cdfbbc529430628351e10d2df1e8d4f26fa0d assets/refinedstorage/blockstates/red_controller.json -feb28a7005972de7860beea56a635aa038daff7a assets/refinedstorage/blockstates/red_crafter.json -3ed747f90863df49996f2f19f7a7251604567a04 assets/refinedstorage/blockstates/red_crafter_manager.json -c2145d394d7bfe2f07498127b355db09499a0c19 assets/refinedstorage/blockstates/red_crafting_grid.json -42c41b03f943e2c2b8fb3f2dac01c01df46b1892 assets/refinedstorage/blockstates/red_crafting_monitor.json -425cdfbbc529430628351e10d2df1e8d4f26fa0d assets/refinedstorage/blockstates/red_creative_controller.json -232c22282f14c1429c123cd924dd2eaaa8a550d5 assets/refinedstorage/blockstates/red_detector.json -d704b96123d94858a44b4dbe1ac252f95ccad807 assets/refinedstorage/blockstates/red_disk_manipulator.json -904565fe5f28fbd5474d742464b698b76c7bff0f assets/refinedstorage/blockstates/red_fluid_grid.json -4e69ba3d8a1940ad253c639d4adb39c0b8c2d901 assets/refinedstorage/blockstates/red_grid.json -9b90de20e5226b915f774f20e98040ad99bf724a assets/refinedstorage/blockstates/red_network_receiver.json -5bf99517f15d434c6b31de36f2e0bfbbcca7af8b assets/refinedstorage/blockstates/red_network_transmitter.json -a17bf57a1cc3d964dd57efb411a944a634673149 assets/refinedstorage/blockstates/red_pattern_grid.json -5f5657026a024aeebefb2affd3339a4560de5c01 assets/refinedstorage/blockstates/red_relay.json -dd7274f38c67658de18e37a61713e3902d7c2c03 assets/refinedstorage/blockstates/red_security_manager.json -cb1b1929d0735777bd713e1d28a97ad28cfcc74c assets/refinedstorage/blockstates/red_wireless_transmitter.json -e9f6f7b28a0e62172755f56334ddeaafa678b6d0 assets/refinedstorage/blockstates/relay.json -7d77645cda7a27fbc558e907e7f3d6c31b73b4f5 assets/refinedstorage/blockstates/security_manager.json -4e8f1cc9ddaa8e5d03d612d9264723696fc962ac assets/refinedstorage/blockstates/white_controller.json -b5279e91e9b4093c1cd456a30fc0827d564f4466 assets/refinedstorage/blockstates/white_crafter.json -6a93272ed67d68821d507a1e72d0a863d3a0e14a assets/refinedstorage/blockstates/white_crafter_manager.json -788aeffd48a48bd1c7fe56d60211a9053f94e5b9 assets/refinedstorage/blockstates/white_crafting_grid.json -92c6033e55365c89ac68edcbc88bae3189f35f15 assets/refinedstorage/blockstates/white_crafting_monitor.json -4e8f1cc9ddaa8e5d03d612d9264723696fc962ac assets/refinedstorage/blockstates/white_creative_controller.json -5be0f6ed4fc716158f914a9116271c42c67ed0ce assets/refinedstorage/blockstates/white_detector.json -7f352d5673ab7dacc44082acd26733300e1cc727 assets/refinedstorage/blockstates/white_disk_manipulator.json -f54092902eeba3191e3450e231bbfa1ff1b94f23 assets/refinedstorage/blockstates/white_fluid_grid.json -0ee75a9a7e30ce31fae81125707e636d6d47515e assets/refinedstorage/blockstates/white_grid.json -23e15c08874edd28681e07fb8b003313913cd443 assets/refinedstorage/blockstates/white_network_receiver.json -54499be7477a5644643417ad9f13da415913442b assets/refinedstorage/blockstates/white_network_transmitter.json -1500f65f1a61df516d4244b65a6cf008f10f3bc3 assets/refinedstorage/blockstates/white_pattern_grid.json -0a95b3d9387b836b20759a4a214d50aed8bc3996 assets/refinedstorage/blockstates/white_relay.json -3992eacaea506a78c0b495c240d857cd9f0b49ea assets/refinedstorage/blockstates/white_security_manager.json -5c5ab48f97e0b1ba3ab0b1447d4b860e4edc5b5c assets/refinedstorage/blockstates/white_wireless_transmitter.json -d5826de4a393aeed66a9889fc477ec52c6c40cf8 assets/refinedstorage/blockstates/wireless_transmitter.json -88b8afeaff1cdb1a31b716233d1ef482692d180a assets/refinedstorage/blockstates/yellow_controller.json -124ef43b47df354d325a1bad559c2136b83ea9f1 assets/refinedstorage/blockstates/yellow_crafter.json -aa494c4f5c95e2a8644385a4313ab14fca865602 assets/refinedstorage/blockstates/yellow_crafter_manager.json -df0839119540bf53e37b9b705b6e769b3960c026 assets/refinedstorage/blockstates/yellow_crafting_grid.json -be61e3ed1c410121bffe647d50b096ddb3717993 assets/refinedstorage/blockstates/yellow_crafting_monitor.json -88b8afeaff1cdb1a31b716233d1ef482692d180a assets/refinedstorage/blockstates/yellow_creative_controller.json -075f3d6e8d7807fac6256b894976e566e669389b assets/refinedstorage/blockstates/yellow_detector.json -1dede5dc53ad271185dc98d7898a609711b36ffb assets/refinedstorage/blockstates/yellow_disk_manipulator.json -fefe728ea271cd0cfde3d36049623f68d876fa0a assets/refinedstorage/blockstates/yellow_fluid_grid.json -30e440ad8d212a7628cd669239e6b5df1078125f assets/refinedstorage/blockstates/yellow_grid.json -8bf9f9c70e21c5fea164fe274196f454f3608f19 assets/refinedstorage/blockstates/yellow_network_receiver.json -240c73408def6f14e8a111877933df3cce4e056f assets/refinedstorage/blockstates/yellow_network_transmitter.json -ce2f6d8b3906a8ec57af3be84ef8131d31c4880e assets/refinedstorage/blockstates/yellow_pattern_grid.json -a8d5807421d8113a131e3d6cb26f29520a0b8948 assets/refinedstorage/blockstates/yellow_relay.json -2fbeb805437122bd68f7c96ccfe37743a9849861 assets/refinedstorage/blockstates/yellow_security_manager.json -14cef471fd9093aaa04412760c860e3a33414267 assets/refinedstorage/blockstates/yellow_wireless_transmitter.json -ae9d357a679ec59a3e9cdc61d8fba5d84d313d2b assets/refinedstorage/models/block/controller/black.json -ff4aaa48eaf22ed2ef0c08435cfd9e0cfaf49142 assets/refinedstorage/models/block/controller/blue.json -d5bf30ffc89bf3a45ff6a6de24d8e7c17a74934a assets/refinedstorage/models/block/controller/brown.json -02cca926e56e4575a18cca95900168e7f24304f0 assets/refinedstorage/models/block/controller/cyan.json -8b0647e17f92b74ba71a740c6c1a17f263de22f2 assets/refinedstorage/models/block/controller/gray.json -26a8e9a2abaf81028793bc457571e37656a1d792 assets/refinedstorage/models/block/controller/green.json -7c324ad73aaba72830bf28096c1ab0e0b5f870dc assets/refinedstorage/models/block/controller/light_blue.json -064f73b5387c769e5bbd23146fb628fc9a63407d assets/refinedstorage/models/block/controller/light_gray.json -f8abb7e0d1f37ac402509c408a3fd8e5defe2b17 assets/refinedstorage/models/block/controller/lime.json -457024d029d5e314a0cc4325d6214bd09011d644 assets/refinedstorage/models/block/controller/magenta.json -32f35d33c81eb91a61d878c6f5a96c7ff9408944 assets/refinedstorage/models/block/controller/nearly_off.json -121c053387df0930b94c1bbc1778e7dbe7aa1eb1 assets/refinedstorage/models/block/controller/nearly_on.json -d5fe73359126bb822b3401e1dbf4be819e7c43a5 assets/refinedstorage/models/block/controller/off.json -4dc934fad1e778630d8de52ed20b9cd8b4f8bba1 assets/refinedstorage/models/block/controller/orange.json -40454b9098e1b98f0bbf038c068c3f78289dc52c assets/refinedstorage/models/block/controller/pink.json -e7c4c45138e39830ddc078a034c5936a79bd4efb assets/refinedstorage/models/block/controller/purple.json -f4b2cd6c0075940d02e84511d9098370b9b7fd5e assets/refinedstorage/models/block/controller/red.json -5f53d142949cf75dddbd30934bafee311928c0fc assets/refinedstorage/models/block/controller/white.json -0dd789634e6438fea837c2ef765787aeb6dff107 assets/refinedstorage/models/block/controller/yellow.json -2d0a3dee7ab58fb0b5d9634f5f43b414403c22a4 assets/refinedstorage/models/block/crafter/black.json -7dafc9af762956fbea25e55a10ce1f1e9540c262 assets/refinedstorage/models/block/crafter/blue.json -015eb9220ee184eaeab686fb81f476016a2becdd assets/refinedstorage/models/block/crafter/brown.json -b7d9d44c4b49d8a2cf17b349f41c5f924c905380 assets/refinedstorage/models/block/crafter/cyan.json -b29fad337533be674268017ca79bfa15455e9112 assets/refinedstorage/models/block/crafter/disconnected.json -170076270815625ba7db914815dabd32356a98b5 assets/refinedstorage/models/block/crafter/gray.json -f0f3d41533935e10713387ec7bf27a62ed613b30 assets/refinedstorage/models/block/crafter/green.json -24edb97c539324b6681423156a54e1796484954e assets/refinedstorage/models/block/crafter/light_blue.json -cb5ab3a0230f6d82a95ffb27a1e4293fa8909aef assets/refinedstorage/models/block/crafter/light_gray.json -3881d28774ad89783ac13e2bdc87c52657342461 assets/refinedstorage/models/block/crafter/lime.json -3255d9dd5f533f31b527b7db6008af5ba00da222 assets/refinedstorage/models/block/crafter/magenta.json -77860fcd2ec523efca1ec942e1cf53ec4ac240e7 assets/refinedstorage/models/block/crafter/orange.json -5ef292cae07c9adba7ef5547de2bc8b4de700935 assets/refinedstorage/models/block/crafter/pink.json -90b0edef269beeab45c486842f8019f03a875521 assets/refinedstorage/models/block/crafter/purple.json -e7e9b00208c16d4dd5b48719f693d00be7d0f907 assets/refinedstorage/models/block/crafter/red.json -23b68b547749a7fc0bb415f44c2465ab87f95da0 assets/refinedstorage/models/block/crafter/white.json -b623489df2c384d56bad7efd34b3a25b6cd6516f assets/refinedstorage/models/block/crafter/yellow.json -53b842bdfbf090a8a6f4c1a9e007ffa4a57392bb assets/refinedstorage/models/block/crafter_manager/black.json -8ae90643b7c34a4617fb9bbf953d9321f262b075 assets/refinedstorage/models/block/crafter_manager/blue.json -6a59220e215d8ca0dab9f8b99e086ab19fa76361 assets/refinedstorage/models/block/crafter_manager/brown.json -9f9632012f24983065382042ecc8ab27fbda1959 assets/refinedstorage/models/block/crafter_manager/cyan.json -62e2de089006f1f1af16da727fb533816bf42f83 assets/refinedstorage/models/block/crafter_manager/disconnected.json -ef9bb5308e19eb8fb2beaaac9d2e96cb7a9eea09 assets/refinedstorage/models/block/crafter_manager/gray.json -a67240589215e25b56dd12b4ed342b457d7212f1 assets/refinedstorage/models/block/crafter_manager/green.json -c9c8dde60062f0f7a4b1e57b3e92a0a54c59c70f assets/refinedstorage/models/block/crafter_manager/light_blue.json -25657ac38e0e0c8cdc2c20823174dd66f9fab93f assets/refinedstorage/models/block/crafter_manager/light_gray.json -ffaaa549b5c2694d56caa46de79afac5c027e667 assets/refinedstorage/models/block/crafter_manager/lime.json -2ad92e2330969b152a25015058ebb03501d474bc assets/refinedstorage/models/block/crafter_manager/magenta.json -8846f39362c69f5d394a02aa94edb03b8ae7832d assets/refinedstorage/models/block/crafter_manager/orange.json -8c9653a03af44bc48b02fd1e8756a905d52a8c9f assets/refinedstorage/models/block/crafter_manager/pink.json -d3001dab31b4f0a527ecb592667cb167b4a01e8d assets/refinedstorage/models/block/crafter_manager/purple.json -6218a6b5419896b10ccf0afcc5352ee9beb59fc8 assets/refinedstorage/models/block/crafter_manager/red.json -4d0f4023e9aa61356c738a0a1c9d267bb9858553 assets/refinedstorage/models/block/crafter_manager/white.json -d2b24956b15f144f87b969a6bbc1f79729130f6e assets/refinedstorage/models/block/crafter_manager/yellow.json -1b946bfcaa09aad5925e59408a218d5920c09a80 assets/refinedstorage/models/block/crafting_grid/black.json -00d1bf47ea039280a0b7ff72c503871043fe8af8 assets/refinedstorage/models/block/crafting_grid/blue.json -a9c2cd6c36cee535db02fe1bea9c0f76dbe53c97 assets/refinedstorage/models/block/crafting_grid/brown.json -d2fa9d2aa51fe43d7fb38b1920da7ab7a5395592 assets/refinedstorage/models/block/crafting_grid/cyan.json -7d78fec58674b4dc34533691ce4beee578d90800 assets/refinedstorage/models/block/crafting_grid/disconnected.json -e1ed80a75437e09d66389b779548a7b3338a0193 assets/refinedstorage/models/block/crafting_grid/gray.json -763029a62a684fb313f5a996e23127f414cf444f assets/refinedstorage/models/block/crafting_grid/green.json -1593e7398c8681982271ae059bc009472daf680f assets/refinedstorage/models/block/crafting_grid/light_blue.json -d01f1564a1dab424e5b922b6eef1c5eef819c642 assets/refinedstorage/models/block/crafting_grid/light_gray.json -2ed9e9839175e52008bcd34c7d7bdfde48be00d8 assets/refinedstorage/models/block/crafting_grid/lime.json -a32d5d14a9d91629b077a16815e6370219563d28 assets/refinedstorage/models/block/crafting_grid/magenta.json -7492f843f85d796ddaf5425da098bd2fb09bca71 assets/refinedstorage/models/block/crafting_grid/orange.json -4e149dcbfd8ce7a7cbdd879181cc45d3b8613996 assets/refinedstorage/models/block/crafting_grid/pink.json -5beb71716f29d9f5b8b598fa4688859114c59491 assets/refinedstorage/models/block/crafting_grid/purple.json -1e37838b9a07516c7b1b9337f6367873d36eb571 assets/refinedstorage/models/block/crafting_grid/red.json -f51afcfc4c8181e3bc695ece5df16d349b0be6cf assets/refinedstorage/models/block/crafting_grid/white.json -36ac27891e2da1e01ad8484fc10c187dc7334055 assets/refinedstorage/models/block/crafting_grid/yellow.json -b53e69e4cdda8c6d1b6e6cf79b500a259ecbdccb assets/refinedstorage/models/block/crafting_monitor/black.json -eeb517b9400a1f0c9fd6fbab3b97e97572da1e9a assets/refinedstorage/models/block/crafting_monitor/blue.json -bb555ef4ac7689d3304c6dffbd0e0dd562b9bcb5 assets/refinedstorage/models/block/crafting_monitor/brown.json -77953fc055d3ccb5e3fc93f5f6b833ce899991d4 assets/refinedstorage/models/block/crafting_monitor/cyan.json -9b11177dfc01fa28c5a10ad78850895085c8b95e assets/refinedstorage/models/block/crafting_monitor/disconnected.json -6d7a92dfe54514f3279837e1e5d20311b976c6b7 assets/refinedstorage/models/block/crafting_monitor/gray.json -19c9bef29e18a575b7c27e09a952c0fed330bdf6 assets/refinedstorage/models/block/crafting_monitor/green.json -9e360d96f4b700f03a391ca599eff72aa0b72ada assets/refinedstorage/models/block/crafting_monitor/light_blue.json -ca20a9f124f6b3405c30d1b5bae7e6ed01b13d37 assets/refinedstorage/models/block/crafting_monitor/light_gray.json -006d20df70560827a02d5a0681cb55881a62e8db assets/refinedstorage/models/block/crafting_monitor/lime.json -23475e17152afe2c9deba47328f7c2109867970e assets/refinedstorage/models/block/crafting_monitor/magenta.json -a3631ca5b4b992c85f3e1a30a317fad450ddcc6a assets/refinedstorage/models/block/crafting_monitor/orange.json -786e28a59b6d03fbbb980887d0bb84c508d3f52a assets/refinedstorage/models/block/crafting_monitor/pink.json -8aa24b6a830b8cb4e7d10c6f71d806e32e4bce5d assets/refinedstorage/models/block/crafting_monitor/purple.json -4b5af9ffbc41b718e0b653ebc2267ac6cafddece assets/refinedstorage/models/block/crafting_monitor/red.json -77bf83d61f4a5db49b481715b62c20736ea6f705 assets/refinedstorage/models/block/crafting_monitor/white.json -5a345588a6986ad15c261f45d090d39eaf0d1b93 assets/refinedstorage/models/block/crafting_monitor/yellow.json -6017ea7627c46f1e2f24cc28619fec7852f781a8 assets/refinedstorage/models/block/detector/black.json -d114ff3715aa47067164ac4645a025170f0a22ef assets/refinedstorage/models/block/detector/blue.json -acf476ab2bf134c1459816e5e51169de1a29fdd7 assets/refinedstorage/models/block/detector/brown.json -0e8038a1893a16f06c7ad67758b51608ea91e23a assets/refinedstorage/models/block/detector/cyan.json -d8b1a2ccd3f59a4825c6047856dc03b9af688b63 assets/refinedstorage/models/block/detector/gray.json -fc1174098e53f1f33b24071f26fc885a216f6e3b assets/refinedstorage/models/block/detector/green.json -a2770a92b3319d51353c4e86886d7b5d873145db assets/refinedstorage/models/block/detector/light_blue.json -2e10666b1999f3fe90322afb611ad92528d721a8 assets/refinedstorage/models/block/detector/light_gray.json -6091f163bca6ec790c2a02cd7aef8435a1480e93 assets/refinedstorage/models/block/detector/lime.json -f195af718615840853f171f42d352ccf301ec2ae assets/refinedstorage/models/block/detector/magenta.json -09ff30cb14b9873ae8eaf7cc29a6a37606d30026 assets/refinedstorage/models/block/detector/off.json -1fab7b5b5846b7c6f5401383a739822c3653ede4 assets/refinedstorage/models/block/detector/orange.json -2c2430153b44d5046c95fea28b526b6575ad556f assets/refinedstorage/models/block/detector/pink.json -2aa61504e64b68642d664d8994651fcc3d1b1a57 assets/refinedstorage/models/block/detector/purple.json -298b5d3570313a213bfb0b1a1420aa46e6b4283f assets/refinedstorage/models/block/detector/red.json -94039851c48a455e1cc3a76bfab32874e966b94a assets/refinedstorage/models/block/detector/white.json -44db331b1d868519d64ecd523f4208a87971eaf4 assets/refinedstorage/models/block/detector/yellow.json -f9d94cb758a52ac9cc99647f8ef99aafadf89d87 assets/refinedstorage/models/block/disk_manipulator/black.json -5be7d9ae19a0259059ad6c47e03e8afcb4010c9e assets/refinedstorage/models/block/disk_manipulator/blue.json -669e8a539594451137fe86b5e3248351a9a4bfe2 assets/refinedstorage/models/block/disk_manipulator/brown.json -6f81889ee76c5b82275652e5018cc0247f7db936 assets/refinedstorage/models/block/disk_manipulator/cyan.json -e37ef39990e924355fcbb1278502571ca0ca2027 assets/refinedstorage/models/block/disk_manipulator/disconnected.json -b5b1cb22d68eb5a9fa4af32e105078f8091f4efd assets/refinedstorage/models/block/disk_manipulator/gray.json -f95f7b8fbbaf063bdd9781421a5a6e2a864cb61d assets/refinedstorage/models/block/disk_manipulator/green.json -1748c0b07908d667a776d5bc442379e2e660bbce assets/refinedstorage/models/block/disk_manipulator/light_blue.json -7679f840f7c49d8e5cdc3039420b43d2b2ac25ea assets/refinedstorage/models/block/disk_manipulator/light_gray.json -469aca3808a219b974c0366237fe407bf11254ef assets/refinedstorage/models/block/disk_manipulator/lime.json -67664e0ef0b7f22d41007260cfb644d3cd2c28e5 assets/refinedstorage/models/block/disk_manipulator/magenta.json -e5d2659579d3fb5529b9e4ad5661c3f728a19e1f assets/refinedstorage/models/block/disk_manipulator/orange.json -a1ecd7f0659133ab141e6bc5d90ee49b67993b14 assets/refinedstorage/models/block/disk_manipulator/pink.json -76fb42cd66ed5c574a56e9d7ebe19c19bd7ae935 assets/refinedstorage/models/block/disk_manipulator/purple.json -5a326c545ac0ce84e781c593246e055bedda9a21 assets/refinedstorage/models/block/disk_manipulator/red.json -31f16b8d010fd905ecae4bfffbb905ce62edf60d assets/refinedstorage/models/block/disk_manipulator/white.json -02ef06295d47556bf9d5005744af3a74fc714e78 assets/refinedstorage/models/block/disk_manipulator/yellow.json -d56c1ceb82d25a012ade89bb4d18b69871d18081 assets/refinedstorage/models/block/fluid_grid/black.json -332695473b41568330a498a64ac3a3e994a54cbd assets/refinedstorage/models/block/fluid_grid/blue.json -2f2724cec4532834c87b5c209bdcc81c4f421fdb assets/refinedstorage/models/block/fluid_grid/brown.json -b7e64cbc10a8d2eddf8ee73012270e9821d8d9d1 assets/refinedstorage/models/block/fluid_grid/cyan.json -73df5d2d8476724cc6ad15d6345edc90d4213d70 assets/refinedstorage/models/block/fluid_grid/disconnected.json -99dd2fcee4d44d5f0e8113460ed205745424c66b assets/refinedstorage/models/block/fluid_grid/gray.json -3ebdba244c738f7ba68a3e7160141dd3453e3179 assets/refinedstorage/models/block/fluid_grid/green.json -ccf80ae3674a4f143f71ad52bdf193793c033e29 assets/refinedstorage/models/block/fluid_grid/light_blue.json -8e59ec4e1de0b523228d449ed934bf4ebdb3a9fa assets/refinedstorage/models/block/fluid_grid/light_gray.json -5f07bf5293b6f4ea4656ea764fd0e66b9aabe058 assets/refinedstorage/models/block/fluid_grid/lime.json -a78d8416db77ce09bf50ece11e9426e8ff999311 assets/refinedstorage/models/block/fluid_grid/magenta.json -6c55d13c455cd29180e3cef1e708a65a42f2139e assets/refinedstorage/models/block/fluid_grid/orange.json -10155832de814d5e8ec746d948adfd34ee50567d assets/refinedstorage/models/block/fluid_grid/pink.json -6581e8b9b60c43aee68f668fc7ea1632f347a64c assets/refinedstorage/models/block/fluid_grid/purple.json -2fdf1ddf0024a6621c22321a10a7c8bb0ef56e5a assets/refinedstorage/models/block/fluid_grid/red.json -c498a1b312df196b3ad748132e91e3d4c3eea671 assets/refinedstorage/models/block/fluid_grid/white.json -ba18bbd57b4761cef961b9f10bb794acc191036c assets/refinedstorage/models/block/fluid_grid/yellow.json -957658301e61c377a91d0a12035974c17b9fc21a assets/refinedstorage/models/block/grid/black.json -c397865f08ce5fc60a994d409a629d16061a8d5d assets/refinedstorage/models/block/grid/blue.json -da81bd07d9cd81efcca062a89755fe0f3423654c assets/refinedstorage/models/block/grid/brown.json -8eefa7910029d0597cf41b92dcd21f1013dc114c assets/refinedstorage/models/block/grid/cyan.json -8058de07376f5a28ff8740201d5fa8c09f097c74 assets/refinedstorage/models/block/grid/disconnected.json -241dc051a8e50d172da9bdc5bb468476ed2a6c36 assets/refinedstorage/models/block/grid/gray.json -1f28a22ff76104039ffae99158636d695814938b assets/refinedstorage/models/block/grid/green.json -d00c4d23d6f3d2fd76c9321f1a90e4d04bd665a2 assets/refinedstorage/models/block/grid/light_blue.json -00d98fac78cc67a454c88c83553a4481728c4aab assets/refinedstorage/models/block/grid/light_gray.json -c56be8bf5a7a0b4a75f13217f5339404e50e0635 assets/refinedstorage/models/block/grid/lime.json -dd6892f22e78892cecd71f3b6ad45f4e221232e7 assets/refinedstorage/models/block/grid/magenta.json -d368fb0215f1426e6590379829acdec8c5fe4c8f assets/refinedstorage/models/block/grid/orange.json -4c1e4595b2eb629053a73b0ce747dcdc4e25b2cb assets/refinedstorage/models/block/grid/pink.json -539ff76eaf9ed0cac855fd67c54bc8ba8a4e3305 assets/refinedstorage/models/block/grid/purple.json -b3761a7a76bf20c261573b948847e0e9542c50f9 assets/refinedstorage/models/block/grid/red.json -4ef5dbc5ed0a10fdd2f4e77b65a44db5f3a5b53b assets/refinedstorage/models/block/grid/white.json -f2d54c67d7a22abfa30210d83975ff3ce3304dab assets/refinedstorage/models/block/grid/yellow.json -ac00a710ec83e0dce0deebbdce98bc9f7bd217b0 assets/refinedstorage/models/block/network_receiver/black.json -8eb682b016bc23d996bbedb4c0b3f86d50c4b1e9 assets/refinedstorage/models/block/network_receiver/blue.json -1def147090b310528d37de932f92478439436759 assets/refinedstorage/models/block/network_receiver/brown.json -cbe6d02bccd792d3e401c6f71a33b191c7da0366 assets/refinedstorage/models/block/network_receiver/cyan.json -f43da13bdf632e1865ec8b5687a02f190911ea54 assets/refinedstorage/models/block/network_receiver/disconnected.json -f5590e3d32889627928472ab74a31daafdb23301 assets/refinedstorage/models/block/network_receiver/gray.json -786b530f4380a181e744c3853799f68cdf1c874b assets/refinedstorage/models/block/network_receiver/green.json -13de894da4755cac36e7e607c03693dcf0bd04c7 assets/refinedstorage/models/block/network_receiver/light_blue.json -492ec3630e70a9486b03674cc73b76363e227640 assets/refinedstorage/models/block/network_receiver/light_gray.json -44ec2b8deedb9e8124c4d408878bb1c6d86c6abf assets/refinedstorage/models/block/network_receiver/lime.json -320b14ba60a64dc565d3a8624588680edd88bd1a assets/refinedstorage/models/block/network_receiver/magenta.json -591864c5c6bbf8b31893bb4403564807fbd07d3d assets/refinedstorage/models/block/network_receiver/orange.json -55d065d11c2d4911ea4ff88d8e76001a1907a5bb assets/refinedstorage/models/block/network_receiver/pink.json -322aca773577dfc0fa34a1fa84d0536c2fccd0a8 assets/refinedstorage/models/block/network_receiver/purple.json -c0b0890eea254c9b54444c81deffaf97ad459864 assets/refinedstorage/models/block/network_receiver/red.json -6d148e4e6ea12306d53bb3ed63996d5948adc5b6 assets/refinedstorage/models/block/network_receiver/white.json -da6dc1813f2d1c3fc63d3b20f4418cb26ae04d0a assets/refinedstorage/models/block/network_receiver/yellow.json -3bcfb8a9399c6dbf53436ea2f0267a0a6ec7d715 assets/refinedstorage/models/block/network_transmitter/black.json -04892f8f479b717088bd1b9ab54f5963891d46a6 assets/refinedstorage/models/block/network_transmitter/blue.json -6252facc245c1519eda72afc9e89e61d3d94d5e3 assets/refinedstorage/models/block/network_transmitter/brown.json -300135085e94bc545ad0589c264dbb4b1e6b1123 assets/refinedstorage/models/block/network_transmitter/cyan.json -5fa09ac9bf69f0cc57bbeb138c49876866e2aea0 assets/refinedstorage/models/block/network_transmitter/disconnected.json -a8a962be6a0a0b9aed762ccebfc6f31c860cdb75 assets/refinedstorage/models/block/network_transmitter/gray.json -1ca6a171880cccc45ccfabeee3573133ce58cbf9 assets/refinedstorage/models/block/network_transmitter/green.json -833ec303035dd1d930d78c0e9782da23652d7e3b assets/refinedstorage/models/block/network_transmitter/light_blue.json -5f664c3061c3ade23c11c874fafbde235962a512 assets/refinedstorage/models/block/network_transmitter/light_gray.json -f8274677a7a57104196df3d8579061d65823fc21 assets/refinedstorage/models/block/network_transmitter/lime.json -eeeacb13f6abe19cde4c52d03d8bd033b9a10c74 assets/refinedstorage/models/block/network_transmitter/magenta.json -8ae269bdfcce6deb50ca3e7d13291d3739b939aa assets/refinedstorage/models/block/network_transmitter/orange.json -1ab40c6ec3cf7c9aa49f3d7e270d869baff31d92 assets/refinedstorage/models/block/network_transmitter/pink.json -115de68100eedb6f1225bd24208aba2e55a5774d assets/refinedstorage/models/block/network_transmitter/purple.json -33a5a71dca80718053fe8963b604ef1ea1c72f41 assets/refinedstorage/models/block/network_transmitter/red.json -5ca043e143fb306f750834f7031eb13412981e6e assets/refinedstorage/models/block/network_transmitter/white.json -5b0b4613c6178dd5852cdd9e3b2a817ecfb61536 assets/refinedstorage/models/block/network_transmitter/yellow.json -664a9f44fcd25a68c9d60aca74aae322c6db1957 assets/refinedstorage/models/block/pattern_grid/black.json -3c2cbfa4c4b6e1c606c5af9d72e2cd007cf9891e assets/refinedstorage/models/block/pattern_grid/blue.json -620400c01d2f6d0942c33cfa170d77969b903bbb assets/refinedstorage/models/block/pattern_grid/brown.json -55f3c0b7817e1544b4ff1859d9c426b1c71287f7 assets/refinedstorage/models/block/pattern_grid/cyan.json -15866a70e8a2f3a935f6eaf1996430b7b00b210e assets/refinedstorage/models/block/pattern_grid/disconnected.json -3474963425559cfff4247a06f7ea067b25e3f974 assets/refinedstorage/models/block/pattern_grid/gray.json -3e73d543d3b0d56df7a04a8343f59c026523b0d8 assets/refinedstorage/models/block/pattern_grid/green.json -dddeeb47c0b3b18800f3379a45d88cea0e355350 assets/refinedstorage/models/block/pattern_grid/light_blue.json -235b0b26aea5fbecc3964ae07e3803b4a4b41afd assets/refinedstorage/models/block/pattern_grid/light_gray.json -0da5e05b78c4bff6db167bec241747a5dd72bda8 assets/refinedstorage/models/block/pattern_grid/lime.json -d585d96e9f985a928314c26cfc717d5f966aca48 assets/refinedstorage/models/block/pattern_grid/magenta.json -574895f6f18a05a3a27ece5798619b9777af1b70 assets/refinedstorage/models/block/pattern_grid/orange.json -70c426c56ae948641884912db5a006bc7d227619 assets/refinedstorage/models/block/pattern_grid/pink.json -649e699167a331fd22767b090ac33da528b3f6b0 assets/refinedstorage/models/block/pattern_grid/purple.json -557f73f558ec395974355e63ac35da055c291675 assets/refinedstorage/models/block/pattern_grid/red.json -845bf6d648b66144e1b6cb46b7f6f0109e54c6a6 assets/refinedstorage/models/block/pattern_grid/white.json -b665dd9b098ffd2b7591369bae75aab1855fcc52 assets/refinedstorage/models/block/pattern_grid/yellow.json -58783999d970a3a4288ef02ad2243afbc8245708 assets/refinedstorage/models/block/relay/black.json -0738eda6bddf1118abad5a68f3dd9a640d968183 assets/refinedstorage/models/block/relay/blue.json -27860909c4785ee04a3c4141856eeb9e2dc006a1 assets/refinedstorage/models/block/relay/brown.json -23a6e900091d1c3ad2a3ecd24c815ad9aeb7b878 assets/refinedstorage/models/block/relay/cyan.json -4375095bf84030320f39e42e63cdccc8d7b52b8b assets/refinedstorage/models/block/relay/disconnected.json -4ac32cafc7e35805d47ce4f9e0282770f3ab8f5b assets/refinedstorage/models/block/relay/gray.json -53adf3d3931063eadc89c61aa4c853112fc98222 assets/refinedstorage/models/block/relay/green.json -8ce8310d56310b92a8d52e8d0903bbe84aa029f2 assets/refinedstorage/models/block/relay/light_blue.json -ddc477a77c14c9f90ca3f65030499b3090ee3051 assets/refinedstorage/models/block/relay/light_gray.json -2b487fd6cc7cbf26928dfc2913c493b663678bbe assets/refinedstorage/models/block/relay/lime.json -6314a51e73d4bf3db7ebe875608df5ee8285a6e8 assets/refinedstorage/models/block/relay/magenta.json -0413e4f26f7f1013280d07235afd6d211ab07689 assets/refinedstorage/models/block/relay/orange.json -4741eba9817f0d02b41efc8d44939ab3dfa669fc assets/refinedstorage/models/block/relay/pink.json -3576438afa8d31ad5da4be9906ed23c788d11e15 assets/refinedstorage/models/block/relay/purple.json -954081b60799d22c83b501b56a4038369b8ad3ea assets/refinedstorage/models/block/relay/red.json -4294bd7213fcf26cac1a985b401f552b6df6d25f assets/refinedstorage/models/block/relay/white.json -018c06cfaf843591d68b5a36c26b0f053e4177c0 assets/refinedstorage/models/block/relay/yellow.json -fb6b823495780c49ec46e70c3d611e79ff380d83 assets/refinedstorage/models/block/security_manager/black.json -f85a94951c4c44a064ce4d56d571433e79654d77 assets/refinedstorage/models/block/security_manager/blue.json -e23e987fb78db84c4dd1dd1e55b40399b1cb9b55 assets/refinedstorage/models/block/security_manager/brown.json -5b7f72920b411d3e4801dce0ad4a1faab0e5b4fb assets/refinedstorage/models/block/security_manager/cyan.json -a84ab4e5c1442a384816b335fe7b9c10c8c3bcf8 assets/refinedstorage/models/block/security_manager/disconnected.json -99ceac967f4631e6cc54ede811bb73234129ed61 assets/refinedstorage/models/block/security_manager/gray.json -9dc0105af95c4ff099bd0db43d11dce42023e8ce assets/refinedstorage/models/block/security_manager/green.json -72f049ab543c57c697c03f972686cbb517cc9cf6 assets/refinedstorage/models/block/security_manager/light_blue.json -9c7c3dcde4d6be74d960c8d25ebad27d64945c42 assets/refinedstorage/models/block/security_manager/light_gray.json -ec7839332bac2e84cc45619f84c34b1464dc02ef assets/refinedstorage/models/block/security_manager/lime.json -2ad0b1755cd9d54b35a3743172b11017604bfedc assets/refinedstorage/models/block/security_manager/magenta.json -29596b76840a7e5b6e98fe99eac4a8e330e48cc5 assets/refinedstorage/models/block/security_manager/orange.json -38215912cb165d87cd252d85c35a5b17a5c83565 assets/refinedstorage/models/block/security_manager/pink.json -00f805efb8b100b0e152d029416930bd2aeff087 assets/refinedstorage/models/block/security_manager/purple.json -beb12b547c3c8444864df82d12824ca8685bff1f assets/refinedstorage/models/block/security_manager/red.json -bdc1694d601e32237262ef79b28d6475ab487d3c assets/refinedstorage/models/block/security_manager/white.json -75d1b26cfff0db2fb161cfd707b5be8e0d375844 assets/refinedstorage/models/block/security_manager/yellow.json -f58c9d8ede28cc34dce3f01aef3a43a3fec6d14f assets/refinedstorage/models/block/wireless_transmitter/black.json -06bf93df5d3bd095da482af3301c1ed9095a077e assets/refinedstorage/models/block/wireless_transmitter/blue.json -c5c4a0e0395a039955acf1621cd4179c03ce16c6 assets/refinedstorage/models/block/wireless_transmitter/brown.json -33263687bb6f2b20ba3ac053599ce77dc84b89ff assets/refinedstorage/models/block/wireless_transmitter/cyan.json -ad103cc4074c77a0134199bec1e406a5796fbb20 assets/refinedstorage/models/block/wireless_transmitter/disconnected.json -52f8e0c855ee0ddc6f88efe393d9d90621d74fed assets/refinedstorage/models/block/wireless_transmitter/gray.json -77259ed10503d4749cf2f2e5cf14e7c5e2f8efe6 assets/refinedstorage/models/block/wireless_transmitter/green.json -0e7011b7a83044427d3bce3bacc522691da5dd8b assets/refinedstorage/models/block/wireless_transmitter/light_blue.json -0ed51bee519c3f38aac934cb0b5e70e2a3899320 assets/refinedstorage/models/block/wireless_transmitter/light_gray.json -7d1d28dc5f9422c53775f28e1b40b432b40400c8 assets/refinedstorage/models/block/wireless_transmitter/lime.json -f05088d917f1aaa827364e10e575cf97db63c6ce assets/refinedstorage/models/block/wireless_transmitter/magenta.json -3af791aa90a386c6076be12890a68c072fa4457a assets/refinedstorage/models/block/wireless_transmitter/orange.json -8e9301bb85a994a33b342c052e0646670f52bf9a assets/refinedstorage/models/block/wireless_transmitter/pink.json -32797009b18b8f58bcff9823e2da89c5afe3b337 assets/refinedstorage/models/block/wireless_transmitter/purple.json -fd3c85dc69328ce3779addf9bc210a563167dc16 assets/refinedstorage/models/block/wireless_transmitter/red.json -5465574b13cf5f6377608f7500de83e0e979e11c assets/refinedstorage/models/block/wireless_transmitter/white.json -42bb07fea22b718418520bb0e9978d0399de0efd assets/refinedstorage/models/block/wireless_transmitter/yellow.json -9d3c2225da5126bf245d9d17b6abb50b7302da68 assets/refinedstorage/models/item/black_controller.json -b6a37ab784a0b483262350abcc3d53e01461d0a8 assets/refinedstorage/models/item/black_crafter.json -bcb8073d2cd3ad48f5acd21dd88ed019b01354ff assets/refinedstorage/models/item/black_crafter_manager.json -bcf8fa9a93e27bae6002945f0b1ac390bb434512 assets/refinedstorage/models/item/black_crafting_grid.json -a9915aedbcbe070c9ee5fc0a12cc88708e774ba6 assets/refinedstorage/models/item/black_crafting_monitor.json -9d3c2225da5126bf245d9d17b6abb50b7302da68 assets/refinedstorage/models/item/black_creative_controller.json -8d83bd26e3bd95c6cd54cf77e16d286838848091 assets/refinedstorage/models/item/black_detector.json -e1071776d45ead6bc6b47a8e0f31bf76e33c6bdf assets/refinedstorage/models/item/black_disk_manipulator.json -fc22ec35580ae732dc36234a78cdee52de593d9f assets/refinedstorage/models/item/black_fluid_grid.json -0caf059c5213fa1ce5e45f1a82bf58761546ba17 assets/refinedstorage/models/item/black_grid.json -9dab34a95dc5d72c98cc356b4b741a33fd2700cc assets/refinedstorage/models/item/black_network_receiver.json -9943d8b2a5f6bf23579ce12105423cbe2d0daf1f assets/refinedstorage/models/item/black_network_transmitter.json -4b0493aef9b1709c4b3033090169c158ca3295d4 assets/refinedstorage/models/item/black_pattern_grid.json -2c39c3a63ad18dc1543659491b4f41a6306482ae assets/refinedstorage/models/item/black_relay.json -1ee068bffced3441417d2900bbb24ceb93dcc7a6 assets/refinedstorage/models/item/black_security_manager.json -26521cfb53a684c7e032755148b630071644635e assets/refinedstorage/models/item/black_wireless_transmitter.json -65827c8b46077c25d01fdb296690791e3fbb5baf assets/refinedstorage/models/item/blue_controller.json -ed0fe24ef56df72c938ff0bc69da856217bb6f77 assets/refinedstorage/models/item/blue_crafter.json -7e49c2b54631198a32c7fd8989361935fd46be29 assets/refinedstorage/models/item/blue_crafter_manager.json -ed101d42e7db4dc13a10b5ec6294c13455c931fd assets/refinedstorage/models/item/blue_crafting_grid.json -3c7a70f474f90125c33269fb39d4ea2901e6f303 assets/refinedstorage/models/item/blue_crafting_monitor.json -65827c8b46077c25d01fdb296690791e3fbb5baf assets/refinedstorage/models/item/blue_creative_controller.json -799011f5ef639cd261c20720581e49702fd314bf assets/refinedstorage/models/item/blue_detector.json -2a5ef6b28189d1188b7271bc80d62b3b45a21b37 assets/refinedstorage/models/item/blue_disk_manipulator.json -97e7d170f9c2d929eac8508c092a19dcef71f467 assets/refinedstorage/models/item/blue_fluid_grid.json -bb913aff3ffbd7393410ce419fd0ce63f385c067 assets/refinedstorage/models/item/blue_grid.json -17a973e2807b73bdd1e883441f2e6eb07303933f assets/refinedstorage/models/item/blue_network_receiver.json -dc16188809caeb104c09a2e7986e50623d32e73d assets/refinedstorage/models/item/blue_network_transmitter.json -1cc58c8d59665c22c86f61f9aaf6d9ec01527040 assets/refinedstorage/models/item/blue_pattern_grid.json -172af74e9719d30be5e55dc35b4b1138cd61e9ab assets/refinedstorage/models/item/blue_relay.json -35cb2725dee9921cd1e43c68ccc80eb769c9696f assets/refinedstorage/models/item/blue_security_manager.json -81cfc6abe1659a24c4c8466ef160575d1bbd8a7e assets/refinedstorage/models/item/blue_wireless_transmitter.json -de889e15569d28972fa67f3a2c06430b51b55992 assets/refinedstorage/models/item/brown_controller.json -3a4fd70390bcd360ec5de634d60ff0a5282e5f00 assets/refinedstorage/models/item/brown_crafter.json -2d909666d77bde650551737137c886f391a05d5c assets/refinedstorage/models/item/brown_crafter_manager.json -83b85f61616b8974ece49d45a8470ef85de48250 assets/refinedstorage/models/item/brown_crafting_grid.json -47e7729e5cf37584c2e6bb9381007401633b793a assets/refinedstorage/models/item/brown_crafting_monitor.json -de889e15569d28972fa67f3a2c06430b51b55992 assets/refinedstorage/models/item/brown_creative_controller.json -8db311cc323bec569d486b0af2fcaa487f11d89e assets/refinedstorage/models/item/brown_detector.json -708a7b3c35fcde4bdcef88ef95182a689e0fc523 assets/refinedstorage/models/item/brown_disk_manipulator.json -76c99ca40c2510cf58f6f180fea0af8c4e48e97a assets/refinedstorage/models/item/brown_fluid_grid.json -89eeeb70a6d4fc357a913e9480894e7fdac27998 assets/refinedstorage/models/item/brown_grid.json -9c23eb5feca157fff98d0c27644d8163aee9c3a3 assets/refinedstorage/models/item/brown_network_receiver.json -7d429cb87814578e51deb81148d8ea9b84d3205c assets/refinedstorage/models/item/brown_network_transmitter.json -057b8ea627a3374ef1c51ecbe727c712453af474 assets/refinedstorage/models/item/brown_pattern_grid.json -6f7673c1f21365919e87a7caf037f7f1d2aa17b7 assets/refinedstorage/models/item/brown_relay.json -73f27b160c2d927a3ac43ff69bc3c6908ed22df7 assets/refinedstorage/models/item/brown_security_manager.json -3acc740a9388db4efc0e8502caadd1d9fc693dfe assets/refinedstorage/models/item/brown_wireless_transmitter.json -d6d1dcaaa02a6a38633cec36ec941fa500e508f7 assets/refinedstorage/models/item/controller.json -cc7cd2f2ca30e938575a06874dc902b587ba6944 assets/refinedstorage/models/item/crafter.json -b8ed24fab0ff6b8ede7064d5916daca75371e6a7 assets/refinedstorage/models/item/crafter_manager.json -82444660e50ff8d64a3785bad05bbc51bd0e490d assets/refinedstorage/models/item/crafting_grid.json -cbdc20941304a5013dbf7e3f3ab3e41937f826be assets/refinedstorage/models/item/crafting_monitor.json -d6d1dcaaa02a6a38633cec36ec941fa500e508f7 assets/refinedstorage/models/item/creative_controller.json -3287757abaa8b47bc30f9143376ecdb5757b1b50 assets/refinedstorage/models/item/cyan_controller.json -6c65a4cbd051a4e498d469937ab4082d23710fbf assets/refinedstorage/models/item/cyan_crafter.json -b962329fd1cc11fa881825ca130df9bbc95b7dcf assets/refinedstorage/models/item/cyan_crafter_manager.json -08d7eb9cb55045f30340bc9db698d11831e41d0c assets/refinedstorage/models/item/cyan_crafting_grid.json -fa605acc7eb747428ef59ff50dd79e752e4ded2f assets/refinedstorage/models/item/cyan_crafting_monitor.json -3287757abaa8b47bc30f9143376ecdb5757b1b50 assets/refinedstorage/models/item/cyan_creative_controller.json -7285b79046ea533f79b7df714cfc7734635c0342 assets/refinedstorage/models/item/cyan_detector.json -66802423474c81e43616acca8927122ac1707079 assets/refinedstorage/models/item/cyan_disk_manipulator.json -3183d2646b031de64bc4dac426b0cc20b065348e assets/refinedstorage/models/item/cyan_fluid_grid.json -ff970fd31037004114e76145cb55d76e850992b9 assets/refinedstorage/models/item/cyan_grid.json -c8122896b6f02ffc7d544beea034db4c5be7a91a assets/refinedstorage/models/item/cyan_network_receiver.json -aafb4796b78fa4b3aeddd4b1e6d484efd7e3759f assets/refinedstorage/models/item/cyan_network_transmitter.json -0984c2f579ee7ca0e714ca405ec4c94047bf83da assets/refinedstorage/models/item/cyan_pattern_grid.json -6e2d03d32cafca654ed892529ce0af95552eb10e assets/refinedstorage/models/item/cyan_relay.json -dfac1b217cb8c6daf20cef6338aa7a233d9b37ca assets/refinedstorage/models/item/cyan_security_manager.json -1239f922733285cab0219b7cdb1ddad2036d9027 assets/refinedstorage/models/item/cyan_wireless_transmitter.json -4d45865292945afea66cf022d1ac1d3cab0c9a07 assets/refinedstorage/models/item/detector.json -c508712d50c39587db6a907a95544c6175dc6b79 assets/refinedstorage/models/item/disk_manipulator.json -81e4c7d782ac04c0a97e3780f1d529b894a3af0a assets/refinedstorage/models/item/fluid_grid.json -c831e135c9af13417018761fd27d5e57d3060ed1 assets/refinedstorage/models/item/gray_controller.json -462da17dae819e326489f68e90e9a17f7f56736c assets/refinedstorage/models/item/gray_crafter.json -12262eed16cf234a72b1637bb28678064955310d assets/refinedstorage/models/item/gray_crafter_manager.json -620ae6fc558b5d030dd0c93db6f18a712e90a6b8 assets/refinedstorage/models/item/gray_crafting_grid.json -90c6362082a3a904b0287b7f2288815d6b21d627 assets/refinedstorage/models/item/gray_crafting_monitor.json -c831e135c9af13417018761fd27d5e57d3060ed1 assets/refinedstorage/models/item/gray_creative_controller.json -9a64ece660e197f8d3aa339eca3bf2bd498c9e39 assets/refinedstorage/models/item/gray_detector.json -69c4f96e02883365b4a40170e7c3ade3b6ca6f71 assets/refinedstorage/models/item/gray_disk_manipulator.json -a244ef8a2de5bda95d5bf88241c45bda3d8ebe98 assets/refinedstorage/models/item/gray_fluid_grid.json -d5fac836d86c45a665a46cb5c15cf09789bafe85 assets/refinedstorage/models/item/gray_grid.json -53518d703a27be61fb0589b685e7fc9ff2dbc6ba assets/refinedstorage/models/item/gray_network_receiver.json -eee4f605e559288a6419159f8b2ee560ba62f1b9 assets/refinedstorage/models/item/gray_network_transmitter.json -bcfbb616a3a11236f6bb04fd83a33673ee2edac3 assets/refinedstorage/models/item/gray_pattern_grid.json -fedcf7fa3db9424ce9f00f5150b8663cd9c3825c assets/refinedstorage/models/item/gray_relay.json -f7f08bdb218665db50e6f4e4718a5f8fe2a3a942 assets/refinedstorage/models/item/gray_security_manager.json -8ac3370787e5367e943057ed41ee3fc83b46d2fb assets/refinedstorage/models/item/gray_wireless_transmitter.json -012c6d1f371b929684ab34cb4d53bc3277ba4e27 assets/refinedstorage/models/item/green_controller.json -066697bdb202ba8fb9492c99e2badcefabb62b3d assets/refinedstorage/models/item/green_crafter.json -abfff724c18a45f6a7ef36d1265d5544bf569ed1 assets/refinedstorage/models/item/green_crafter_manager.json -7aab7f86eb7bd6a129ae20bd07f3801f88053814 assets/refinedstorage/models/item/green_crafting_grid.json -aba0714b4d7c1bac5d02efbe649293666c7c938e assets/refinedstorage/models/item/green_crafting_monitor.json -012c6d1f371b929684ab34cb4d53bc3277ba4e27 assets/refinedstorage/models/item/green_creative_controller.json -1037818fcb6c01bcf8b419e73ec03b1af330ec89 assets/refinedstorage/models/item/green_detector.json -6594c63d73c19908f9b9d65d0b5ce7afee68e5ad assets/refinedstorage/models/item/green_disk_manipulator.json -936d237359f2542c7acb5aa4a3014ddf1f233b06 assets/refinedstorage/models/item/green_fluid_grid.json -d3ef71caf1ee5e25cec83891fd2c8ed6c8b679ab assets/refinedstorage/models/item/green_grid.json -84abfbaa8d262c614c9bc6ecde79dd3b086c4afc assets/refinedstorage/models/item/green_network_receiver.json -2e16f732c28126fecc084dbf4251fa4a794030a3 assets/refinedstorage/models/item/green_network_transmitter.json -2df3ce05ac6ddee6cfdd0f9d53b06fa58f0e77a2 assets/refinedstorage/models/item/green_pattern_grid.json -aa8018246994f058201c0f92688f69c75f7bd664 assets/refinedstorage/models/item/green_relay.json -e4d504c7f8e89a9e8811fa52e6c12ad5c3284187 assets/refinedstorage/models/item/green_security_manager.json -6e0574dfadd30ac750a7a6da8c53f121a83a3e5e assets/refinedstorage/models/item/green_wireless_transmitter.json -442d76af7e86c432072b1f3732f65323311c317d assets/refinedstorage/models/item/grid.json -066d2f8c4f698831e0b4e6ae5a90e779af28351c assets/refinedstorage/models/item/light_gray_controller.json -83a4514978b1090ebbdac7e183e68420f23ff31e assets/refinedstorage/models/item/light_gray_crafter.json -683aad65b497964376e9753ba207b0a31afebfcd assets/refinedstorage/models/item/light_gray_crafter_manager.json -577432119478cf32b67c9523dfeafd371380e8da assets/refinedstorage/models/item/light_gray_crafting_grid.json -f7068fc3fba476a132606fd2bdfb41b38761f4d6 assets/refinedstorage/models/item/light_gray_crafting_monitor.json -066d2f8c4f698831e0b4e6ae5a90e779af28351c assets/refinedstorage/models/item/light_gray_creative_controller.json -769228d0f126d332662a35bfffe5db0fae0b9ca4 assets/refinedstorage/models/item/light_gray_detector.json -5e1b7f368bc60b212384a416cbd3c03cffa88f8f assets/refinedstorage/models/item/light_gray_disk_manipulator.json -e6d00aa106479f37169f0ab5583bdea8b9267663 assets/refinedstorage/models/item/light_gray_fluid_grid.json -07ef7d2368e89ea3aebc8f7035b246db14fcce1b assets/refinedstorage/models/item/light_gray_grid.json -f651580c87fba11d2ada2065e9319cd7de857655 assets/refinedstorage/models/item/light_gray_network_receiver.json -0bd26d71d794f8a0ee8fad6ad76a22300232215f assets/refinedstorage/models/item/light_gray_network_transmitter.json -e6a80c4b5d4b15e437344ef8ab7531ff57766be6 assets/refinedstorage/models/item/light_gray_pattern_grid.json -fe3b7b4229704d3eada53c5566676706ea819c9f assets/refinedstorage/models/item/light_gray_relay.json -0f2d6075bb5962b34fba93c1cba7ea1509432c53 assets/refinedstorage/models/item/light_gray_security_manager.json -7ea098970fd422c9f449f3308fac54b45ed9f4cf assets/refinedstorage/models/item/light_gray_wireless_transmitter.json -b4dfe0e9bb2e6932a15b54f197a34e8b9bb81304 assets/refinedstorage/models/item/lime_controller.json -4a45f71b5b555ac77e116f0f793b9b077e579d68 assets/refinedstorage/models/item/lime_crafter.json -e02f21fadddf25897be7beda863b505aed9b3b44 assets/refinedstorage/models/item/lime_crafter_manager.json -acf4bbd2b713d9ae6ba00745e8fe00d9f70eda8f assets/refinedstorage/models/item/lime_crafting_grid.json -ec47f16ebc68412803788dfde504bde5c26a74cf assets/refinedstorage/models/item/lime_crafting_monitor.json -b4dfe0e9bb2e6932a15b54f197a34e8b9bb81304 assets/refinedstorage/models/item/lime_creative_controller.json -d4662095f9f81abf7e16eaed56639bd1949c16dd assets/refinedstorage/models/item/lime_detector.json -742bcd23892b283dbafb73487c2d878bad73cab9 assets/refinedstorage/models/item/lime_disk_manipulator.json -85473cba799692d546db28a18292b11bb84eab8a assets/refinedstorage/models/item/lime_fluid_grid.json -ad19fee1ead6eedf8b3ed8079d2d7b16cfb080f7 assets/refinedstorage/models/item/lime_grid.json -9f21913c92562909b5160b7d22b9d8524f7544bf assets/refinedstorage/models/item/lime_network_receiver.json -ce8ed24213d4084348e16c269edc36a9ee1d9f03 assets/refinedstorage/models/item/lime_network_transmitter.json -d6100e224e584b7cdbaf7d472354f52e33ee276a assets/refinedstorage/models/item/lime_pattern_grid.json -a2a3b1bdfc3c53dd0d2c5eb84ef1f815b3eb0a9f assets/refinedstorage/models/item/lime_relay.json -728f2e65fb36fde601701e30a50447a95d434f35 assets/refinedstorage/models/item/lime_security_manager.json -d55ebe64a6b4021be856b28d9b8b2787cd9462b7 assets/refinedstorage/models/item/lime_wireless_transmitter.json -e3f29e519de049adc4597559e0f2a1bd862eeb9a assets/refinedstorage/models/item/magenta_controller.json -9c8ea6bc3d365dedc2e63198b10019f75df04df9 assets/refinedstorage/models/item/magenta_crafter.json -4beb1b1cb55352b2cd1402c76f5bb2700b7e2160 assets/refinedstorage/models/item/magenta_crafter_manager.json -7a8870298fd5fee3bc99f5627263a4480f217783 assets/refinedstorage/models/item/magenta_crafting_grid.json -16b4ade1ed1e6e84ac8fd92937d4c9cb28e135f7 assets/refinedstorage/models/item/magenta_crafting_monitor.json -e3f29e519de049adc4597559e0f2a1bd862eeb9a assets/refinedstorage/models/item/magenta_creative_controller.json -b7f5dc7462dc24afe10a273e2cffce8614300702 assets/refinedstorage/models/item/magenta_detector.json -8e4989aa1f4f7164fc921291fff11393caafd9df assets/refinedstorage/models/item/magenta_disk_manipulator.json -559d358e09751c30faaeeb69e0f84d9d5211535c assets/refinedstorage/models/item/magenta_fluid_grid.json -1dd9e117238ecdfab3045b6939849ec9bddc183d assets/refinedstorage/models/item/magenta_grid.json -0051ecf9431262768fc909e329cf80e782164c52 assets/refinedstorage/models/item/magenta_network_receiver.json -72d4aade27ac3d823dda62afa6ff7c5a171d0a89 assets/refinedstorage/models/item/magenta_network_transmitter.json -08e88d5540ed5a9e8f9b329efa892724159c091c assets/refinedstorage/models/item/magenta_pattern_grid.json -858a3b08525a2abf984c76f5263277edb1530d0d assets/refinedstorage/models/item/magenta_relay.json -bdf0824154c4eb21b22730f90aaa3f5fa33a768c assets/refinedstorage/models/item/magenta_security_manager.json -b55f0dc607edd76ebd5761b7769412ef58f21960 assets/refinedstorage/models/item/magenta_wireless_transmitter.json -c56ed7de4a1bd8d05604978acec4917dcc4d632a assets/refinedstorage/models/item/network_receiver.json -5d4fe75e09824f4e9cfdf25d6366057b8af454d5 assets/refinedstorage/models/item/network_transmitter.json -9d0bada0990d47cbdf68a251d4c263c81b528d85 assets/refinedstorage/models/item/orange_controller.json -b1129150ce0595bef4476f7c71db792a483959a8 assets/refinedstorage/models/item/orange_crafter.json -ab02fd716fa12a5ab172d4d4d0acb01153e40cb6 assets/refinedstorage/models/item/orange_crafter_manager.json -414bd924113779dbc1d2c7cb691da17480a54db4 assets/refinedstorage/models/item/orange_crafting_grid.json -7683ee75296cf38f4788e99558698fb25a2b864d assets/refinedstorage/models/item/orange_crafting_monitor.json -9d0bada0990d47cbdf68a251d4c263c81b528d85 assets/refinedstorage/models/item/orange_creative_controller.json -fc093c568b669e4947be9f0898cd893a9c4cbb94 assets/refinedstorage/models/item/orange_detector.json -4270f36f49161525f8c5f665ef7d65d58ac8c0cf assets/refinedstorage/models/item/orange_disk_manipulator.json -3aff959ef4cd247a8b8189ac112d2ad2cb01411e assets/refinedstorage/models/item/orange_fluid_grid.json -b4fa2ca87da645ebed4464daece8059ba5c9f446 assets/refinedstorage/models/item/orange_grid.json -99d78bdab41a230c3193dd22a818d13fc87b29dd assets/refinedstorage/models/item/orange_network_receiver.json -8b5a8f1c77555b6dbc9a7a44c70832f8d028b82c assets/refinedstorage/models/item/orange_network_transmitter.json -ef9753d1320a2bb45ad12e139dfe5b7ab308c510 assets/refinedstorage/models/item/orange_pattern_grid.json -a898b19c642f35bd051354cb6ad9a11313c95bc9 assets/refinedstorage/models/item/orange_relay.json -4a5870697cb5569aa095d68b76f371e2d7060dad assets/refinedstorage/models/item/orange_security_manager.json -af60abc29d6248dbe02516b6c9ffa62f5849c239 assets/refinedstorage/models/item/orange_wireless_transmitter.json -8573013fb886750974a87c953ba3f2d55abcbea2 assets/refinedstorage/models/item/pattern_grid.json -c877aac9d8ce9cb3bda49093d32365b74ace758f assets/refinedstorage/models/item/pink_controller.json -035af3322310027f3d84093032953707602e6120 assets/refinedstorage/models/item/pink_crafter.json -2e8c033cbe2fed03c74444fedec740d5f87bbf68 assets/refinedstorage/models/item/pink_crafter_manager.json -3338c2c6b700a46d765f0ecda7666534efd89879 assets/refinedstorage/models/item/pink_crafting_grid.json -19e0425e0b9f2f44a5bee7d4ac1a7cbb8286ffe8 assets/refinedstorage/models/item/pink_crafting_monitor.json -c877aac9d8ce9cb3bda49093d32365b74ace758f assets/refinedstorage/models/item/pink_creative_controller.json -f0517f1201d6fc694a834de0d2bb44a80f568d65 assets/refinedstorage/models/item/pink_detector.json -3d5bcca447eb3552366c7acb73a9c87518c9126d assets/refinedstorage/models/item/pink_disk_manipulator.json -83fed0a7fa8d197f8256a36505a3187683794b88 assets/refinedstorage/models/item/pink_fluid_grid.json -f8cf2afa645b6a8418159800bb4d5b596fd970f4 assets/refinedstorage/models/item/pink_grid.json -49fdc5908366e8f92237f87587ebce111c6922ee assets/refinedstorage/models/item/pink_network_receiver.json -a0e5820b83424f85ccbed7013f5a9b4eecd8a182 assets/refinedstorage/models/item/pink_network_transmitter.json -1783454fb7283e17f1dbbcaffc1eb807ab0df5e7 assets/refinedstorage/models/item/pink_pattern_grid.json -0ef521468c4dedaf01b4ebf11143311ef85fd4dc assets/refinedstorage/models/item/pink_relay.json -759b30b0a51b1b9c76e6db586f2b13a8a2e0c1a2 assets/refinedstorage/models/item/pink_security_manager.json -8f9e496cb9f200e59e13b1dddfdd8631e8a93024 assets/refinedstorage/models/item/pink_wireless_transmitter.json -36dcd7893bb51133752bd4325c71d4f6b9b8df02 assets/refinedstorage/models/item/purple_controller.json -688a6a75281274dd4d749c1cf6b507b2468f6956 assets/refinedstorage/models/item/purple_crafter.json -63d52514733163efeb3218ef6c7bcb14e6bc9c74 assets/refinedstorage/models/item/purple_crafter_manager.json -f87daae787ca4e152fb59841b74879de188d63bd assets/refinedstorage/models/item/purple_crafting_grid.json -516e4015a438eb7bf33c7770d75117f39482f038 assets/refinedstorage/models/item/purple_crafting_monitor.json -36dcd7893bb51133752bd4325c71d4f6b9b8df02 assets/refinedstorage/models/item/purple_creative_controller.json -a19b0d8be857ec367617c812dd2e446259cfc68f assets/refinedstorage/models/item/purple_detector.json -09bccb73250482144c0852eb62ae8d29e13a1ee2 assets/refinedstorage/models/item/purple_disk_manipulator.json -14ce9561e8f36f77bfb6e5a4259957782f4804bd assets/refinedstorage/models/item/purple_fluid_grid.json -42ccde3eb1a69e3941f4dd05dcc253715c98e29e assets/refinedstorage/models/item/purple_grid.json -ac62fef4e4af875ea2df37f0b01badc001f1ec98 assets/refinedstorage/models/item/purple_network_receiver.json -e457290af1371e2aeaf57090739576b86c26258f assets/refinedstorage/models/item/purple_network_transmitter.json -8bfbdc4d38106f09abae6582f838ebcbecfa2b56 assets/refinedstorage/models/item/purple_pattern_grid.json -89f06d027a36ec0946707b0a31698c7f7a3c9759 assets/refinedstorage/models/item/purple_relay.json -8203fafb634539de26b5bbe973453d11c15c115b assets/refinedstorage/models/item/purple_security_manager.json -b71fc708ee83a4579d907689e27a24d42d9f4060 assets/refinedstorage/models/item/purple_wireless_transmitter.json -dcbd73b02d053818c104e66b1208ed53b3a7686c assets/refinedstorage/models/item/red_controller.json -27fee601046e1cc016c3631d81f2cf2ea102946f assets/refinedstorage/models/item/red_crafter.json -e4bb8348f0c51ca4597ad7f4788c83979c09ab60 assets/refinedstorage/models/item/red_crafter_manager.json -6409eeee7b9a1a79c0fb814d27fd1ec63ccbac3d assets/refinedstorage/models/item/red_crafting_grid.json -6ca08ea51715d90e44f5e1ea4cda73634d9f5a5d assets/refinedstorage/models/item/red_crafting_monitor.json -dcbd73b02d053818c104e66b1208ed53b3a7686c assets/refinedstorage/models/item/red_creative_controller.json -584ed3b115b825c9329dbe5e5ebda089d8f2da90 assets/refinedstorage/models/item/red_detector.json -2724d457be17995a195e1781744eb692fe25772b assets/refinedstorage/models/item/red_disk_manipulator.json -e39a37ddda37cc3df5d57bb629acbbe42ba74858 assets/refinedstorage/models/item/red_fluid_grid.json -acd3d0758201b5b25ba68fa0256acd9ee63c3afd assets/refinedstorage/models/item/red_grid.json -dcff259c5b67ddbfc35d54efee1d5b8be072bad0 assets/refinedstorage/models/item/red_network_receiver.json -b211d05bcf14725ceea6a3de83f12b108e9a3022 assets/refinedstorage/models/item/red_network_transmitter.json -b0b37542ff3f37f9058c92cd464ddc2574c957e1 assets/refinedstorage/models/item/red_pattern_grid.json -f9056d136cc126e29ab9e77c6f60c703a32963d4 assets/refinedstorage/models/item/red_relay.json -3e02b7ecec037fdfefe3885dd140740045b3cc17 assets/refinedstorage/models/item/red_security_manager.json -43cc3c10af6c0a6b3e999b02f05499a42d4fe111 assets/refinedstorage/models/item/red_wireless_transmitter.json -84a76d7ec305b877d838879ee98fa54b88ed48dd assets/refinedstorage/models/item/relay.json -9c89d9cedf0131e168dd321493dc7f3e2e691687 assets/refinedstorage/models/item/security_manager.json -72ab9720216296c9b74e0246168a67a02c377203 assets/refinedstorage/models/item/white_controller.json -d9046e92189d96daad4cb07a1e827c3cb1c5f819 assets/refinedstorage/models/item/white_crafter.json -6db144c2689e6187926a2468e782c7b3b5af46d7 assets/refinedstorage/models/item/white_crafter_manager.json -1e46e226a5638d2081143c4a1010ddd3738f206f assets/refinedstorage/models/item/white_crafting_grid.json -a856b99d7a2181b41ae7d5433d565ce707667523 assets/refinedstorage/models/item/white_crafting_monitor.json -72ab9720216296c9b74e0246168a67a02c377203 assets/refinedstorage/models/item/white_creative_controller.json -171ce25111d780b149d3ebf97d9776b130749932 assets/refinedstorage/models/item/white_detector.json -a14480387b18c30fc481c7cf4702318c3d2e3a8d assets/refinedstorage/models/item/white_disk_manipulator.json -fe374113d04ae8eff64bc74690aa78150e287452 assets/refinedstorage/models/item/white_fluid_grid.json -15cee7e453f21fec74535982fc5178755b62a2f3 assets/refinedstorage/models/item/white_grid.json -f6525c3c8df02eec9ce338fefb88634a67dc2284 assets/refinedstorage/models/item/white_network_receiver.json -23261897e6e7f5a0400eb8ca86b53810fecb4951 assets/refinedstorage/models/item/white_network_transmitter.json -ec591a3b283dcc5b19576a53c53b6993c5051a5f assets/refinedstorage/models/item/white_pattern_grid.json -3c78e8cf98d43b1e80baa75fea4b74db77b5ad2a assets/refinedstorage/models/item/white_relay.json -1cea8d05f69c6b354c334b9e8ecc3e8b5b403460 assets/refinedstorage/models/item/white_security_manager.json -a7068f5ed2ded5e10cdb88824bc1f6e13d803363 assets/refinedstorage/models/item/white_wireless_transmitter.json -9bae206128836710141523ea2bfbb09e7b8797f0 assets/refinedstorage/models/item/wireless_transmitter.json -5c2f0027ad16567b8392cc4ee40c5dd1daa3e881 assets/refinedstorage/models/item/yellow_controller.json -fbf74bd1fcda74c6694ae5cb9deeb443d94f6501 assets/refinedstorage/models/item/yellow_crafter.json -cfab6ce6e24fac3055064bb8e2448d7573bb4dec assets/refinedstorage/models/item/yellow_crafter_manager.json -df51a3935c6910452bb41f5b9014afe914299f85 assets/refinedstorage/models/item/yellow_crafting_grid.json -427afcbd2dbe5bf2a669d0d9a174a5543de6d445 assets/refinedstorage/models/item/yellow_crafting_monitor.json -5c2f0027ad16567b8392cc4ee40c5dd1daa3e881 assets/refinedstorage/models/item/yellow_creative_controller.json -592e166977e88d6eb020047fc49c9254dcde979b assets/refinedstorage/models/item/yellow_detector.json -ed75e8296ffce068758fb7659b2d59e04cca4cbc assets/refinedstorage/models/item/yellow_disk_manipulator.json -bbae585b79552836f291bd7a254bb5311362b717 assets/refinedstorage/models/item/yellow_fluid_grid.json -64f585cfceff9d495e3e7436ff437d538b7256ac assets/refinedstorage/models/item/yellow_grid.json -45605203b9af09bede7565e755478686a3f99b8f assets/refinedstorage/models/item/yellow_network_receiver.json -5a6d87e4f5da945e2a81570be0af2e50e1a48178 assets/refinedstorage/models/item/yellow_network_transmitter.json -55682ddcfb061c2a0b5d002f0dd3aa5ccfaf9ed7 assets/refinedstorage/models/item/yellow_pattern_grid.json -8bf5c07f71be511207cb3338cd9ab569f23d89d6 assets/refinedstorage/models/item/yellow_relay.json -031da071bd54f6bbd6bd726ae8e54dcb31d93dd7 assets/refinedstorage/models/item/yellow_security_manager.json -8cd04b5fd0ef2456369a59326d87b5067a6b7cf5 assets/refinedstorage/models/item/yellow_wireless_transmitter.json -346cf6402101b92a94df091df36ea44fb526776e data/forge/tags/blocks/relocation_not_supported.json -072517fbb36937374da062823ff793db732cee6c data/packingtape/tags/block_entity_type/blacklist/problematic.json -24e9450a858ed0e2268fee8f5d37a168f92e73bc data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_controller.json -0e90c4471c953dbb46ae3f87b713f107a4b5c6ed data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter.json -6645b1e1c826d9147b0c81d3169ab0e8e1ef6ef2 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter_manager.json -433ef544e9ade2e51f3076c644f2079fd22b6bda data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_grid.json -a3ecdc0bb46c63d2a8448c4132c1884b2e29a731 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_monitor.json -6ec28c447bbf56c76187f31c005ba2b9041cb233 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_detector.json -30c0c41526f981ec4b9c3e067103d54910391f45 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_disk_manipulator.json -b06920ed64e7ec11dbb98aa311fcbf295328d82a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_fluid_grid.json -0375d9450af058bcea85066e31eae76d5a7b646b data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_grid.json -4f3e7b4907f78147cd36db6abafdecd53dcd346a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_receiver.json -61304cf00dd0f8d886cc908f0be6302e4303ca6f data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_transmitter.json -5a1eeb13697d332060ab10f89fe232d0d0675c02 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_pattern_grid.json -5d87ce76beff901503763d3b7bfd3e64480ce2a8 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_relay.json -ea20a1173c64cbc5ee43610d0be1f4245e3db729 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_security_manager.json -1e19a45c58fab3cd3b2a3a415d1ee3ab86fea6f3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_wireless_transmitter.json -b6e744c8a0826f0ea3de109522dd55a51765ff22 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_controller.json -df36e0ebab9e1f4fdd53913b6f2842d3702dd6ac data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter.json -9d52991033cc045b9baedcc4dfcf31a99de55fb8 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter_manager.json -51175b3e7ac1ce2764d4ce7022ec7cb1dc133f26 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_grid.json -c5e7c593683bfbd763b636fb3def6dec69bc47fc data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_monitor.json -44e931d9e72a6a9ac3395e118b03042e83a63b5e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_detector.json -0c8e40d7b9225fcb4c716b4787029ef5540a727a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_disk_manipulator.json -8a7934595a50864f8e8776768524b73c4a84e7af data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_fluid_grid.json -b1bdf1c36cc65f268e1404acaeaf08256f786b4c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_grid.json -66f98bb0b1ce44a4b99d5f41dbb6bff5df0465ab data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_receiver.json -fff26694d777c743f879c4d693ce433621d8d964 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_transmitter.json -a068c03b73355a1eca32d87877cd24051bc37334 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_pattern_grid.json -e3f41245f27f1908818dc8cbdaaafe7f12ac0eb1 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_relay.json -272b4df0ab2f1a9da6dd6b13a746dacef24b1a89 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_security_manager.json -b17c638a0afaeb4098047cb63a9fa1e0e7695f07 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_wireless_transmitter.json -feb6034d9cec979347f2449ce1d9a692e7fe30af data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_controller.json -15b44c7f2a53544019bee7b0d74d20ac4849d73e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter.json -c67672faec93f06204f368581eac8a15c6d2ca23 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter_manager.json -3c67d75e260360fff1eca1776af6524727438754 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_grid.json -48215cad34892b4670d0fa04c35eb40f242d7d9f data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_monitor.json -61fbfa69175a8ef6f9bd90e7b95e01ccf489eb03 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_detector.json -17728aff5155886ea48acde29e9070e3bd4ae15c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_disk_manipulator.json -2f0329ac408c66ba60820e5c57bdca44e4b0d53c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_fluid_grid.json -39b08a9ee75a6e0215252804d71a3b7b1c2c30dd data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_grid.json -f7ab07c423b82dc432b941ec355e8da9b199fa3a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_receiver.json -f4c6b5c30f43d9e9a3a68066927ac87085a71cba data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_transmitter.json -4d1d93f911017ccb2cb6eebd5b14ef9290f55872 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_pattern_grid.json -408b9e039a1b989bc219c9840ef9a740beffb449 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_relay.json -bba1f35c327b0403f1d3280ac867febc44026268 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_security_manager.json -3e595f8599c8e5d315a82bb496ba0e1e6d04cce3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_wireless_transmitter.json -cde81f50b9ef1d08dd433aa5eaa75f1448cb7527 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/controller.json -375e4a1635ad200ad21f225c5e6a09a32bd13ec5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter.json -6861cd6351b4f2404f125f6baa0237baf2db3467 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter_manager.json -8994ab5c7a457e72275b67cacaab5f4b9b565a81 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_grid.json -e4dbcff36bea5dfc106de5db741ceb35e63f9a0a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_monitor.json -43d4a598aa95c5102e1a280c9a87ac512ac080c9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_controller.json -7d900862c94b52410e883411f3734ec92b5e0ccb data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter.json -b446e903841b22e6e25a839762b8731d2eb70c69 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter_manager.json -605a0b4cb1ea11bf8f8dbb40caabc391b62d29aa data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_grid.json -bbb8cacb484f4bef6e9a76e6526fa1e342c0dcad data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_monitor.json -a934bcd4a5b1bc0f5d19239eb3d51d92992c6e5a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_detector.json -3c147f15c731d131f6f59e7a07ec9a3c753a8ac3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_disk_manipulator.json -032108aa994691f951c8487dcfc7e86aa3f3f806 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_fluid_grid.json -9d2a7e67d0ecdb5dae4f5b31f256dcffbb9442ab data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_grid.json -04be9f9ef3d72a661a40fc77fa3d07eb9dee72a8 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_receiver.json -82e5463b40db4ada2690c976ea7f60e7f89d8628 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_transmitter.json -311925397c002d62e8ac5c8b58d4a75823da5a8d data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_pattern_grid.json -45bf502f139d629af8c28969f5bf1a94f06dfd1e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_relay.json -b3eced171f65c5eb36fa01cd9342097c677afb27 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_security_manager.json -25585da1abec1dcbf7bdd0a9854b26fa8b009749 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_wireless_transmitter.json -49bdcb3d080b9663b0bb13d2e2aee5d2644c49c0 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/detector.json -add742caa8a9e822ea1f284942ebf58258514629 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/disk_manipulator.json -a06b540f7097c602b730b7fed3eb63b9c4d0d0e1 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/fluid_grid.json -33c9abc3990484e0dba966f6887bd82d14c86ff3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_controller.json -4d380a13bbf4177ac249f4f0a2fe7d6d3b1e598c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter.json -df4cd435a163567e09725d932e9a437a83e9da36 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter_manager.json -8fc98b88a0d57de313f74d8f74ad85495a8c9371 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_grid.json -36d396d34130fdada085ff620465f7fd9bda1083 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_monitor.json -0e44b24aeb9ca5e69bdc2d55a16599eb2e58ca7a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_detector.json -cd838ba1bdcf63a3d57052764ffa1f32ca9ff35a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_disk_manipulator.json -4ba5e7df2852f7428f300366e82052a9c65b6c37 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_fluid_grid.json -42f9dc6868fbd30479243b161a0ba558a1a7d9f9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_grid.json -a52ff8d387de3f1f5c90bb66197646874ba03872 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_receiver.json -9ef680df0145e8b9b1484be613ad1e23edd37874 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_transmitter.json -5993745cad5d0f8221ce35f92c4368e9d834a2f4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_pattern_grid.json -c51690bbb99e9994027084f24376e38226135f44 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_relay.json -5b7536bd4317bec067dc8d350bf62a3a79bb8dca data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_security_manager.json -e206e9d771155390b22f16eb31baef0f77004d17 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_wireless_transmitter.json -99611a3baca1a79f01201d65a5ba6f856a29cfd4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_controller.json -ec90e1a6f02c9393d846730b5ae1da2515946750 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter.json -a0e51b0f0f34e8db2a08d84c41f3c37745276db2 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter_manager.json -4b86431a55377738f6c0db748463a0b6fdf3e6d7 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_grid.json -1b64dd6f8145a0e21bd0afbed66c8dc96da2f3a3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_monitor.json -0fdfb3438e508e200c4c5aabd0a95d54b4a15c82 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_detector.json -72388b627c5a53f7b05b1761565666003d597938 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_disk_manipulator.json -84b4606f63119e4eafca60459d116d8fad3882df data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_fluid_grid.json -45bd70c3aa834cc8f1dc08756c8aca86c4b72d84 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_grid.json -d8733805c8815ce5115fc05b6db1fe312e6cdc3b data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_receiver.json -fe7d94d3788f036ea5b704e974ec3f20277b9a64 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_transmitter.json -50508a289942d1d715745b2c9689d1b6bb45d74d data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_pattern_grid.json -3559c4ed0c79a8908aa3cc0234dbff104a55a28c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_relay.json -d9e7bbca5fad738a90df9a0f3b8fc600d25d61dc data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_security_manager.json -c571598cb7c499eda10cab0da8cb23432f0ee9d7 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_wireless_transmitter.json -2b90a22cbb2b0a309413442fc6b6396aed4246f5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/grid.json -a9ed46ebab5564deb9670e0d82708a44b8530951 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_controller.json -5065a0fd23b8914dc66abf62906556f922812e52 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter.json -a781b54b2b9a7a316b54c09dcdbfb0fee9b5f4ea data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter_manager.json -c6813733ffced73bb42f90508b9a992fe959a221 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_grid.json -d7d8ad5fd668052577960b09d89ccd2823b3e16e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_monitor.json -e7397c1ec378388dbb48a308bfd39c05e004871f data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_detector.json -1161805d95f922d2857bae4775630bdd0e52626c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_disk_manipulator.json -ea447db3777130d9bd0086bd2d0b04670b94f6f2 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_fluid_grid.json -bca1364e1a41b0e283efac81578e9d09b777b120 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_grid.json -a951772a5dca914a856b6eb255cb7c56fb960cc8 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_receiver.json -9a1ff9f6ed55f73bdffb1f4cd858f416dc57a973 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_transmitter.json -59edf22b10c9c632182066eaa0261aa74fd72388 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_pattern_grid.json -c3c1e1577e65ac2ac98809864f6795856bcde712 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_relay.json -04c650280705e940fff32c9b1d33609b2210430a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_security_manager.json -a01388e6a8e1927baff6c39e0c2e62f296c20965 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_wireless_transmitter.json -5dc1015ec5090f55cb26b9b0652f9851c6f55744 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_controller.json -89fc7b33aba7bf6adf539d29b64e62ce93c9d41a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter.json -118b6512ba022d8926bf69e99b417c7255fe60a6 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter_manager.json -30d067cd2ee7710da5e3e1238a50ddb34f48c6e5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_grid.json -f2ec1d955d6c9f6802cecb28cb158ed68c0314c4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_monitor.json -1c5eeea0c016600e9e4e4ea4bfad8b34cc7e262c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_detector.json -c4211a3f86098870f5feba67ff6c702846839b99 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_disk_manipulator.json -2c335b6158be5d4d3290925064512cc285349c21 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_fluid_grid.json -b0d4bf8ec0773719b28e7c89d02bcbb76ba41f9f data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_grid.json -42af332f25ae2ee650bfce72fd14b13067ab2611 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_receiver.json -87b4fb1aa63470768086c9b05154da02a7880a28 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_transmitter.json -b31ebc5fc58a48808e2ca3e67e364c56dbd14bf4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_pattern_grid.json -1916c8c02788f60ce8f796b088de034e6e91c0f4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_relay.json -e283898e85ff23623f9356e42cf7afb7658b7639 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_security_manager.json -c0a7cee4df408091a4f72216ed8ee4b437344c23 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_wireless_transmitter.json -7e54f1a750cecb54c14968e4dda67d4ef5878428 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_controller.json -0413917f805877b182ccb673cbb4bf491240c370 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter.json -6ed7a8cebba5781dab5f4b6f625a72e422cfd263 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter_manager.json -e7343ef29234c529eb47462568223a1ce10c8297 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_grid.json -8d4d336bd90cfe1c368f60c0623719f0d46df10e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_monitor.json -2960b76a675b68c01bd56a5c4991ff3ee0d50101 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_detector.json -a88793cac25abb28416b6cd0b34ef5f899df8cac data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_disk_manipulator.json -4da0d5157c6f51a8054e974bd7752010ceadbdf4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_fluid_grid.json -89c7a2e55ed6bd03240aeff8c6e3994c6cd86706 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_grid.json -1954fd12995ff5639ce0768e984b898518ca8c0e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_receiver.json -1693f5b6d8ebd9e8ee50e479439cc26b53957808 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_transmitter.json -6fe419bc545067449275e54c92f4aab87301deca data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_pattern_grid.json -e87f710b6e0b920d00923150699f321ff637ffcc data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_relay.json -14c14784f9365917037544c628c66eb1664ae389 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_security_manager.json -487ad5fa3e98e98fbd2136d54b5803ec3989be03 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_wireless_transmitter.json -618ba7defa631453ae378e98cb9e7e442229dff0 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_receiver.json -e18d5fe62335e1cdec7f9ad48656bfdd2901b5e9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_transmitter.json -39265d4ffd9093e847d98a3446c19646fcda28b4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_controller.json -033dedb0fac1402852299dfd901c9b0aedf91721 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter.json -0cc5ec9d3356985c231267bf85bfba278c6b9ac2 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter_manager.json -2a77e4ec025afe9b57b3d837198d799711ab55a9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_grid.json -94c6b76c89eea50498f806bf240eb3ed1a93b566 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_monitor.json -5c7416fa6ff3d494476b060e2dafaa919eb47c55 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_detector.json -5ab1dfe73c6728c98fa9e688f473f1b567941080 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_disk_manipulator.json -d2bdce62c17fc0a835e67977f4c3de82feb779ff data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_fluid_grid.json -dc8f7d4afdfe9eb71ba3da3029212c58be6ae3d5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_grid.json -18ab2f06bf331abbdb3ee90310774a82b4713d15 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_receiver.json -9415f4b5edc4c6c884d7f26cf2fbf2e176c6ad76 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_transmitter.json -82bfc016be397fb7f05f7894414f962484ccb9f3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_pattern_grid.json -d35192a0df746b272aded0a2262440a4bdc215b9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_relay.json -536d958d0c8a4298f34e99929908e699deaf3bd3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_security_manager.json -8b0823be9c0fc1b3b0d7806ff8ec7167660fed60 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_wireless_transmitter.json -6e21a3993a91231034243fcd39be78114ac67087 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pattern_grid.json -16ea4043cd62a780cc2198893199db6015f8e867 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_controller.json -8383a1183bc1d59fc4e59d8950d5a1c464753c90 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter.json -ae6f3b242df8aad42a8e93d71dabdb5b6288a895 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter_manager.json -b539d244fb9738f93fd9b3782ea3235b618c287e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_grid.json -3e36229bf24e26ffdaca9bd545aed17f109bb651 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_monitor.json -67eb661e138dd957f9ee7b79e2c8267411bb2eaa data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_detector.json -077087c1804f3033d1fdd14955aa5d84fcb0c93b data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_disk_manipulator.json -0bb59617324bbfe5da57b7d56a38275c1937e29e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_fluid_grid.json -1d22d75fff40e744b68a0bdb38f76f5048a3f903 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_grid.json -5a2e760d9bcf9ef0d2fa08c3db511f46a20e046b data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_receiver.json -a9dc0d2d98ef3f448546d259332ce0b523a170a0 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_transmitter.json -780bbc1c3b9c2e7c445125f850dde74c59a9390d data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_pattern_grid.json -044bbea4b6000e30d3fe95feed85423ac8906c94 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_relay.json -302931eb56ac91a0c3e9b17c6e2ca9e74a4cdfbc data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_security_manager.json -0dba9b1641950761d007014463ec081685b8671d data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_wireless_transmitter.json -b0bfd694de8a0692189ec022e0828f82e43db4ca data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_controller.json -85a1e113c6870a755da5dc26837b85723910f02e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter.json -728e04cfc50599aca97377e0aef4d9f60eae650f data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter_manager.json -eb3b9916b31637336b0c7ced1d98f4a9ee420f33 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_grid.json -38004afed8e91606ca92e3113691ed19d3c1d994 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_monitor.json -6a896ed8a60592280811e64c048b7607577d36a4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_detector.json -df30ee242b8d2d95d44cd737682e40d056b044e0 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_disk_manipulator.json -c35a10cb3ee72c8485334dd88eb9469e95d356d2 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_fluid_grid.json -c64345d17b3209ff30179c69b734271f454e5615 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_grid.json -f7c9db306be48643e31a02acfafacbbf43ec9b0b data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_receiver.json -c97479266b26d55161f4eb357a5f27ed54fd8a82 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_transmitter.json -c54b6714ebc22e73ced264efc890764e7eea0f58 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_pattern_grid.json -c9b2768e7f33fcd3ec8b6d1674301e85add620a1 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_relay.json -053d57f95740442ec17719796c022f5491834628 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_security_manager.json -5ad6a19b40e2187b0ba84bb4161cd2ee7bf620d7 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_wireless_transmitter.json -54192bb0d5c9e726630ae7ae1ab817f2f3341f2c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_controller.json -baacc9851e6f85646bd3db5fc59497b27c1a9ed5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter.json -ee8b40fa5d5a14d4ddee20347277b62f7399f58a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter_manager.json -9766909542e326ced186c70c81819c331cfe01ad data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_grid.json -d1733bee98aba739f9aeefb9e04cbd956e106823 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_monitor.json -466014f8487559454b135c2c6c5bd9ad206e4e5f data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_detector.json -b219b2a9c3a004b67e54f731afd0f9eb669d0495 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_disk_manipulator.json -170aea468c873231fb074f29c7733fef8712411a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_fluid_grid.json -eb8290db94b9a451a2700b80033b12fc2afed1c3 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_grid.json -323b604164f79339f533d893e847c7deabd83bfd data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_receiver.json -17345696fb1521cedc7b739d7d8ce5a95616f6e9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_transmitter.json -eb64a9e9a67bf7c8628cb03836ff071365e2ad16 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_pattern_grid.json -0013f851f9c2a06f08f71d65a59559f56430cd30 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_relay.json -8d8f24d0dbe7f21c83b276001b99aa88707dbff5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_security_manager.json -17011bc8df4b456004dcb7e88337f9aa23efa75e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_wireless_transmitter.json -c446fdd81dd51226284500ebbdeaebe0015b6276 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/relay.json -bc41eb3d4c700701e2005ec775f6a15ccf1fa56d data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/security_manager.json -8c765467793b739faeec7a9c90f0a5d5884ee6f5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_controller.json -43221862a47c331c15833d51c3db1ffc5aa84a85 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter.json -a0abe47123b13e9a2ec1507add2a0a8098f280d1 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter_manager.json -9b773cc9a6986b28eb9e664f88b03a1e65005ec1 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_grid.json -1505c723f638032f306b0857485e17b411407588 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_monitor.json -e3e9856c84234bbe3011eaf0174477085f0f0fde data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_detector.json -f5388f6236988c6943b6aff7794ca9c318283ed9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_disk_manipulator.json -7c23afd98309c531d587e15f4bd68f541dec6fc5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_fluid_grid.json -80cd64b2b88fa3f7ab3cf3c25ea230abf6efdf71 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_grid.json -a58db596f0f09d84f3de8e8d531004835e761d5a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_receiver.json -7dadbe8a481e5023b7688f7bab3ded6fb941a673 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_transmitter.json -da9f14a2e952f1c3dfb6ce20fecc7f30a04e993f data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_pattern_grid.json -11968a2ebe1dcf7718e4a44d4d06776e76707c92 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_relay.json -1d5d25796a366a9579218b7a8a9f209ce1a1f4d5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_security_manager.json -a6de8343734fd72932faf9fdfad3ce82e328c8dd data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_wireless_transmitter.json -317aa454a94b15fe010c5a56530120d7afcdd045 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/wireless_transmitter.json -227bfdf6e12bf34fbeea1e2ac99171011bcfc5ef data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_controller.json -7175a2b98859122d180a5cf814f82acd3e6570b8 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter.json -b63c6bfe2da4c593e65e1a635577539c2e69ebe9 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter_manager.json -01d8e1292d464cd18a7daa7bd56f220d0363cd31 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_grid.json -3b4f97e3711073388de8a206133bc99a271a71bf data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_monitor.json -b0940f337b6f37dbcbbceb13d35e6a8b6660bbb4 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_detector.json -9940ef7afde82918438e1add4f6cee59229f2d11 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_disk_manipulator.json -6b731e4d93626078d307ae8966bb6f9e7f571f1a data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_fluid_grid.json -bbe56b1661a8473590ffdbd3fc8d8fe690d8b53c data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_grid.json -dab07f13228de8ca6b6be524838ba3c370234d9b data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_receiver.json -26b1423a0308020d39921676112adafae928ae91 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_transmitter.json -61499e3decbf7eac1ac93f0bcbd64e8cdd7c75d5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_pattern_grid.json -35fd3af46a0475422f1eda59b0f895f2e30250ad data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_relay.json -366c3cc2bf0eba0079a6996504f52f50778d5a1e data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_security_manager.json -da54cc9a91cef08260d3ea21593237f682b7d2d5 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_wireless_transmitter.json -793935c4bdbe84d2f1103b9a1af116d5b1721595 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/black_crafting_grid.json -f758a7021a396a20eec22b5c8ebeda6b6ec313ad data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/blue_crafting_grid.json -ba678cd5c872aa8ac46c72144e09c3d54720952b data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/brown_crafting_grid.json -d0e85beb511f8fef2cc180162800c49dcf86b009 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/crafting_grid.json -7252727e3f0378955877eb6a181b27fd5d65e8dc data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/cyan_crafting_grid.json -4a289a2b44f25a7701ce7f8157cdb5ab66e20319 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/gray_crafting_grid.json -697e3075447e16c21f82b2600323f534a9b90692 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/green_crafting_grid.json -25885fe6a9d9dfa6364df334f6a441fb25cd7e4f data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/light_gray_crafting_grid.json -54995b77876c0a61e76f513b83af8cdbe6749ed3 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/lime_crafting_grid.json -b0c44a663378e703e6dcce36625a18601fc23222 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/magenta_crafting_grid.json -48a077909a3bc8ed291ca7060fb80b92aa6319f7 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/orange_crafting_grid.json -fcefb9c5df3721a6e49c4c46f153027ba231fe4b data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/pink_crafting_grid.json -4579934aafbf63e049c2823dc0ba622623de88d6 data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/purple_crafting_grid.json -e378e754f377463ec2c62f5cd80710b9dd8b82ec data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/red_crafting_grid.json -1f19eb19d752c1de5c50e442610c03baa4366b3a data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/white_crafting_grid.json -668884f587b6e345d6b336572fe9d60591b41c4c data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/yellow_crafting_grid.json -8b11b91411adb4398273f8e9d000d3ca1b243dff data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/black_fluid_grid.json -169d57b9ab76683b30c132be72cfa22d32d75984 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/blue_fluid_grid.json -28969c1f5dc5b3d8feb1e285eadc3c9d0c25d5a9 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/brown_fluid_grid.json -0ea4d1b5c99efb58c0215da4edce014e61719dc6 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/cyan_fluid_grid.json -49ab7ff62de9b8d9e2d41cd277137c0f929b72c3 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/fluid_grid.json -ab8ce157513306913cf29cf1a9016d7cd9a75e02 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/gray_fluid_grid.json -7c2beb3619844a273bfe2f24237e4bec474befb0 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/green_fluid_grid.json -567ace5f40b34d64cafcf91eaa2b2522f4e57121 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/light_gray_fluid_grid.json -0a89a6520932576c33a27848bd5f28624df392c1 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/lime_fluid_grid.json -2e8f14c0cd04ac2d29f70cbfed518093c1cc0e8a data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/magenta_fluid_grid.json -f55bfbff7de6288526958e2955bc166fb8a00683 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/orange_fluid_grid.json -824257ea0722313f9751850a7f24b617488d6493 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/pink_fluid_grid.json -39368a8640cd9759b2505118174aa634d69fbece data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/purple_fluid_grid.json -80acbbadcc9fddc6cb84fa992204ac651944cd92 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/red_fluid_grid.json -a168b8473d93cbcb82c241b3a2d951190124665f data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/white_fluid_grid.json -bd8f30cd9b0655741d8a47ec78a5166c1907f292 data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/yellow_fluid_grid.json -b7ad74922ca02355c378ba6c8ff72afca4a2352f data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/black_pattern_grid.json -029e6dedb05f614777844bf4e92d63fca464f5d8 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/blue_pattern_grid.json -e293113f3f8043935f0bfbdbe4f322fd8c518f10 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/brown_pattern_grid.json -e772c3e454506bed7fa03a1445193fccea07e1a6 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/cyan_pattern_grid.json -a4c1f97dd080582f49f9ad05431a8b468b68e79d data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/gray_pattern_grid.json -ce4f07338e7c4414e2548d84915011f277209918 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/green_pattern_grid.json -241b49aa201ac8764d6ac278f6403a6272c48ace data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/light_gray_pattern_grid.json -2a148435308380c170aebdd8a06d9de7765fa9ad data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/lime_pattern_grid.json -1b972283ce30b4384efac735750a72465081f329 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/magenta_pattern_grid.json -c5893b68a49df1357e18a005476ef2581c8492fd data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/orange_pattern_grid.json -e8e8fd83f06960d550bf7851a80901f4a45010c2 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pattern_grid.json -b5c207db175e6243e325bbe099b346963010e316 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pink_pattern_grid.json -b8396c8be96953e3ec280784d925b2523a86026b data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/purple_pattern_grid.json -de0185a2dd4ef76299b7180e86761dad863110d0 data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/red_pattern_grid.json -4c72c65501691438ca8d33c2d3fa1c5d5c74e1ca data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/white_pattern_grid.json -c6eb5be9e74db28fb8b45444b781afa373d7c20d data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/yellow_pattern_grid.json -d937590e27166cc1af402a398e8a8892cddc0d9b data/refinedstorage/loot_tables/blocks/black_controller.json -5dc96582facf3d12d3ffe3c27ce377320a61f2f5 data/refinedstorage/loot_tables/blocks/black_crafter.json -e3ce82e78f64b52fbec1ba00f741fdb6da91fa68 data/refinedstorage/loot_tables/blocks/black_crafter_manager.json -4e0ee531362538402247cefe5f5e339e72b1c7e9 data/refinedstorage/loot_tables/blocks/black_crafting_grid.json -1affc9812e3f9f1e7f124b523da099bd6dcd8fe3 data/refinedstorage/loot_tables/blocks/black_crafting_monitor.json -742b3c61ef5acc868e480837b5cdc35bb88ca86e data/refinedstorage/loot_tables/blocks/black_creative_controller.json -2ba5650a62f451103ac156f9c6f9128581efdd58 data/refinedstorage/loot_tables/blocks/black_detector.json -0b5d61fec8a25487a82aedaa1438fc58b2c7a679 data/refinedstorage/loot_tables/blocks/black_disk_manipulator.json -98e7d1930e23cab61eeb298d265ed30b2bc87bd3 data/refinedstorage/loot_tables/blocks/black_fluid_grid.json -dde61f1ba45c5d71ad2b5f95a445a5ba9fe72c9e data/refinedstorage/loot_tables/blocks/black_grid.json -80cff90a81f086b9f35d5c3807c939fba942621b data/refinedstorage/loot_tables/blocks/black_network_receiver.json -7d0b2d4458c954c322eaa8ccadfb5bd5c7a6eb4a data/refinedstorage/loot_tables/blocks/black_network_transmitter.json -ac74d2dc5676ef84ad4812457b17e9a612009615 data/refinedstorage/loot_tables/blocks/black_pattern_grid.json -d23758d8c625946573f1d254ea9c261e676ea0b0 data/refinedstorage/loot_tables/blocks/black_relay.json -f46eaa49dde4b05230925f3aa54920d1f75b86b6 data/refinedstorage/loot_tables/blocks/black_security_manager.json -70aa010391287e4161df397df059dccb8bf8e3da data/refinedstorage/loot_tables/blocks/black_wireless_transmitter.json -b96c8892ec82db8dc9a67cda00b04b43114846e7 data/refinedstorage/loot_tables/blocks/blue_controller.json -72008c97dcda9f9e7ddb15613e3ec0993b879947 data/refinedstorage/loot_tables/blocks/blue_crafter.json -6c72ce0c8ab55162a853c3923842912c11e4e87f data/refinedstorage/loot_tables/blocks/blue_crafter_manager.json -a77e6035a6b8a1d8e169def1ca98d021c8322974 data/refinedstorage/loot_tables/blocks/blue_crafting_grid.json -def8d531faf989acdc23a1d360014402334f2a73 data/refinedstorage/loot_tables/blocks/blue_crafting_monitor.json -76fbce17049cddccca146ee5a4ff1178f7ca7360 data/refinedstorage/loot_tables/blocks/blue_creative_controller.json -81c3231bc79715261b959ce6b615c763c4e0165c data/refinedstorage/loot_tables/blocks/blue_detector.json -25ade9b40afdf449b4bfbde86a419943b2c3299a data/refinedstorage/loot_tables/blocks/blue_disk_manipulator.json -8a456b792381f07dbb52f4bca9ed2fbbb241bd9e data/refinedstorage/loot_tables/blocks/blue_fluid_grid.json -c6074928dcd562df69242884666a9f7042cec092 data/refinedstorage/loot_tables/blocks/blue_grid.json -0b15bd0533acdd1b9cbadfe1eeca4ee57ab8ae6f data/refinedstorage/loot_tables/blocks/blue_network_receiver.json -4687bc3ca3ecf763d53497a37027516bc84442a4 data/refinedstorage/loot_tables/blocks/blue_network_transmitter.json -1221a8e6b022f2738c0668b7f97f04862da45e62 data/refinedstorage/loot_tables/blocks/blue_pattern_grid.json -a49a7730828f1244639c8b7974e31855a4f895f1 data/refinedstorage/loot_tables/blocks/blue_relay.json -ab5c37acf5c52219a1e813a5d7c9444568979107 data/refinedstorage/loot_tables/blocks/blue_security_manager.json -0b6b6fcbfa069f6b87fb47e62592448afc8f9aa1 data/refinedstorage/loot_tables/blocks/blue_wireless_transmitter.json -8a0198d8db10f3872a668a0588c0b1074569deac data/refinedstorage/loot_tables/blocks/brown_controller.json -15866dbf81ab84f7f1676c1847e67361e0777fe0 data/refinedstorage/loot_tables/blocks/brown_crafter.json -2e4d2eed19d21e49fa59c0a9c74c55db3b200a44 data/refinedstorage/loot_tables/blocks/brown_crafter_manager.json -ce1ec618f4ffe27889f0854b98d717eca7268d5b data/refinedstorage/loot_tables/blocks/brown_crafting_grid.json -b6a22371c9016787822c2c4be222304a5327956f data/refinedstorage/loot_tables/blocks/brown_crafting_monitor.json -6e3bae9f9836f832945d8cfb0df48ad356b1c6c8 data/refinedstorage/loot_tables/blocks/brown_creative_controller.json -a5b4b0ef4c998cdbdc23beb0cf5e9e4ed019af30 data/refinedstorage/loot_tables/blocks/brown_detector.json -453d023135a2dba46bcd4ea75b03934948b19ea3 data/refinedstorage/loot_tables/blocks/brown_disk_manipulator.json -1c6f6d160a619fea2bdb8847506b9b5e74c232e3 data/refinedstorage/loot_tables/blocks/brown_fluid_grid.json -08d31ee402b3c56abd51de9ef8468816dd233240 data/refinedstorage/loot_tables/blocks/brown_grid.json -f0bca992a40644774887f38444aa6934d7cd7b37 data/refinedstorage/loot_tables/blocks/brown_network_receiver.json -e3e038f31fec71fe5f5c8e57605c2dbcd760b181 data/refinedstorage/loot_tables/blocks/brown_network_transmitter.json -ea466bdde4fd7a182da84e0bd4b9dea6e500a640 data/refinedstorage/loot_tables/blocks/brown_pattern_grid.json -76ec6e28bed2b54d5d96dfab9083d1bf53db49d8 data/refinedstorage/loot_tables/blocks/brown_relay.json -263356d7309f4b9224efb6aba0a958cfc51e1e80 data/refinedstorage/loot_tables/blocks/brown_security_manager.json -4898c0055896364f7a80a41f1ca33392facb7005 data/refinedstorage/loot_tables/blocks/brown_wireless_transmitter.json -e5d88d970408ddc2599982cad07d9b105e4b2754 data/refinedstorage/loot_tables/blocks/controller.json -f2592be92e7eb1636e5793b683b432a59c9e4852 data/refinedstorage/loot_tables/blocks/crafter.json -9d2030dda28a2deee9d360d4e84f64d9d9669af2 data/refinedstorage/loot_tables/blocks/crafter_manager.json -4edeb2f5200b302f7b66e0802327341bd757c0e7 data/refinedstorage/loot_tables/blocks/crafting_grid.json -028f13fe3e996d7f75ed0cc86e4833489f99bc8e data/refinedstorage/loot_tables/blocks/crafting_monitor.json -cf915e50e2bb8d0bb19663ec58d5dbfab36b521f data/refinedstorage/loot_tables/blocks/creative_controller.json -339cea0e8dc48a472141dff2c32f953499872156 data/refinedstorage/loot_tables/blocks/cyan_controller.json -e63d26ad6f6dd55f2f9b7f8e9341e6d311ef80bc data/refinedstorage/loot_tables/blocks/cyan_crafter.json -d0cc7952b7f50de4c530e220cf96737d5da65211 data/refinedstorage/loot_tables/blocks/cyan_crafter_manager.json -e4655aa9f8fa7c37ffe9f6c39ec0bc6290825c9c data/refinedstorage/loot_tables/blocks/cyan_crafting_grid.json -1d76aacee8f77f0b4aa3fe47cd4fdc2291fcee5a data/refinedstorage/loot_tables/blocks/cyan_crafting_monitor.json -8d6b31d1dc2aee3dd212b390989f6dd816bd3b00 data/refinedstorage/loot_tables/blocks/cyan_creative_controller.json -b25c30907c9a9c72391f8e1de0adddb8720ce9b2 data/refinedstorage/loot_tables/blocks/cyan_detector.json -762eb1b06efaf30da114ff0000c8ca4cfb111016 data/refinedstorage/loot_tables/blocks/cyan_disk_manipulator.json -b8aae91560147cab66151ecbaa9e91ffa0eb8d75 data/refinedstorage/loot_tables/blocks/cyan_fluid_grid.json -5361c4d0fcd9091095cb0a2e4e2aeecfc0b792d0 data/refinedstorage/loot_tables/blocks/cyan_grid.json -33fe0bc69106757c16478a50cb79ef6b542c83f1 data/refinedstorage/loot_tables/blocks/cyan_network_receiver.json -3bd294b99f9170e128e2aaf88153c4a349c24cf4 data/refinedstorage/loot_tables/blocks/cyan_network_transmitter.json -cb53e33206cfe9a75f5a43e59fccd4bdcdf82766 data/refinedstorage/loot_tables/blocks/cyan_pattern_grid.json -c842b31b9e7786c15819d82ce7074d601201456c data/refinedstorage/loot_tables/blocks/cyan_relay.json -8b1c991105fad7f19a2ef5d9d676f87a80f1463e data/refinedstorage/loot_tables/blocks/cyan_security_manager.json -9024970ff4954e37211554cc01a9d553dfb94ed8 data/refinedstorage/loot_tables/blocks/cyan_wireless_transmitter.json -67bd3f8e43750068a825a66e490d7cf6c565ceb5 data/refinedstorage/loot_tables/blocks/detector.json -0dffb17036572a571672e25d0368f7995afd280f data/refinedstorage/loot_tables/blocks/disk_manipulator.json -36c9ff89234ad7d52890c195584eff8762a13ab1 data/refinedstorage/loot_tables/blocks/fluid_grid.json -ac88dc6b32c95f6b7701a51a40e94189629e58eb data/refinedstorage/loot_tables/blocks/gray_controller.json -07049235e691a22b5541986108d9a72e9f1a7f5f data/refinedstorage/loot_tables/blocks/gray_crafter.json -fa7401e4f69399098c880b6aa9ed007a97b9873b data/refinedstorage/loot_tables/blocks/gray_crafter_manager.json -50b69e021077189d1462b695c417774bf4c251af data/refinedstorage/loot_tables/blocks/gray_crafting_grid.json -dc69af81f10b87211dc9cf5b573c8a32c74c0bc0 data/refinedstorage/loot_tables/blocks/gray_crafting_monitor.json -164fed4f1baa386f0f8807c2c60ae28de24e9351 data/refinedstorage/loot_tables/blocks/gray_creative_controller.json -92b97532ad9e609e3a20fac504ef95c1e2606c60 data/refinedstorage/loot_tables/blocks/gray_detector.json -34dbdf3ac38b32249b5664eb0ba2f50dd679781e data/refinedstorage/loot_tables/blocks/gray_disk_manipulator.json -e2d4427d192657fcecd9958962ac3c43411fd2eb data/refinedstorage/loot_tables/blocks/gray_fluid_grid.json -9f60614f9c02accbde535f3c156353fddbe12e87 data/refinedstorage/loot_tables/blocks/gray_grid.json -b7ae6fe251dc5ec520d236bc610509bf81667b9b data/refinedstorage/loot_tables/blocks/gray_network_receiver.json -b43cd432972d0f4bfa74f8d1f275baa74e3a0d9b data/refinedstorage/loot_tables/blocks/gray_network_transmitter.json -7e53fd4641fbccd9a335981cb3fcae9301babf3c data/refinedstorage/loot_tables/blocks/gray_pattern_grid.json -3087043503d1ac08c5cff7f7a5eb019f37b04d5f data/refinedstorage/loot_tables/blocks/gray_relay.json -db1e0879d1d105e8b9b3d2aa78a03044db63e5c6 data/refinedstorage/loot_tables/blocks/gray_security_manager.json -c68690bb474d297f242cf5d87e7ca586e3d95e22 data/refinedstorage/loot_tables/blocks/gray_wireless_transmitter.json -7be3bf847408e037367672eff9bc7641d8c46f78 data/refinedstorage/loot_tables/blocks/green_controller.json -472df3e4c5bf446b48be57c6b6e51d20bad56c2d data/refinedstorage/loot_tables/blocks/green_crafter.json -63d7004ebbdf3094552a31ecaa213c4dc485adfb data/refinedstorage/loot_tables/blocks/green_crafter_manager.json -08b7f03b764e8daea6b4b1b452047ec0a24be7be data/refinedstorage/loot_tables/blocks/green_crafting_grid.json -9a39dbc0a6dd92d404d658b1911a03355e1306f4 data/refinedstorage/loot_tables/blocks/green_crafting_monitor.json -597919d51b5d00143a6ec219bec12e7ecb5f8388 data/refinedstorage/loot_tables/blocks/green_creative_controller.json -4d137e122f08bf9410b9bc5a4cb4a0d5b6ac7596 data/refinedstorage/loot_tables/blocks/green_detector.json -8fda8c968bd58e6dd96f1a28d20ea6fe3e01bbe6 data/refinedstorage/loot_tables/blocks/green_disk_manipulator.json -a98afeb270ede520199011888d83b091447fe83c data/refinedstorage/loot_tables/blocks/green_fluid_grid.json -bf99d119445e91b7301e3fca58be1b67834c550f data/refinedstorage/loot_tables/blocks/green_grid.json -3072903aee93410a11bcdda95920597470209b63 data/refinedstorage/loot_tables/blocks/green_network_receiver.json -262eea123391dd308a346231df578582a9bc70fa data/refinedstorage/loot_tables/blocks/green_network_transmitter.json -d649e5e1627e4cd8dc4dbd4508da70d9dfac79bc data/refinedstorage/loot_tables/blocks/green_pattern_grid.json -2c0d9a6036bffc033c0e32dd8f065dddd8a23328 data/refinedstorage/loot_tables/blocks/green_relay.json -26bc045b3d25e465c6607469001301ee645f7c7a data/refinedstorage/loot_tables/blocks/green_security_manager.json -3de7a139cb0a141764d0d4f569fe48c269328211 data/refinedstorage/loot_tables/blocks/green_wireless_transmitter.json -3af27dbd8f7670a8bba171462eef9d5eba7fd80d data/refinedstorage/loot_tables/blocks/grid.json -bf2b4abdbb1e0fadfc840267995a0277c6856989 data/refinedstorage/loot_tables/blocks/light_gray_controller.json -9307e6a128c9c271adaf5e7594f27e75a67c5519 data/refinedstorage/loot_tables/blocks/light_gray_crafter.json -802a9bb7e756c1ff384390232d878be445840465 data/refinedstorage/loot_tables/blocks/light_gray_crafter_manager.json -4dcca839001fa78e46b31c82f97af89dfa17cae8 data/refinedstorage/loot_tables/blocks/light_gray_crafting_grid.json -c38fa60ffeecb0e49c8d306d36c8ee46abdc630f data/refinedstorage/loot_tables/blocks/light_gray_crafting_monitor.json -8e912be0f7961c6b6f0d5b8fc286f322ef33eea4 data/refinedstorage/loot_tables/blocks/light_gray_creative_controller.json -d5e497bce78c926c40201cc97e3acec094723715 data/refinedstorage/loot_tables/blocks/light_gray_detector.json -3299b97b7814a96da67b9f022f585b4866705c4e data/refinedstorage/loot_tables/blocks/light_gray_disk_manipulator.json -8239ae47838db1a6c1ec025caeaefeaa758184da data/refinedstorage/loot_tables/blocks/light_gray_fluid_grid.json -212981340db80f05f07f25162e97c4ddd10d6bd3 data/refinedstorage/loot_tables/blocks/light_gray_grid.json -b6172362383bc60f4de70176c9e743643f9b1780 data/refinedstorage/loot_tables/blocks/light_gray_network_receiver.json -609578fbd231d8a6bcfa0f74cf9fb0af1e92c2a6 data/refinedstorage/loot_tables/blocks/light_gray_network_transmitter.json -1fa330f3bc66975bf0bb934085c4e910741cdec8 data/refinedstorage/loot_tables/blocks/light_gray_pattern_grid.json -324d5582ea7e15a5d5058ee6d0453b9e28d85c1d data/refinedstorage/loot_tables/blocks/light_gray_relay.json -58a8284552bed5a8a8d3cf48c4b069821d758e0c data/refinedstorage/loot_tables/blocks/light_gray_security_manager.json -0d2be15b2d500f5a421eee71979eb8854cceadb4 data/refinedstorage/loot_tables/blocks/light_gray_wireless_transmitter.json -2e29cc7f28231005be264838eb606b4a015a6abc data/refinedstorage/loot_tables/blocks/lime_controller.json -2e6917de8175858ca74347cb6ba6599faa6f6644 data/refinedstorage/loot_tables/blocks/lime_crafter.json -2270ef500524aa0ec7ebcc56c3b50396043e6683 data/refinedstorage/loot_tables/blocks/lime_crafter_manager.json -01b58a9c4191b5fb698e2f149e673b38e99a2eaa data/refinedstorage/loot_tables/blocks/lime_crafting_grid.json -7e7f19d49c841d84557c3b82d5cc668d1dd0a02d data/refinedstorage/loot_tables/blocks/lime_crafting_monitor.json -2df7a8f1c461d22581c080c6c5598a70fca5f325 data/refinedstorage/loot_tables/blocks/lime_creative_controller.json -2156c3fbf71cebbfec68bd958ed6abe498b66bc6 data/refinedstorage/loot_tables/blocks/lime_detector.json -ac21de45636c10773a5d53df30e2da0f11212eb5 data/refinedstorage/loot_tables/blocks/lime_disk_manipulator.json -4cf8dfa1abc3f08e92738c8928a69786a90255f9 data/refinedstorage/loot_tables/blocks/lime_fluid_grid.json -209d3aa9fbb7aaef5c031185a11e441d65f26e2a data/refinedstorage/loot_tables/blocks/lime_grid.json -17ea7ea2655e85a312261e15edcf0c96e422b12d data/refinedstorage/loot_tables/blocks/lime_network_receiver.json -9490e1d203979ee29c35e069f5394c7650574785 data/refinedstorage/loot_tables/blocks/lime_network_transmitter.json -41589e115ace7776bc056187448aeb47243fd79e data/refinedstorage/loot_tables/blocks/lime_pattern_grid.json -3724c0ecc66d5016da8b07ba9ec26999b4c32658 data/refinedstorage/loot_tables/blocks/lime_relay.json -173103d1a0d8dae5ac16a9e7c9cbe833f6b7c6cc data/refinedstorage/loot_tables/blocks/lime_security_manager.json -19df13a4b4b7d874211bb183e25e7b2ea21ee816 data/refinedstorage/loot_tables/blocks/lime_wireless_transmitter.json -e45cc08cee4399d90980974358a25f4c59e44f22 data/refinedstorage/loot_tables/blocks/magenta_controller.json -5739c530043a1287d28e92093d24dfcecb254eab data/refinedstorage/loot_tables/blocks/magenta_crafter.json -54ad7d350602b7561813abb1ebca06a9613d863a data/refinedstorage/loot_tables/blocks/magenta_crafter_manager.json -e04e3b906fd21b28769cb7ae71f67431a701dea0 data/refinedstorage/loot_tables/blocks/magenta_crafting_grid.json -fcbd4728c56aaa8a8377703e52e93cd05315bbf4 data/refinedstorage/loot_tables/blocks/magenta_crafting_monitor.json -0b897691a4774811f63f684de9e99853bf070b27 data/refinedstorage/loot_tables/blocks/magenta_creative_controller.json -6ac8137df5a344e47bb78f2c60535f0002e1c11d data/refinedstorage/loot_tables/blocks/magenta_detector.json -0986f5945d8bd77b96f6190f73436e20f9337a3a data/refinedstorage/loot_tables/blocks/magenta_disk_manipulator.json -15b583f0c2cf147f6a44bf78edc42d09ef906a95 data/refinedstorage/loot_tables/blocks/magenta_fluid_grid.json -d4fe132d5c5da50ad5990e8271e437671b3cff36 data/refinedstorage/loot_tables/blocks/magenta_grid.json -326b9c9f14149a845e3496c7493e350426ecb439 data/refinedstorage/loot_tables/blocks/magenta_network_receiver.json -3f78160de2336b6caece4ca286f1d89a4a730930 data/refinedstorage/loot_tables/blocks/magenta_network_transmitter.json -99a82a887e494646518bf39ca2d7550725a63320 data/refinedstorage/loot_tables/blocks/magenta_pattern_grid.json -8180f16fb608035fc33d536fa6f650e91e7b4651 data/refinedstorage/loot_tables/blocks/magenta_relay.json -16473bb1b86b68bcd2d1c1adc0fddbcb0f144fa3 data/refinedstorage/loot_tables/blocks/magenta_security_manager.json -167be28348cecd829c9197b398e3b2280ff49a36 data/refinedstorage/loot_tables/blocks/magenta_wireless_transmitter.json -d24b983132e2aacc43b2b430c253fe44c424a726 data/refinedstorage/loot_tables/blocks/network_receiver.json -d0bba4e6d5e83bc4477c725e0f6a88439803d91f data/refinedstorage/loot_tables/blocks/network_transmitter.json -4c29795367a56061fdca55eda2b893f00f7bd791 data/refinedstorage/loot_tables/blocks/orange_controller.json -aeaa225b0657b2f223fe6b72ed75f8399d5fbf85 data/refinedstorage/loot_tables/blocks/orange_crafter.json -c66862e1b2f270005a52e46f8db9481fdf82ee02 data/refinedstorage/loot_tables/blocks/orange_crafter_manager.json -efa9b3edc39638631d7147bc86ebc72272228cc7 data/refinedstorage/loot_tables/blocks/orange_crafting_grid.json -4a59aae1514a8d7aabab5e0f069af92ef6d49c09 data/refinedstorage/loot_tables/blocks/orange_crafting_monitor.json -78a55cc2194efe43943aadd009c4a9d42cc4e92f data/refinedstorage/loot_tables/blocks/orange_creative_controller.json -7efbaef238f58d64f0954be77735c3e08c94db34 data/refinedstorage/loot_tables/blocks/orange_detector.json -c78996c1faf646617bd0cd90fb7be83be829804d data/refinedstorage/loot_tables/blocks/orange_disk_manipulator.json -44cbecd0dc0a082ccace0f234fd0c7ee2e2cfedf data/refinedstorage/loot_tables/blocks/orange_fluid_grid.json -6a83fd6b536bb6b01d6149e7507dbecfb1ccc989 data/refinedstorage/loot_tables/blocks/orange_grid.json -e1288e79538017b99466f0820f7089a6f67ecc3e data/refinedstorage/loot_tables/blocks/orange_network_receiver.json -f6c3a425f4275d8cd0cd6c93e5bfc18f31eb3699 data/refinedstorage/loot_tables/blocks/orange_network_transmitter.json -668cfffd997a499fedcdf3a261a1b6a6dba48097 data/refinedstorage/loot_tables/blocks/orange_pattern_grid.json -3ddbc68f9d640e2bc17d1e2ba4049c916864bce2 data/refinedstorage/loot_tables/blocks/orange_relay.json -2bb29ad278bb70884a729205c9caa0032d898fc5 data/refinedstorage/loot_tables/blocks/orange_security_manager.json -e62d7f7d27c94696b2144fe77bb03c867a25ba49 data/refinedstorage/loot_tables/blocks/orange_wireless_transmitter.json -3aa7956874a5a749b7f63fdd4623c4a6042fc2e5 data/refinedstorage/loot_tables/blocks/pattern_grid.json -0da9ff77e8364cfeaa05113dacb87a264f6db247 data/refinedstorage/loot_tables/blocks/pink_controller.json -53b76949705dbb99fa6a30d74fd62aa1ff9424ce data/refinedstorage/loot_tables/blocks/pink_crafter.json -d4060811c5e140d6cf9163d675fb4d17f313efd2 data/refinedstorage/loot_tables/blocks/pink_crafter_manager.json -087031abb12b9300294c7061b432887a19ab20e1 data/refinedstorage/loot_tables/blocks/pink_crafting_grid.json -63cd8c4f952c197dcc4e5955de6f68fcf9a0b44a data/refinedstorage/loot_tables/blocks/pink_crafting_monitor.json -690daedcae5b6969132e660688e1a344ce069344 data/refinedstorage/loot_tables/blocks/pink_creative_controller.json -fe4302c8d76a222016a76f3af42357fd0dffba09 data/refinedstorage/loot_tables/blocks/pink_detector.json -90857fccf2d14730f6037a9de85263b438b754e5 data/refinedstorage/loot_tables/blocks/pink_disk_manipulator.json -01059fb35caf88cb45dc5b42e74223560d73f2ad data/refinedstorage/loot_tables/blocks/pink_fluid_grid.json -ae1357e4d3a044ed26a7521b5ebf349e4fdd0d44 data/refinedstorage/loot_tables/blocks/pink_grid.json -e4f4cae843f1374623820222eeccfeddd3d7e35e data/refinedstorage/loot_tables/blocks/pink_network_receiver.json -f7719458376f9c143ce86cd81f48e7d8045d351b data/refinedstorage/loot_tables/blocks/pink_network_transmitter.json -b8e39448bd552650d98fe0cb870f7d844709a509 data/refinedstorage/loot_tables/blocks/pink_pattern_grid.json -7bd6c17db81283627599f2122c711a1bdd2fda77 data/refinedstorage/loot_tables/blocks/pink_relay.json -4d54d2664d26b74ec0fc7ebbeb46d645e34e3d03 data/refinedstorage/loot_tables/blocks/pink_security_manager.json -ff1b44d3ab2a8f1bca6bfce312bd55473ed4145a data/refinedstorage/loot_tables/blocks/pink_wireless_transmitter.json -72cee7ac4c3e077ee1db25cfa9d4150d5dccfe81 data/refinedstorage/loot_tables/blocks/purple_controller.json -ae65908b3a170b1163523d67c9c926998b9b7320 data/refinedstorage/loot_tables/blocks/purple_crafter.json -98066a19d9a43709da0a12c75875f83f65dd334b data/refinedstorage/loot_tables/blocks/purple_crafter_manager.json -556b70dad21f9ac413b75b444bfc2f3e5dec5a90 data/refinedstorage/loot_tables/blocks/purple_crafting_grid.json -ab87d594c21a38fc0a9004f7e8631d299b3cdfc9 data/refinedstorage/loot_tables/blocks/purple_crafting_monitor.json -144f287f57e9577339d611cf1460850776605e34 data/refinedstorage/loot_tables/blocks/purple_creative_controller.json -01e954e59d0f70acd1f931af3307cd77a58a5502 data/refinedstorage/loot_tables/blocks/purple_detector.json -a27f0c0dbc09fe6b32d532c24c2949544ace9661 data/refinedstorage/loot_tables/blocks/purple_disk_manipulator.json -d25e7bb0cfd7120673d2fa82c7886c58aceb0e67 data/refinedstorage/loot_tables/blocks/purple_fluid_grid.json -dbc1dbcba25f85007e6d9f382e3cc48341ac78ec data/refinedstorage/loot_tables/blocks/purple_grid.json -dbc4ae2b0f342fc9cef9400d9c3cdd651cf9b381 data/refinedstorage/loot_tables/blocks/purple_network_receiver.json -088f40f8e45b7a1ea5487c904e83672d9f0ee2b9 data/refinedstorage/loot_tables/blocks/purple_network_transmitter.json -4c3ffc66a30718ce2ef82250c0d548689952364a data/refinedstorage/loot_tables/blocks/purple_pattern_grid.json -5538b87d9fa176a1ab8a89e4cd820f34e8329a32 data/refinedstorage/loot_tables/blocks/purple_relay.json -ec56d76cfd356a99e6ddb2d38f25630eabe6bd38 data/refinedstorage/loot_tables/blocks/purple_security_manager.json -1952a39341e4b64d39bfe4b0ab5ff8dabbd7ff29 data/refinedstorage/loot_tables/blocks/purple_wireless_transmitter.json -e51691b875f0295c5f0e4aa7aae9f89f5dd3952a data/refinedstorage/loot_tables/blocks/red_controller.json -fbfbe78f480f4294b34e6e0b7731417b55f30124 data/refinedstorage/loot_tables/blocks/red_crafter.json -e57499e1f8986b43dc1fa766306fcfa01abbfa3e data/refinedstorage/loot_tables/blocks/red_crafter_manager.json -be9e2d40cd3435e8eff7bd828b7550f7a7f6cb13 data/refinedstorage/loot_tables/blocks/red_crafting_grid.json -f809d92d20fb7832556f5127e42c2f2b9bf3560b data/refinedstorage/loot_tables/blocks/red_crafting_monitor.json -aa8571425a22e16929ab9bf417ca071a6e36b6b5 data/refinedstorage/loot_tables/blocks/red_creative_controller.json -cc6e5437cf19fdc7d3e4ae0ed6b438762b17d071 data/refinedstorage/loot_tables/blocks/red_detector.json -a8f2c2ed45f6d46472c02e4ab7b0f392d013f31e data/refinedstorage/loot_tables/blocks/red_disk_manipulator.json -8619b8d408cf349a991abd579f065300892e1a3a data/refinedstorage/loot_tables/blocks/red_fluid_grid.json -df9270aefabbf3150941a80e65e372f844ee36ba data/refinedstorage/loot_tables/blocks/red_grid.json -7db2e62ffc04cdc1b8375cde9e46585cdab3c33e data/refinedstorage/loot_tables/blocks/red_network_receiver.json -15f910ca1443b7305e9b309ff0bca7366dee63b2 data/refinedstorage/loot_tables/blocks/red_network_transmitter.json -51d263aed6eb4a2a60d41c36dfc8215934d08980 data/refinedstorage/loot_tables/blocks/red_pattern_grid.json -2b9d6ee14d786f910664d65cc5d18065a9ecc730 data/refinedstorage/loot_tables/blocks/red_relay.json -7a69da9a0ebf2431c48725d175a8937d0ffb8ef3 data/refinedstorage/loot_tables/blocks/red_security_manager.json -19889ccf8f2d9a2b4a1d316560cb1b3c3996a67a data/refinedstorage/loot_tables/blocks/red_wireless_transmitter.json -a6760533701c19f0e29b07410515d148aef364e9 data/refinedstorage/loot_tables/blocks/relay.json -48d55ca1d1f14ce633ee5b492f3c7d95e24e810c data/refinedstorage/loot_tables/blocks/security_manager.json -911b7c2f617eb5fe819d065ddbbc14143958308c data/refinedstorage/loot_tables/blocks/white_controller.json -c59f73b6e6f4ee0b09539de16334128c31fbc844 data/refinedstorage/loot_tables/blocks/white_crafter.json -ed73285b1c262d8c29a6d8da65fcbdd30445263b data/refinedstorage/loot_tables/blocks/white_crafter_manager.json -9e3659b0320745abe71a5d4f951ff90b9ff1aa72 data/refinedstorage/loot_tables/blocks/white_crafting_grid.json -b1d3007e37f74bb75e91c125c35d9e3bb93ba55d data/refinedstorage/loot_tables/blocks/white_crafting_monitor.json -ff3012bb428b9dda189158a956da5885aef6ddcc data/refinedstorage/loot_tables/blocks/white_creative_controller.json -d835dea5a52cd7eedeba9a826509659e823c6a12 data/refinedstorage/loot_tables/blocks/white_detector.json -20282f272494fbcfb2dd48600a6c5ef37ba39c91 data/refinedstorage/loot_tables/blocks/white_disk_manipulator.json -2fb1dc77fd039ffd250bf433a92b502226f227fa data/refinedstorage/loot_tables/blocks/white_fluid_grid.json -1cb79a4aa4dba3710d9f5008dce300b179ba1fa9 data/refinedstorage/loot_tables/blocks/white_grid.json -5b0685e402871cc365c74c2d7a44aa7e7cd46ea1 data/refinedstorage/loot_tables/blocks/white_network_receiver.json -ffd8e4c3b305bde8288b42d355c4c07b37bf9894 data/refinedstorage/loot_tables/blocks/white_network_transmitter.json -d4e9e8a33eff443913d8cba3b930eaa807e8373c data/refinedstorage/loot_tables/blocks/white_pattern_grid.json -5c04826c39162d4c9ffbd0f07ab42dab4f4c7185 data/refinedstorage/loot_tables/blocks/white_relay.json -b598c30205d0b6cb934a3c635d7e0d38cc592e32 data/refinedstorage/loot_tables/blocks/white_security_manager.json -7da6e448003b644971162b67509f447cb9ae37b7 data/refinedstorage/loot_tables/blocks/white_wireless_transmitter.json -3668a19f77fcc685ca3c630e0ae78619b67b22e3 data/refinedstorage/loot_tables/blocks/wireless_transmitter.json -9b923b57ea3f03aa31e0407ad959dddfd18870ed data/refinedstorage/loot_tables/blocks/yellow_controller.json -5719b9fa9b25221c3c0f0ffb181c1ca7810fd158 data/refinedstorage/loot_tables/blocks/yellow_crafter.json -2a6c39de6f1b1f199ee0069552666f159462f8cb data/refinedstorage/loot_tables/blocks/yellow_crafter_manager.json -f60fce23e9bac049c8f5b52d97242878ad6a3e60 data/refinedstorage/loot_tables/blocks/yellow_crafting_grid.json -bdbdbff45562984cdb60cbabc0b8dac17501e8a7 data/refinedstorage/loot_tables/blocks/yellow_crafting_monitor.json -85d53529e95019e4bc1e6f7d3cf6d399fb595ee6 data/refinedstorage/loot_tables/blocks/yellow_creative_controller.json -57111020263904d2fe797378c8a1e2ce5341b208 data/refinedstorage/loot_tables/blocks/yellow_detector.json -101535314df1d33d5b021f12232313ab390db9ea data/refinedstorage/loot_tables/blocks/yellow_disk_manipulator.json -630f117598efa32923e6c65d3ca6944a27cd0b52 data/refinedstorage/loot_tables/blocks/yellow_fluid_grid.json -a93702c8861dfb2a54ff0da6dfe22d26a2bb5f68 data/refinedstorage/loot_tables/blocks/yellow_grid.json -b92bc57669ba7881fb2a302ecf587564e65110f3 data/refinedstorage/loot_tables/blocks/yellow_network_receiver.json -8c93061dd5f2b99ded78476212ab50cc737abf54 data/refinedstorage/loot_tables/blocks/yellow_network_transmitter.json -0d8ff0ca8e4628bbada3c5a6b3c7ed090807824d data/refinedstorage/loot_tables/blocks/yellow_pattern_grid.json -26b62ca31626ad8c40f5290731a61b9209924ca2 data/refinedstorage/loot_tables/blocks/yellow_relay.json -8aa3242733d60adce75c43f4b8ee4b4c6bf3d1ae data/refinedstorage/loot_tables/blocks/yellow_security_manager.json -04c45f6845507cd3d494cb87a698b229def84078 data/refinedstorage/loot_tables/blocks/yellow_wireless_transmitter.json -969033f40d7ac783cb7609e0fcb37d28164c17f0 data/refinedstorage/recipes/coloring_recipes/black_controller.json -e7c7fa45ecea99d5b2f2630828675682cd2c2b76 data/refinedstorage/recipes/coloring_recipes/black_crafter.json -6a052fafae01e6ef693740430129e66346e7100f data/refinedstorage/recipes/coloring_recipes/black_crafter_manager.json -24ac9c6b3277eea1c8bc4ca53e5a6b29f4e7e4b5 data/refinedstorage/recipes/coloring_recipes/black_crafting_grid.json -38eb262a630ba5d2ea1686cd7ebc4d8ca96bfe71 data/refinedstorage/recipes/coloring_recipes/black_crafting_monitor.json -e86121ae1a6bdd41d02086e07254be0df3f603d9 data/refinedstorage/recipes/coloring_recipes/black_detector.json -295e2fe79538510fbcd2c82ae66dd0116463edde data/refinedstorage/recipes/coloring_recipes/black_disk_manipulator.json -b563c41d9ad87c90b10446a59e206d04a6ea8de5 data/refinedstorage/recipes/coloring_recipes/black_fluid_grid.json -c19a14e6bf642e00e0c0ab742bb347e9b80072c9 data/refinedstorage/recipes/coloring_recipes/black_grid.json -86ca8a24b41623f2c1e1fd667fb6cbf3b1ae2f8c data/refinedstorage/recipes/coloring_recipes/black_network_receiver.json -a51fa9a64eae9ba60bb2e7e268d85f4215c2c807 data/refinedstorage/recipes/coloring_recipes/black_network_transmitter.json -3039ef822b43649545867adb27faa4a73b824966 data/refinedstorage/recipes/coloring_recipes/black_pattern_grid.json -216e6d83e9412e10e702a19b25afebedfe0e7685 data/refinedstorage/recipes/coloring_recipes/black_relay.json -d95da44a6f37f03b1b48f66f1589938b31b89254 data/refinedstorage/recipes/coloring_recipes/black_security_manager.json -1decdd2393f568a5fac9699417aa2eddd7521de6 data/refinedstorage/recipes/coloring_recipes/black_wireless_transmitter.json -bca986576d3ad054b2cab1899c421fa6b6ff2c72 data/refinedstorage/recipes/coloring_recipes/blue_controller.json -6456a59812994ff85f8df9c0222ed3dde9863e01 data/refinedstorage/recipes/coloring_recipes/blue_crafter.json -d462e69af92e67ffd4c388d35f322cc95b580abe data/refinedstorage/recipes/coloring_recipes/blue_crafter_manager.json -92fa83c4bccd088575dc9128b974c4cc4d770e52 data/refinedstorage/recipes/coloring_recipes/blue_crafting_grid.json -920bbf4faa00e9d3e8d8c9f816b9d4469996188e data/refinedstorage/recipes/coloring_recipes/blue_crafting_monitor.json -7e355873d61976340f1560f8b9269ba938b27468 data/refinedstorage/recipes/coloring_recipes/blue_detector.json -e361577cd729d718b0e96a1979c4846ae29e27ad data/refinedstorage/recipes/coloring_recipes/blue_disk_manipulator.json -43a134df0acbac1ec4ce22cd2c62a27ea39990d0 data/refinedstorage/recipes/coloring_recipes/blue_fluid_grid.json -88e88abfe56d3b6bf1885d0c029b8ac0b0bcdcf0 data/refinedstorage/recipes/coloring_recipes/blue_grid.json -e5a682bc25780b790678a1e988ab62b941cfe306 data/refinedstorage/recipes/coloring_recipes/blue_network_receiver.json -61029dd316ba398da9f47c4653e198033f7678e8 data/refinedstorage/recipes/coloring_recipes/blue_network_transmitter.json -659343b9ec6e0b859808d9a6d9bb16449830fbc2 data/refinedstorage/recipes/coloring_recipes/blue_pattern_grid.json -797414df3f6894f77ed05592196bc27bc9d6b842 data/refinedstorage/recipes/coloring_recipes/blue_relay.json -a19f1c0604fb883a15805f3ea3f0d0dd1086f6e6 data/refinedstorage/recipes/coloring_recipes/blue_security_manager.json -1a571f652572ea38adeae5c7b4242f2e3d08e82f data/refinedstorage/recipes/coloring_recipes/blue_wireless_transmitter.json -ab5e8837374d042eceff0fc6c2872131e8b638fa data/refinedstorage/recipes/coloring_recipes/brown_controller.json -92998efe2f3776a2e86f37ec4781e49f39e5b088 data/refinedstorage/recipes/coloring_recipes/brown_crafter.json -d08155a79187ea7968619ac25ad2a48f835746ba data/refinedstorage/recipes/coloring_recipes/brown_crafter_manager.json -e3476585a9d119661c4d9009d3aff15103d02578 data/refinedstorage/recipes/coloring_recipes/brown_crafting_grid.json -640903bc4ee5ffedfc82ae4da6d086475361d565 data/refinedstorage/recipes/coloring_recipes/brown_crafting_monitor.json -6cf86b07c842599a4ce296f2fc61e73db441a7bb data/refinedstorage/recipes/coloring_recipes/brown_detector.json -92f9377646a2cb11d61fc9e2d5b791537fc0cbfe data/refinedstorage/recipes/coloring_recipes/brown_disk_manipulator.json -12c2cf215fa341317f29a651205e0ac9066d5d0b data/refinedstorage/recipes/coloring_recipes/brown_fluid_grid.json -587ffa9f25e95e9dbcc8fbb01009536041ad2f22 data/refinedstorage/recipes/coloring_recipes/brown_grid.json -552dace5a514d80a3847ba4b8d194e33ccb32ab6 data/refinedstorage/recipes/coloring_recipes/brown_network_receiver.json -75ae15596250039fc93f8df0d362be520e89ffa4 data/refinedstorage/recipes/coloring_recipes/brown_network_transmitter.json -16b3a13ac1fb3b4f208fcd5fa20d117da6c2e57b data/refinedstorage/recipes/coloring_recipes/brown_pattern_grid.json -c98f389975af499963997bd4d6a54da676c688a8 data/refinedstorage/recipes/coloring_recipes/brown_relay.json -680cd4bc6a2a62502ce86bd261df8ad07a294194 data/refinedstorage/recipes/coloring_recipes/brown_security_manager.json -8a3844976033d8f7cd3ea54d9e03a45a50f30755 data/refinedstorage/recipes/coloring_recipes/brown_wireless_transmitter.json -aac0067cee9a396ac3d8d5f76120651acc4d99c8 data/refinedstorage/recipes/coloring_recipes/controller.json -6ab064058c6dbf8eb99a2183768a8bb69e9f70c3 data/refinedstorage/recipes/coloring_recipes/crafter.json -8656c58323055f169bd099c5939a192517137b1b data/refinedstorage/recipes/coloring_recipes/crafter_manager.json -7dc48af9ed9aace4dd9fb32b76b85bf895d07d09 data/refinedstorage/recipes/coloring_recipes/crafting_grid.json -9a5a82b5a4c4da2a484dd6c864fdfb820996336c data/refinedstorage/recipes/coloring_recipes/crafting_monitor.json -09c2a9c97beb284c8a77e1f2ce532a5505a1c5f0 data/refinedstorage/recipes/coloring_recipes/cyan_controller.json -5ca127617835d9669e818d40b5f59d217611075e data/refinedstorage/recipes/coloring_recipes/cyan_crafter.json -c912c7c32218be6df1f5b4d24e0e5fc08ab34f72 data/refinedstorage/recipes/coloring_recipes/cyan_crafter_manager.json -f09462697dec291fdd0e4686a95d9aa42df67db6 data/refinedstorage/recipes/coloring_recipes/cyan_crafting_grid.json -1da714bc4d71c3edb78dea544f67fc07e7596f02 data/refinedstorage/recipes/coloring_recipes/cyan_crafting_monitor.json -4b2d82e9b8537588df20edee272d588f9a6275e2 data/refinedstorage/recipes/coloring_recipes/cyan_detector.json -206e61aa570820b55d121fe327d67c157784e9d7 data/refinedstorage/recipes/coloring_recipes/cyan_disk_manipulator.json -a401b7e17a24b50047c996895af80fa1a0af7a20 data/refinedstorage/recipes/coloring_recipes/cyan_fluid_grid.json -40fe5fc6cbf53ef026e34edf92f38fa58b99ba18 data/refinedstorage/recipes/coloring_recipes/cyan_grid.json -d432eb0b713d5a481d311afdb467bfa04eedd180 data/refinedstorage/recipes/coloring_recipes/cyan_network_receiver.json -2094c3696a3ea32ecf0c76fc6573a8815fceac4d data/refinedstorage/recipes/coloring_recipes/cyan_network_transmitter.json -9ebf3e1901ede9db2bf005674eeefa1d4526895d data/refinedstorage/recipes/coloring_recipes/cyan_pattern_grid.json -26841783447e20c4f6a97d5bada83535b4fc08c4 data/refinedstorage/recipes/coloring_recipes/cyan_relay.json -6d185901dc8ad4d60535dffbb190a3a1403affb9 data/refinedstorage/recipes/coloring_recipes/cyan_security_manager.json -727ae008a13bb0d0cfd8a5f7c5e0f976af1d960a data/refinedstorage/recipes/coloring_recipes/cyan_wireless_transmitter.json -9459375863467cb9e1dc085e4ab4dfa9631399df data/refinedstorage/recipes/coloring_recipes/detector.json -7ed18c13c12a4f4138f62e95380b655dae0fe237 data/refinedstorage/recipes/coloring_recipes/disk_manipulator.json -7818987e1ae84051a01b446959023eebfece3b0b data/refinedstorage/recipes/coloring_recipes/fluid_grid.json -17d700ef377c69ecf96cb9964a6ddaefeef6f1c8 data/refinedstorage/recipes/coloring_recipes/gray_controller.json -0aa167b6cad262d9c874d167898b3b13a9f2ccb1 data/refinedstorage/recipes/coloring_recipes/gray_crafter.json -9ca366b5fcc5b8d6a996bc717781f0a550be3280 data/refinedstorage/recipes/coloring_recipes/gray_crafter_manager.json -435b7e69f03135143422fa6fcab5380e708abc55 data/refinedstorage/recipes/coloring_recipes/gray_crafting_grid.json -5a7494358ad2f1d02a8cff50073be37ab94db849 data/refinedstorage/recipes/coloring_recipes/gray_crafting_monitor.json -84a9573b59993491f43d8eaf35083a372f22256a data/refinedstorage/recipes/coloring_recipes/gray_detector.json -2e5e125edf49ae10ff57614fa6ed0b91eec8b011 data/refinedstorage/recipes/coloring_recipes/gray_disk_manipulator.json -371183790028893f0876c72aa0c7eacb6466d15a data/refinedstorage/recipes/coloring_recipes/gray_fluid_grid.json -37340d82edd89079fc4b7ce7d66cd22fa092b4dd data/refinedstorage/recipes/coloring_recipes/gray_grid.json -c310d43dd699e28ab270c52af6fe37422802c7bc data/refinedstorage/recipes/coloring_recipes/gray_network_receiver.json -489f258f44b738674370c1d6c23ad5174caab3b4 data/refinedstorage/recipes/coloring_recipes/gray_network_transmitter.json -94d9af3f0748da439399a777c65ddb8b8bd2ba1b data/refinedstorage/recipes/coloring_recipes/gray_pattern_grid.json -eac0d767e238bb4c52694a3be797097d5e5ec17f data/refinedstorage/recipes/coloring_recipes/gray_relay.json -413a96c511c13a984560eac67e19b5208f7a8848 data/refinedstorage/recipes/coloring_recipes/gray_security_manager.json -185450d7bb6f6b57dd3733528e190ec3b5d790e6 data/refinedstorage/recipes/coloring_recipes/gray_wireless_transmitter.json -1f1f8e1d8617205dfdf29d3609e3badb0c5e5924 data/refinedstorage/recipes/coloring_recipes/green_controller.json -609f85fc609ee71330f8f8249060a304c9caa148 data/refinedstorage/recipes/coloring_recipes/green_crafter.json -2a2e45f8a4fa8b10efefc9c2d0fe216a904a27fe data/refinedstorage/recipes/coloring_recipes/green_crafter_manager.json -fd62a4470699f24de1477521d4be0b3e7dda7647 data/refinedstorage/recipes/coloring_recipes/green_crafting_grid.json -43148e09b1fd290a0bbfe18ccf3e997f60773231 data/refinedstorage/recipes/coloring_recipes/green_crafting_monitor.json -80f323698ffdf24017e96ab297612ce92ab2c36c data/refinedstorage/recipes/coloring_recipes/green_detector.json -a539e54477213e3064d77f743d26559557fcdfea data/refinedstorage/recipes/coloring_recipes/green_disk_manipulator.json -6f720f2f0adafd4676ea311f8d9a5522b27ddb8c data/refinedstorage/recipes/coloring_recipes/green_fluid_grid.json -bf444f3427c81c2d43d8c1bc56cdafed1fcc6f2a data/refinedstorage/recipes/coloring_recipes/green_grid.json -6e282b1257a5e8f1b9e8d3ace58f1cf6774c8e50 data/refinedstorage/recipes/coloring_recipes/green_network_receiver.json -7f427e3679d1f2eb0d2696e1bbb53eea12ef788d data/refinedstorage/recipes/coloring_recipes/green_network_transmitter.json -694fb7fe11ebcee751bd2774f369ade58e16221d data/refinedstorage/recipes/coloring_recipes/green_pattern_grid.json -cd7858e0a244e377d1a2c2d3268f7e37c6d19164 data/refinedstorage/recipes/coloring_recipes/green_relay.json -eafb49de5e0e052beb5c9329c7a4a6321fe1197c data/refinedstorage/recipes/coloring_recipes/green_security_manager.json -3b7f82b54e06072a8422dec19fdb19fe8f75aae5 data/refinedstorage/recipes/coloring_recipes/green_wireless_transmitter.json -2fc1d0063719726bc75ce6b44c6885c71aa4c035 data/refinedstorage/recipes/coloring_recipes/grid.json -2819430a82d3564f98e574fcdcf7e48a466a8b90 data/refinedstorage/recipes/coloring_recipes/light_gray_controller.json -c996f4e95b4bf7c5537f350d0f0d83cf46903b96 data/refinedstorage/recipes/coloring_recipes/light_gray_crafter.json -0d2bbcd8a5725c088d03a2fb64d0ed3aae36e75a data/refinedstorage/recipes/coloring_recipes/light_gray_crafter_manager.json -88f8c767edb1bf15b4db514685dfb68fd67f9f02 data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_grid.json -ee5b2569ceb712d7a5a19099a7854b87a11fcb0e data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_monitor.json -c4e67604b427508bbf7aa59934835687466c5a93 data/refinedstorage/recipes/coloring_recipes/light_gray_detector.json -aa4f35013bb507ac9c8c78133bbda4d76cebb109 data/refinedstorage/recipes/coloring_recipes/light_gray_disk_manipulator.json -e551b51bc52f0a50c5a605925b0888b0134c8ebd data/refinedstorage/recipes/coloring_recipes/light_gray_fluid_grid.json -5d2b7354169d3eec8ebc354dfb2d30f6913e55b4 data/refinedstorage/recipes/coloring_recipes/light_gray_grid.json -ee100201c1e4c7b37eb2de88edef2d0b0c1e9d15 data/refinedstorage/recipes/coloring_recipes/light_gray_network_receiver.json -1743cda98f6241a57baf19725ddb6de588785ed2 data/refinedstorage/recipes/coloring_recipes/light_gray_network_transmitter.json -b8ac2081a2ac346f418a7cc866474f40383ea0bc data/refinedstorage/recipes/coloring_recipes/light_gray_pattern_grid.json -c78f0c90638b9becb2b71457465290f5e8eb5ca3 data/refinedstorage/recipes/coloring_recipes/light_gray_relay.json -f82cce75e64121fe838de003f8bf7c5eccb4b5e0 data/refinedstorage/recipes/coloring_recipes/light_gray_security_manager.json -d1ebbbfe1c0eab7db7f46368ebba0a735f39ec92 data/refinedstorage/recipes/coloring_recipes/light_gray_wireless_transmitter.json -a1429f197763941b42f287492f57d338621b9e25 data/refinedstorage/recipes/coloring_recipes/lime_controller.json -a79195f0396510fe2de8614baef9b8c72e24d97b data/refinedstorage/recipes/coloring_recipes/lime_crafter.json -60f1b3e8a97149b15602d549bfaf2021db294636 data/refinedstorage/recipes/coloring_recipes/lime_crafter_manager.json -f845241f68cf38eab944ee09907da638efeffce6 data/refinedstorage/recipes/coloring_recipes/lime_crafting_grid.json -e4c611733c0ea6794ff41d987fba078a0ccfee8d data/refinedstorage/recipes/coloring_recipes/lime_crafting_monitor.json -704c538d31e3d8f77420623b5cda1524c2d22c87 data/refinedstorage/recipes/coloring_recipes/lime_detector.json -39c3c89bd78403fdd954e77f2fb6f1548a5fcb21 data/refinedstorage/recipes/coloring_recipes/lime_disk_manipulator.json -8a2e40727eeeeb6d9ed5569006f5dd4509f39655 data/refinedstorage/recipes/coloring_recipes/lime_fluid_grid.json -08da14fe68b994fec083d186eb1a771d5febb8b5 data/refinedstorage/recipes/coloring_recipes/lime_grid.json -da868e60ae134203034b0c5ea69ee1215d30cf9b data/refinedstorage/recipes/coloring_recipes/lime_network_receiver.json -83a2d7ffb737fe7237cbd65443d8f7129f8cf88a data/refinedstorage/recipes/coloring_recipes/lime_network_transmitter.json -065302e9d4ad7b33c298c71101971d327973753c data/refinedstorage/recipes/coloring_recipes/lime_pattern_grid.json -99c02e3a0de875ed55d47c4be5a3dc78e9d9c22e data/refinedstorage/recipes/coloring_recipes/lime_relay.json -7fd76dd95585b896b71305cbaf332d41ea4c667a data/refinedstorage/recipes/coloring_recipes/lime_security_manager.json -92d4f917449430f6341f26625f5f51413813656d data/refinedstorage/recipes/coloring_recipes/lime_wireless_transmitter.json -053f6d2e6b45cd6fbf3d34ca9fb7eafd77ce1920 data/refinedstorage/recipes/coloring_recipes/magenta_controller.json -e96750983f2d060ec11b9edce73fec205f05a982 data/refinedstorage/recipes/coloring_recipes/magenta_crafter.json -19dd436a599939f4093d153d7b3c2b464d07208d data/refinedstorage/recipes/coloring_recipes/magenta_crafter_manager.json -beef3d4a0f3cff04e05eba9de98b9decde1936ee data/refinedstorage/recipes/coloring_recipes/magenta_crafting_grid.json -becb3b9166a52e8c6f48a119ece88743de6723e1 data/refinedstorage/recipes/coloring_recipes/magenta_crafting_monitor.json -2ec8ebbfca595cb815fed05e77ed7db40a298021 data/refinedstorage/recipes/coloring_recipes/magenta_detector.json -062ef596c628891e546676a4bdc6513834e9e91f data/refinedstorage/recipes/coloring_recipes/magenta_disk_manipulator.json -c89219bd9ad78e38461ef2c93af4d4bfd360550f data/refinedstorage/recipes/coloring_recipes/magenta_fluid_grid.json -b2c6af973a2a818d580e191b9bfbc71348738048 data/refinedstorage/recipes/coloring_recipes/magenta_grid.json -496c48f3cf55fd7c490d3c8fbb4e05482693af68 data/refinedstorage/recipes/coloring_recipes/magenta_network_receiver.json -3121bd1638078aafa1d8cca361256aa1e531ae7c data/refinedstorage/recipes/coloring_recipes/magenta_network_transmitter.json -40091c97dad3a938a51e032229dad47c57bed12a data/refinedstorage/recipes/coloring_recipes/magenta_pattern_grid.json -7d94eceb92b1dbc9e1a68341da2ca23c0fd89c20 data/refinedstorage/recipes/coloring_recipes/magenta_relay.json -7ea18340d6e379e6e866f94219b99230e8a2ce42 data/refinedstorage/recipes/coloring_recipes/magenta_security_manager.json -68166614e7443dd2a773a9b21121908d62df290e data/refinedstorage/recipes/coloring_recipes/magenta_wireless_transmitter.json -fcaa4f720771e6f8e8b8d992d9debc0daf0fd771 data/refinedstorage/recipes/coloring_recipes/network_receiver.json -eb3f52ee372e02fb3c6ff5b8ab315e3631d2498b data/refinedstorage/recipes/coloring_recipes/network_transmitter.json -6f3bbf5f3676b481b124195df8cff55426234514 data/refinedstorage/recipes/coloring_recipes/orange_controller.json -29160480ae493ea740cc3819e67d356e215f6537 data/refinedstorage/recipes/coloring_recipes/orange_crafter.json -aea9e200a5d8423f9b89d12277b41a0e634da822 data/refinedstorage/recipes/coloring_recipes/orange_crafter_manager.json -72e809cb5368c39e11a9c8784ed52f7b3b113759 data/refinedstorage/recipes/coloring_recipes/orange_crafting_grid.json -c84132aafc80f1bb96510f3c214c728c227e8e3e data/refinedstorage/recipes/coloring_recipes/orange_crafting_monitor.json -3de0ad5cbb274b639eeed196e3fe9266a5ee66a2 data/refinedstorage/recipes/coloring_recipes/orange_detector.json -f416fb2f471d506705ef9226afd70c06054acbbb data/refinedstorage/recipes/coloring_recipes/orange_disk_manipulator.json -7623e61d106926e828b59a2033bc970b613f971d data/refinedstorage/recipes/coloring_recipes/orange_fluid_grid.json -69e8ecd66b19beacf8e0d416912b6dbdb15397b1 data/refinedstorage/recipes/coloring_recipes/orange_grid.json -e606c91940a4470c64fd75c0e0726bb53d2cd79a data/refinedstorage/recipes/coloring_recipes/orange_network_receiver.json -3ad75a64737dcc74b3296d7ddfe680c6c27eaae7 data/refinedstorage/recipes/coloring_recipes/orange_network_transmitter.json -ec1fb9cde89aeceb4cb73bbbbfdf59e96e6fe61c data/refinedstorage/recipes/coloring_recipes/orange_pattern_grid.json -8e6134a103c5f620544875707604aa7ce9468084 data/refinedstorage/recipes/coloring_recipes/orange_relay.json -902a1b07b7a1872cda544e45e63c7163812be06f data/refinedstorage/recipes/coloring_recipes/orange_security_manager.json -1e208aa44ac7a7f5d2516b320d68e80ff0116d21 data/refinedstorage/recipes/coloring_recipes/orange_wireless_transmitter.json -d211d5c465c9d58917e8410683a6c10564e88a9c data/refinedstorage/recipes/coloring_recipes/pattern_grid.json -5c8f14408f8ab02b688c25c4ab190b60d7b943f7 data/refinedstorage/recipes/coloring_recipes/pink_controller.json -704570330d0bbf48e4f32a0c72e60982d77588e7 data/refinedstorage/recipes/coloring_recipes/pink_crafter.json -e89fa20258089fa941504088ca249020d6099f84 data/refinedstorage/recipes/coloring_recipes/pink_crafter_manager.json -76ce8e0192b4093253e0de13bf60651772bf04ca data/refinedstorage/recipes/coloring_recipes/pink_crafting_grid.json -199fadb99c3bad3e76b0809f41c3a027d7e10e23 data/refinedstorage/recipes/coloring_recipes/pink_crafting_monitor.json -8ba5188fc962af69f727981aa0c8c3a55953918c data/refinedstorage/recipes/coloring_recipes/pink_detector.json -e12e9245fe51aad7f9c1f8e7da79984034854be7 data/refinedstorage/recipes/coloring_recipes/pink_disk_manipulator.json -c16c0947ebc3871a7074f9852134199cb7ead015 data/refinedstorage/recipes/coloring_recipes/pink_fluid_grid.json -15b35e05d14005a8934524b21d7cd38e0452a964 data/refinedstorage/recipes/coloring_recipes/pink_grid.json -a10cb456c4f6c318eb5def254ebed80df656b1db data/refinedstorage/recipes/coloring_recipes/pink_network_receiver.json -d29c626f8d371898e6399cb4163ca8b9a67ca393 data/refinedstorage/recipes/coloring_recipes/pink_network_transmitter.json -a201fc8b2ef6b25b69e7a6b2bd4d942ae818e110 data/refinedstorage/recipes/coloring_recipes/pink_pattern_grid.json -f0673170cabfe7662429c344ce4f6c8fd2659a34 data/refinedstorage/recipes/coloring_recipes/pink_relay.json -703171a8bc40565cd2a1c487148b8131819171ee data/refinedstorage/recipes/coloring_recipes/pink_security_manager.json -26cb17b58c8795d5a8a87b37120bfdabc1c6475e data/refinedstorage/recipes/coloring_recipes/pink_wireless_transmitter.json -01f446e8de03433d2956dd8aa68694dfb8fe4854 data/refinedstorage/recipes/coloring_recipes/purple_controller.json -3842de7e6ec64bac519583a3500ec28279adf33f data/refinedstorage/recipes/coloring_recipes/purple_crafter.json -c0cf0eef126db5fcd6973b4d0a89cef8bdcc8bae data/refinedstorage/recipes/coloring_recipes/purple_crafter_manager.json -f260e412b83077277ad8d63465409ce24fd000cf data/refinedstorage/recipes/coloring_recipes/purple_crafting_grid.json -948985ef70ce15397b8d0c01d2bed45b2c157ebb data/refinedstorage/recipes/coloring_recipes/purple_crafting_monitor.json -a82528cc886a24489179055da7b8bba4ba9799a7 data/refinedstorage/recipes/coloring_recipes/purple_detector.json -faaa04ec766f472df11d88d91cdf1b70525ad85a data/refinedstorage/recipes/coloring_recipes/purple_disk_manipulator.json -43ea1cf16c7680b4c1c41b2017edea0a40f4af15 data/refinedstorage/recipes/coloring_recipes/purple_fluid_grid.json -017bfdc66041ef8002eb63d871137efef6d81015 data/refinedstorage/recipes/coloring_recipes/purple_grid.json -fd0f4777f2a8f0eecbb73182fc9dc447fb3c1fb1 data/refinedstorage/recipes/coloring_recipes/purple_network_receiver.json -1315fd61fa0f080657fada1dd15e851aca47229b data/refinedstorage/recipes/coloring_recipes/purple_network_transmitter.json -13d4a960e61047377a1958d26165559f6fdbb4a5 data/refinedstorage/recipes/coloring_recipes/purple_pattern_grid.json -4669305ed45f28094f8ca8709b0ea3b28d6453e2 data/refinedstorage/recipes/coloring_recipes/purple_relay.json -83d5857d1d277e0fa48dc594b84e0c7e226eb9f1 data/refinedstorage/recipes/coloring_recipes/purple_security_manager.json -e6be7ef5c479999fda5fe5663f7d6dad1710dfea data/refinedstorage/recipes/coloring_recipes/purple_wireless_transmitter.json -1cf76a51fc44ffd724dfefc3b365db29c6f2828a data/refinedstorage/recipes/coloring_recipes/red_controller.json -4df3b856f68c17132fe9f9920c7f1a5a01371da4 data/refinedstorage/recipes/coloring_recipes/red_crafter.json -0aa39e705632087ae481a9a8f4be5fc87b999ec5 data/refinedstorage/recipes/coloring_recipes/red_crafter_manager.json -3a943c707119417ecc78755c9523b4482abd65b5 data/refinedstorage/recipes/coloring_recipes/red_crafting_grid.json -0800b0653448c68374c89c9bb00bf676d56b4a22 data/refinedstorage/recipes/coloring_recipes/red_crafting_monitor.json -40986a216cd673bc64cca9a83ae3621586a7b986 data/refinedstorage/recipes/coloring_recipes/red_detector.json -6c5ca03cf0c4eabbcfec9eee33d5a70e06ab68ff data/refinedstorage/recipes/coloring_recipes/red_disk_manipulator.json -afb301840e1588a4fc9ad088354b52d6f364a9cc data/refinedstorage/recipes/coloring_recipes/red_fluid_grid.json -6857791967c86fc1fccb4693d09a9c0c91592026 data/refinedstorage/recipes/coloring_recipes/red_grid.json -1ff53f539a34bc83bf69738c476e04b1354e7a9b data/refinedstorage/recipes/coloring_recipes/red_network_receiver.json -ef04758e952e5ba4702bf4746afc7fa4c35a509c data/refinedstorage/recipes/coloring_recipes/red_network_transmitter.json -ad8cb296ca95fc179c21046c66e1994170958432 data/refinedstorage/recipes/coloring_recipes/red_pattern_grid.json -4d5b0c3ac1e635db9b19b9891e1ab12776414249 data/refinedstorage/recipes/coloring_recipes/red_relay.json -ab9c6fcbf5ad432eb853d22daec0400ad2fc5669 data/refinedstorage/recipes/coloring_recipes/red_security_manager.json -a8c89376ddad7910d836aa9bd5f6a317de30fe89 data/refinedstorage/recipes/coloring_recipes/red_wireless_transmitter.json -65a0ceac2cc19ef24b19f54ba23aa1636e5dc1dd data/refinedstorage/recipes/coloring_recipes/relay.json -a9281e9756c70930a1c3f94f8ebaaa5ff0cf5547 data/refinedstorage/recipes/coloring_recipes/security_manager.json -8b259fe2ccba16a85f7cb96ab4b039caa67cd53a data/refinedstorage/recipes/coloring_recipes/white_controller.json -1408d60304592b67cc9461288559df561094ccfd data/refinedstorage/recipes/coloring_recipes/white_crafter.json -7b8893cf421438753a4132ac30bbb861377a4fff data/refinedstorage/recipes/coloring_recipes/white_crafter_manager.json -63421e7f82bd2311e67ad90c1e0990f6a560155d data/refinedstorage/recipes/coloring_recipes/white_crafting_grid.json -dfcd6ece904cb540951747bd20f7f41341dc66ce data/refinedstorage/recipes/coloring_recipes/white_crafting_monitor.json -d8ac7aa7db63e15a7a0a3ee42e59b13158e6dc34 data/refinedstorage/recipes/coloring_recipes/white_detector.json -a9edd1994829c66436e4e05f89334d2691427b93 data/refinedstorage/recipes/coloring_recipes/white_disk_manipulator.json -57806a3c5bc88a33ed1bdf94d66d05673feffbf6 data/refinedstorage/recipes/coloring_recipes/white_fluid_grid.json -228b5920207b184c1450912870864e8ee454bf50 data/refinedstorage/recipes/coloring_recipes/white_grid.json -49d7cf970f7c88c01f93e93280e73f0eb75cdb70 data/refinedstorage/recipes/coloring_recipes/white_network_receiver.json -1fc9568140c09a650847111d06d9609a3935717f data/refinedstorage/recipes/coloring_recipes/white_network_transmitter.json -202caaf362d8fdd7e402c60d5955ea8f0d781d92 data/refinedstorage/recipes/coloring_recipes/white_pattern_grid.json -03c458d219fd78d0a39678667bd89e072a1cef3f data/refinedstorage/recipes/coloring_recipes/white_relay.json -2c86843aa04ac4846c6b90c2c2b3622260483eef data/refinedstorage/recipes/coloring_recipes/white_security_manager.json -1215c9c617caee3bd1c07b44c121ae4517cfc297 data/refinedstorage/recipes/coloring_recipes/white_wireless_transmitter.json -c61c8b9f60a81772c9bba80be817e510bf4737e0 data/refinedstorage/recipes/coloring_recipes/wireless_transmitter.json -5eed3896220e097e18f25121ec7f0aa06d97968f data/refinedstorage/recipes/coloring_recipes/yellow_controller.json -d5ca999679d799db5c3412fe273e2bae541dec0e data/refinedstorage/recipes/coloring_recipes/yellow_crafter.json -1376b81e617723f4ab70cb5e21d6c65e2839d78e data/refinedstorage/recipes/coloring_recipes/yellow_crafter_manager.json -935428c1e044662b4846248eb01c138311971783 data/refinedstorage/recipes/coloring_recipes/yellow_crafting_grid.json -b3fe995e5ff3196cfdca9bb31c6b6a233db2fe90 data/refinedstorage/recipes/coloring_recipes/yellow_crafting_monitor.json -50db59b6c5e5d7ac8bfeb5ae8ba85adb9d7c8e2f data/refinedstorage/recipes/coloring_recipes/yellow_detector.json -2f92ed11dd9454134c058d26fdebc2360d10b995 data/refinedstorage/recipes/coloring_recipes/yellow_disk_manipulator.json -8244398eb5ef83772061d18f80ec0533d5e17e49 data/refinedstorage/recipes/coloring_recipes/yellow_fluid_grid.json -fa69dd9084a823eeffb822362597ef0c8b9c801a data/refinedstorage/recipes/coloring_recipes/yellow_grid.json -0b3c0a956d56741bfa3d4d417a830f51efe1125a data/refinedstorage/recipes/coloring_recipes/yellow_network_receiver.json -47242f42550806491ea3b8c31c91fa5f0df52bb0 data/refinedstorage/recipes/coloring_recipes/yellow_network_transmitter.json -31534db642044ed40fc7cc39080903811a645e5d data/refinedstorage/recipes/coloring_recipes/yellow_pattern_grid.json -e33fbaf1da1172cf377c369f9a1dd58c2ad466ae data/refinedstorage/recipes/coloring_recipes/yellow_relay.json -e25a362ba991fd8714bb1e9f9b9099cc24cbbf2c data/refinedstorage/recipes/coloring_recipes/yellow_security_manager.json -43c2bed7016a495bf7f017987a27d5b7bafcc177 data/refinedstorage/recipes/coloring_recipes/yellow_wireless_transmitter.json -ee1f54b6cab588ebb0a9f29335b3bdb3d592afd6 data/refinedstorage/recipes/crafting_grid/black_crafting_grid.json -6e389a78f586b516535b4f54a474bd7ec98b9036 data/refinedstorage/recipes/crafting_grid/blue_crafting_grid.json -1a103d299622602cc22fd7d32b6511cb1482859b data/refinedstorage/recipes/crafting_grid/brown_crafting_grid.json -526505b90386663e00c12db3121e14583af04324 data/refinedstorage/recipes/crafting_grid/crafting_grid.json -9d0a6751d8985e232430081bcf14c32f949b1c47 data/refinedstorage/recipes/crafting_grid/cyan_crafting_grid.json -b2c034582cdd9bfae13587a4a207b4c2506e9004 data/refinedstorage/recipes/crafting_grid/gray_crafting_grid.json -8f3daed482212f6c482306e4dbcf027401d7ea92 data/refinedstorage/recipes/crafting_grid/green_crafting_grid.json -6a48f0e0c4884e6d8e34701cd7c8484291682e5c data/refinedstorage/recipes/crafting_grid/light_gray_crafting_grid.json -5c534ef9321b1e82ce59cfb9e0587b9763a2267f data/refinedstorage/recipes/crafting_grid/lime_crafting_grid.json -870b0d50d06cfa4847c471cac276316b6f068115 data/refinedstorage/recipes/crafting_grid/magenta_crafting_grid.json -140fd531765896bb218c96dd034777ed8d4f83ef data/refinedstorage/recipes/crafting_grid/orange_crafting_grid.json -329072753d547c6d62f8b61ea6fdd372bed9e3af data/refinedstorage/recipes/crafting_grid/pink_crafting_grid.json -a214bf0f2ed9778db4cf866231fb16fcfc002fcf data/refinedstorage/recipes/crafting_grid/purple_crafting_grid.json -de13dc056e67aef2ea5013e07e5a73747652cdc6 data/refinedstorage/recipes/crafting_grid/red_crafting_grid.json -0e67c973036f6d42d5c507f4e4007519be615c72 data/refinedstorage/recipes/crafting_grid/white_crafting_grid.json -017646aef9636a44a004b8ad5ed26a9245afc511 data/refinedstorage/recipes/crafting_grid/yellow_crafting_grid.json -a34c701c4a44af184eb3ba52a86d09346cbcc2b2 data/refinedstorage/recipes/fluid_grid/black_fluid_grid.json -7cde41ab1655396a52b655713676c6fc5b2485cf data/refinedstorage/recipes/fluid_grid/blue_fluid_grid.json -d8af85839faeed6d34e82072c2dd707d6dcba5d9 data/refinedstorage/recipes/fluid_grid/brown_fluid_grid.json -1dceb50e170cb2b2dbef95fb590887b96f778738 data/refinedstorage/recipes/fluid_grid/cyan_fluid_grid.json -d314d7a836ff2db5c901108f2ae89204acb731d4 data/refinedstorage/recipes/fluid_grid/fluid_grid.json -8358a1736296437b8d9c8b41e24620b384744de7 data/refinedstorage/recipes/fluid_grid/gray_fluid_grid.json -7d803acdeac2df8cca9112a5cbe8921da491ca20 data/refinedstorage/recipes/fluid_grid/green_fluid_grid.json -c336859191d77c9e62e1e201edc9eb3d9b262d8a data/refinedstorage/recipes/fluid_grid/light_gray_fluid_grid.json -cb2d6d9c9610a243870c1d5436f4d04093342e8f data/refinedstorage/recipes/fluid_grid/lime_fluid_grid.json -906f639b043a3dc22f24f8c9d20da71a4c602e11 data/refinedstorage/recipes/fluid_grid/magenta_fluid_grid.json -8c4b11e8b932cffd65c82f7c7c97458354308951 data/refinedstorage/recipes/fluid_grid/orange_fluid_grid.json -a02e4ed62a9a11f9ceef996c0078459b76f9ceca data/refinedstorage/recipes/fluid_grid/pink_fluid_grid.json -d1dae917050304b9cab40440054d38d72a2c2f0d data/refinedstorage/recipes/fluid_grid/purple_fluid_grid.json -4de78d732ff3bbdc16c3ec2220af05484b038fef data/refinedstorage/recipes/fluid_grid/red_fluid_grid.json -c290a551fd5edc6b6800b09228d9943a2f7991bd data/refinedstorage/recipes/fluid_grid/white_fluid_grid.json -af4bec7fabada4ead0ff97886896afe4cd341223 data/refinedstorage/recipes/fluid_grid/yellow_fluid_grid.json -5162e25bbdb826dff00c0abe4ba5cf33b338cfcb data/refinedstorage/recipes/pattern_grid/black_pattern_grid.json -975247468c187aaaa39a6c7034b265990a86615d data/refinedstorage/recipes/pattern_grid/blue_pattern_grid.json -99aeaed131b7d92e50fa7f0481dfce09dd95d61b data/refinedstorage/recipes/pattern_grid/brown_pattern_grid.json -6b67469d1654e480e138711ac905fa25354625eb data/refinedstorage/recipes/pattern_grid/cyan_pattern_grid.json -dd618e1101166427aa34251119daab9e46073ceb data/refinedstorage/recipes/pattern_grid/gray_pattern_grid.json -49fe95afe6e52175bd0b57f8dc7921d19406a266 data/refinedstorage/recipes/pattern_grid/green_pattern_grid.json -59cd612b05c8f972509302616ba4a7a6c77ea9a9 data/refinedstorage/recipes/pattern_grid/light_gray_pattern_grid.json -415c986190b6c41547d8c01e3e3ab63e68d092a1 data/refinedstorage/recipes/pattern_grid/lime_pattern_grid.json -de297b46bdca8de905d5edb847bcdae01ff96bb5 data/refinedstorage/recipes/pattern_grid/magenta_pattern_grid.json -9c9a108549b267fd1bc8d62cd1a8b20e13f94713 data/refinedstorage/recipes/pattern_grid/orange_pattern_grid.json -5368d0050d960ff19747637e4df5fa478d55f025 data/refinedstorage/recipes/pattern_grid/pattern_grid.json -f7ec08070c9ea50a614731adc57d07b94cdd3853 data/refinedstorage/recipes/pattern_grid/pink_pattern_grid.json -80d0b261e2e26ec53c6f2e943b84cafe532700b4 data/refinedstorage/recipes/pattern_grid/purple_pattern_grid.json -f60de4928bb466ca6c9010d07817963f771caa94 data/refinedstorage/recipes/pattern_grid/red_pattern_grid.json -a4be089e23d8452846198b5c273fd2bcc77266ca data/refinedstorage/recipes/pattern_grid/white_pattern_grid.json -c1672fda10e2f1326c8dfea6b0379cda5156a9e7 data/refinedstorage/recipes/pattern_grid/yellow_pattern_grid.json -0b7b05fd6b7942263c550e1ac28029c34a2d1df3 data/refinedstorage/tags/blocks/controller.json -55a19599ea37daf13407b2f2cfb8499f8ba0460d data/refinedstorage/tags/blocks/crafter.json -a7e857fa1054067960733aeba34648b19ef7b6c0 data/refinedstorage/tags/blocks/crafter_manager.json -65535d054b0c6adaefaf96d73a03d2c1bcfcbd12 data/refinedstorage/tags/blocks/crafting_grid.json -dc6d041c09fccabd495c8f0edcd10ab07aafb4f5 data/refinedstorage/tags/blocks/crafting_monitor.json -e3f2ad6beb27c3ab1e78d149050e0184c327cef0 data/refinedstorage/tags/blocks/creative_controller.json -a46c335e9b9fe849307b6bda03ac1b62e43c8e5e data/refinedstorage/tags/blocks/detector.json -4d6cf8175e66ad05a36b03d2e1ba3ee55fbf150f data/refinedstorage/tags/blocks/disk_manipulator.json -b047ec7509a9adb5bdd7d7d7915211e27ecd51ae data/refinedstorage/tags/blocks/fluid_grid.json -6cef1d9ca36a6f9b90188e8d1872e8b5d498b224 data/refinedstorage/tags/blocks/grid.json -160871a29dcd72d0212afeb40462f36549f12725 data/refinedstorage/tags/blocks/network_receiver.json -fa7ffed55c5cf1f96d0762495765d7e2be4ac89a data/refinedstorage/tags/blocks/network_transmitter.json -428fd07b2f9098024738edb68efd338aed5f9723 data/refinedstorage/tags/blocks/pattern_grid.json -cddb4a7aa4728aa0af85a16cbc52c87c25e95366 data/refinedstorage/tags/blocks/relay.json -b9f5ac8ab978b8a5328fa480bc8a4d7bd2c307f2 data/refinedstorage/tags/blocks/security_manager.json -46aed661692d3d4b26880e4b293b8892ce440706 data/refinedstorage/tags/blocks/wireless_transmitter.json -0b7b05fd6b7942263c550e1ac28029c34a2d1df3 data/refinedstorage/tags/items/controller.json -55a19599ea37daf13407b2f2cfb8499f8ba0460d data/refinedstorage/tags/items/crafter.json -a7e857fa1054067960733aeba34648b19ef7b6c0 data/refinedstorage/tags/items/crafter_manager.json -65535d054b0c6adaefaf96d73a03d2c1bcfcbd12 data/refinedstorage/tags/items/crafting_grid.json -dc6d041c09fccabd495c8f0edcd10ab07aafb4f5 data/refinedstorage/tags/items/crafting_monitor.json -a46c335e9b9fe849307b6bda03ac1b62e43c8e5e data/refinedstorage/tags/items/detector.json -4d6cf8175e66ad05a36b03d2e1ba3ee55fbf150f data/refinedstorage/tags/items/disk_manipulator.json -b047ec7509a9adb5bdd7d7d7915211e27ecd51ae data/refinedstorage/tags/items/fluid_grid.json -6cef1d9ca36a6f9b90188e8d1872e8b5d498b224 data/refinedstorage/tags/items/grid.json -160871a29dcd72d0212afeb40462f36549f12725 data/refinedstorage/tags/items/network_receiver.json -fa7ffed55c5cf1f96d0762495765d7e2be4ac89a data/refinedstorage/tags/items/network_transmitter.json -428fd07b2f9098024738edb68efd338aed5f9723 data/refinedstorage/tags/items/pattern_grid.json -cddb4a7aa4728aa0af85a16cbc52c87c25e95366 data/refinedstorage/tags/items/relay.json -b9f5ac8ab978b8a5328fa480bc8a4d7bd2c307f2 data/refinedstorage/tags/items/security_manager.json -46aed661692d3d4b26880e4b293b8892ce440706 data/refinedstorage/tags/items/wireless_transmitter.json diff --git a/src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 b/src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 new file mode 100644 index 000000000..d0ed1eb30 --- /dev/null +++ b/src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 @@ -0,0 +1,16 @@ +// 1.20.1 2023-07-03T11:19:34.4829224 Tags for minecraft:item mod id refinedstorage +061bf4c2f3bdd530115615f2b04e55c2602908bd data/refinedstorage/tags/items/controller.json +407a16e5d941c69915f75b135a13e9144cc9c43e data/refinedstorage/tags/items/crafter.json +dc1342f1d3e6a4cd8eaaa52429a011c10c6c2d96 data/refinedstorage/tags/items/crafter_manager.json +2f8fee222ac543909ae06a35de3c08e3e19f4f4b data/refinedstorage/tags/items/crafting_grid.json +bf4f4ed5b02babe4717894e4823d5541d69dbfe6 data/refinedstorage/tags/items/crafting_monitor.json +6abdee7222576fd0b2da7f86954e35ca8cab4d25 data/refinedstorage/tags/items/detector.json +7b9c6d4ef32d5e63c327d71a8758f8b900ac9cb6 data/refinedstorage/tags/items/disk_manipulator.json +651ca3794c0a1c28aa275a9814de7fdc04c90653 data/refinedstorage/tags/items/fluid_grid.json +31a65b9d23f79a0191f78ba46c5ed39942d38023 data/refinedstorage/tags/items/grid.json +295fce6281b688f4992b1181c58e9a52c80465a1 data/refinedstorage/tags/items/network_receiver.json +37ea6fd2ffdb762fb9351359ddf9cc0f401bbbf5 data/refinedstorage/tags/items/network_transmitter.json +9dae822d3373a348a6ab4e11de2056f369a0253b data/refinedstorage/tags/items/pattern_grid.json +52c8060208bf763f487313b8de6243550cc2f63a data/refinedstorage/tags/items/relay.json +555b5c80da6838aa2a4d8f5044276852b1bc525d data/refinedstorage/tags/items/security_manager.json +e740b41d26fe5be1b6251db461627b8e5e5925aa data/refinedstorage/tags/items/wireless_transmitter.json diff --git a/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e b/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e new file mode 100644 index 000000000..be9c673fa --- /dev/null +++ b/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e @@ -0,0 +1,18 @@ +// 1.20.1 2023-07-03T11:19:34.5471111 Tags for minecraft:block mod id refinedstorage +3f3a0c830f4ddc021ae2c2a36f75311d8df1fb2e data/forge/tags/blocks/relocation_not_supported.json +061bf4c2f3bdd530115615f2b04e55c2602908bd data/refinedstorage/tags/blocks/controller.json +407a16e5d941c69915f75b135a13e9144cc9c43e data/refinedstorage/tags/blocks/crafter.json +dc1342f1d3e6a4cd8eaaa52429a011c10c6c2d96 data/refinedstorage/tags/blocks/crafter_manager.json +2f8fee222ac543909ae06a35de3c08e3e19f4f4b data/refinedstorage/tags/blocks/crafting_grid.json +bf4f4ed5b02babe4717894e4823d5541d69dbfe6 data/refinedstorage/tags/blocks/crafting_monitor.json +4c7059780d3896d0f042e88076b8a0326e0cf86d data/refinedstorage/tags/blocks/creative_controller.json +6abdee7222576fd0b2da7f86954e35ca8cab4d25 data/refinedstorage/tags/blocks/detector.json +7b9c6d4ef32d5e63c327d71a8758f8b900ac9cb6 data/refinedstorage/tags/blocks/disk_manipulator.json +651ca3794c0a1c28aa275a9814de7fdc04c90653 data/refinedstorage/tags/blocks/fluid_grid.json +31a65b9d23f79a0191f78ba46c5ed39942d38023 data/refinedstorage/tags/blocks/grid.json +295fce6281b688f4992b1181c58e9a52c80465a1 data/refinedstorage/tags/blocks/network_receiver.json +37ea6fd2ffdb762fb9351359ddf9cc0f401bbbf5 data/refinedstorage/tags/blocks/network_transmitter.json +9dae822d3373a348a6ab4e11de2056f369a0253b data/refinedstorage/tags/blocks/pattern_grid.json +52c8060208bf763f487313b8de6243550cc2f63a data/refinedstorage/tags/blocks/relay.json +555b5c80da6838aa2a4d8f5044276852b1bc525d data/refinedstorage/tags/blocks/security_manager.json +e740b41d26fe5be1b6251db461627b8e5e5925aa data/refinedstorage/tags/blocks/wireless_transmitter.json diff --git a/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a b/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a new file mode 100644 index 000000000..7c582666b --- /dev/null +++ b/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a @@ -0,0 +1,771 @@ +// 1.20.1 2023-07-03T11:19:34.5335391 Block States: refinedstorage +7b69e3ab3a7471a50e264579d36c04adb8acad35 assets/refinedstorage/blockstates/black_controller.json +c87045bd089212825bdd0f06b0d25e7bcf0e3f5d assets/refinedstorage/blockstates/black_crafter.json +999fe91e1661d6b45f9c29878f06438b3b5919dc assets/refinedstorage/blockstates/black_crafter_manager.json +6dfbf26cac2596445fce1b6bae6df2e3b161100a assets/refinedstorage/blockstates/black_crafting_grid.json +cad10d852489b5c9f7bc570d658bc2d3503da7d7 assets/refinedstorage/blockstates/black_crafting_monitor.json +7b69e3ab3a7471a50e264579d36c04adb8acad35 assets/refinedstorage/blockstates/black_creative_controller.json +16e7f975097055171aa436c1a632715a9ef8341a assets/refinedstorage/blockstates/black_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/black_disk_manipulator.json +2d65d70d315150a429448eae15cd20045596d27b assets/refinedstorage/blockstates/black_fluid_grid.json +2a89227c1e5c69cf378001ec5c804e8057b94925 assets/refinedstorage/blockstates/black_grid.json +fb8aa2633b61db8bc3c6a0e4baac65089c48fc43 assets/refinedstorage/blockstates/black_network_receiver.json +05ffd20caf7ca4db1806b9d0872b32804966368d assets/refinedstorage/blockstates/black_network_transmitter.json +728791ad72200b43e0e873405aff863faaa0d667 assets/refinedstorage/blockstates/black_pattern_grid.json +808e7192637fba2b5dff521b0b8830f9f62ca819 assets/refinedstorage/blockstates/black_relay.json +e5c9aaad492c8643c7e82b9b8cdaa3bcbd1068e6 assets/refinedstorage/blockstates/black_security_manager.json +d749ab3e2d6aae2c4ac4610850791d4e0ba31b72 assets/refinedstorage/blockstates/black_wireless_transmitter.json +c259424f1ef73c4dc12d770ba1c47fcf965e6175 assets/refinedstorage/blockstates/blue_controller.json +0b1e46e3502ef5dc39129f01e77423842f378523 assets/refinedstorage/blockstates/blue_crafter.json +667d3a36aa89313f5ded585f8ada125a0380ea61 assets/refinedstorage/blockstates/blue_crafter_manager.json +32a82613e09f6c5dc5dfa9ee6b0b7901518af5f4 assets/refinedstorage/blockstates/blue_crafting_grid.json +274b86b9b6df510a58e65ca7b80529d1ba88c699 assets/refinedstorage/blockstates/blue_crafting_monitor.json +c259424f1ef73c4dc12d770ba1c47fcf965e6175 assets/refinedstorage/blockstates/blue_creative_controller.json +d71686564d14b615681df9140c6b4d6d948673cd assets/refinedstorage/blockstates/blue_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/blue_disk_manipulator.json +3822722dbfebcac426e9d07a8fbad76a3c72f106 assets/refinedstorage/blockstates/blue_fluid_grid.json +031ee9de046949535200ccf5e1a5e9439adbb282 assets/refinedstorage/blockstates/blue_grid.json +9ccd5c6695f09476c0a6c1af1728809efea90054 assets/refinedstorage/blockstates/blue_network_receiver.json +b20dd47441068c7b8ed38c4ed4c857f6e0ec0b0b assets/refinedstorage/blockstates/blue_network_transmitter.json +a9fb566f3c1f6779ef2b03ec847d6736beab92cd assets/refinedstorage/blockstates/blue_pattern_grid.json +3fae9d1e68030dbcbbaeb4534a39e915b1c8f976 assets/refinedstorage/blockstates/blue_relay.json +69dac9e3833cd351672467aa34e19f2bf466cfe7 assets/refinedstorage/blockstates/blue_security_manager.json +4566b01a555b7307bf1ea8390def853089a69d49 assets/refinedstorage/blockstates/blue_wireless_transmitter.json +b78e4501f02364499a0aeaf599eb32fc010f1c58 assets/refinedstorage/blockstates/brown_controller.json +965abf8e749ac0cf7b585946dfa5ea5898fdc9d9 assets/refinedstorage/blockstates/brown_crafter.json +27b1077b0aa443abadd855ff340e10504ae6faec assets/refinedstorage/blockstates/brown_crafter_manager.json +d01e8708c28a9aeb6658510d7aa767294607dc97 assets/refinedstorage/blockstates/brown_crafting_grid.json +94e4f8e400897059d52362997170ffcae2291340 assets/refinedstorage/blockstates/brown_crafting_monitor.json +b78e4501f02364499a0aeaf599eb32fc010f1c58 assets/refinedstorage/blockstates/brown_creative_controller.json +caa950648cde215f3110c9530a3916c38a578f61 assets/refinedstorage/blockstates/brown_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/brown_disk_manipulator.json +ecf5814b4e50a7ef37e3bbcc383ea0540ff34bc8 assets/refinedstorage/blockstates/brown_fluid_grid.json +f67203e2d420ee9b164432a6c631c1045c0839f3 assets/refinedstorage/blockstates/brown_grid.json +a8af2cefa692c0485a61fd932cb9dbf3336a94b7 assets/refinedstorage/blockstates/brown_network_receiver.json +b26700458e89654d8c180da1997f309532366ae0 assets/refinedstorage/blockstates/brown_network_transmitter.json +1953b72641278b83ab9102612d21e8308dacc1ab assets/refinedstorage/blockstates/brown_pattern_grid.json +449f908d91689f0750bfa9ea15212cdf884f8d37 assets/refinedstorage/blockstates/brown_relay.json +b2bc3d1c93df4307a16eb3df245418318ba08b0f assets/refinedstorage/blockstates/brown_security_manager.json +3ef998a83b2388ba0133c6d5fe9d3d96ee9823b5 assets/refinedstorage/blockstates/brown_wireless_transmitter.json +6bebb7848ef81448082cb992878e5468cda66d3b assets/refinedstorage/blockstates/controller.json +66a78b99df31444ee80aaf5790fdf29a5fb97c67 assets/refinedstorage/blockstates/crafter.json +711443d364ea85b23bd61902e4cfec0897175b36 assets/refinedstorage/blockstates/crafter_manager.json +9fdd6f844061b5d7eb5dc141f9a087a33e7297cd assets/refinedstorage/blockstates/crafting_grid.json +c0f0ae43414371d80a42639792bb8845da5f06b7 assets/refinedstorage/blockstates/crafting_monitor.json +6bebb7848ef81448082cb992878e5468cda66d3b assets/refinedstorage/blockstates/creative_controller.json +32ed126a06d3cfadeaffdb5f72a92d0992841bf1 assets/refinedstorage/blockstates/cyan_controller.json +90b9eb7f6ca9f3b3d0c6db53553abfc74236e9fe assets/refinedstorage/blockstates/cyan_crafter.json +c07193099f8241889ef04dae18a2a57ab31f0e64 assets/refinedstorage/blockstates/cyan_crafter_manager.json +e25b53ada26df3ac55b532b0e5a8b7d1378f8f6e assets/refinedstorage/blockstates/cyan_crafting_grid.json +70a431cfe0a7b6049ad2c4d8da449b523151db70 assets/refinedstorage/blockstates/cyan_crafting_monitor.json +32ed126a06d3cfadeaffdb5f72a92d0992841bf1 assets/refinedstorage/blockstates/cyan_creative_controller.json +d39cb51f414057d970a458dfea5c191ec7ba06b0 assets/refinedstorage/blockstates/cyan_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/cyan_disk_manipulator.json +0b59eab2a3214c33ea7fdd50198e4f3943ea9cdb assets/refinedstorage/blockstates/cyan_fluid_grid.json +e2c86885cf2995be56fdc0728e9e900021583cd5 assets/refinedstorage/blockstates/cyan_grid.json +349ef6721ac006319818a900a9f2fef402b9c1c1 assets/refinedstorage/blockstates/cyan_network_receiver.json +02875332d7cc05994f93f7d08d7f33f5f4692575 assets/refinedstorage/blockstates/cyan_network_transmitter.json +b0452599b5e58599d488d497f1d64f2086d8f045 assets/refinedstorage/blockstates/cyan_pattern_grid.json +f03e4611123ae67fb17aadc4ea23c00b94724e06 assets/refinedstorage/blockstates/cyan_relay.json +bf496398c00ca9e5421afa96a3c309b2b9a09b78 assets/refinedstorage/blockstates/cyan_security_manager.json +9cc1f2365298c5d92edc078988c162ca12ee1b58 assets/refinedstorage/blockstates/cyan_wireless_transmitter.json +54c8d36899d719e379d0f45c48aae5938711825c assets/refinedstorage/blockstates/detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/disk_manipulator.json +dad2436c0b678d06dc5568506c83f8acc3227e09 assets/refinedstorage/blockstates/fluid_grid.json +bbadd742d5662d38447d6d8242c074816e227242 assets/refinedstorage/blockstates/gray_controller.json +547ef6ae4c9797e02bc0ebe3c6f51c9959bd7a0b assets/refinedstorage/blockstates/gray_crafter.json +45995d7e5902cf8f93c679df972915d6af8970a9 assets/refinedstorage/blockstates/gray_crafter_manager.json +5bc03e1cb45ffa4e68813dfdb6a08c83275d519a assets/refinedstorage/blockstates/gray_crafting_grid.json +3e50d6bc784f38230a670ca079c48a9313047b00 assets/refinedstorage/blockstates/gray_crafting_monitor.json +bbadd742d5662d38447d6d8242c074816e227242 assets/refinedstorage/blockstates/gray_creative_controller.json +aa366bb135b9ea8f5015a16d31bb044634186baa assets/refinedstorage/blockstates/gray_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/gray_disk_manipulator.json +67fee64c36afe0e98dc75921c7a3f59d712fb194 assets/refinedstorage/blockstates/gray_fluid_grid.json +19e248101a9be45e302512a47bd047da7799474f assets/refinedstorage/blockstates/gray_grid.json +f7f6f6c790e006776bf86b69646d1ff40e77b077 assets/refinedstorage/blockstates/gray_network_receiver.json +82e103363281a88aeec3677838c92835f2377b89 assets/refinedstorage/blockstates/gray_network_transmitter.json +80604de4035aca7788b911888d33d1c4d73c73e6 assets/refinedstorage/blockstates/gray_pattern_grid.json +d3b748f6d6499cb1d25b75f0416672007e2c8427 assets/refinedstorage/blockstates/gray_relay.json +fde90f14de4329db7c8acff70e03d5807435af90 assets/refinedstorage/blockstates/gray_security_manager.json +66c222b50b4bca71aa058b708259efd7b4a5515d assets/refinedstorage/blockstates/gray_wireless_transmitter.json +eaedbfdf6c84624f585530b187613d35da49220e assets/refinedstorage/blockstates/green_controller.json +40a39c28577f7c8754ccef601cf271d36c013c75 assets/refinedstorage/blockstates/green_crafter.json +12414cdabaf1ea9c9a48afce88f0535ac63218a1 assets/refinedstorage/blockstates/green_crafter_manager.json +118ccfc4cb3ba98ade2f85771b8fa7850a8b39d5 assets/refinedstorage/blockstates/green_crafting_grid.json +a9391e55df0b63c7223e21c71f867c19ec87091a assets/refinedstorage/blockstates/green_crafting_monitor.json +eaedbfdf6c84624f585530b187613d35da49220e assets/refinedstorage/blockstates/green_creative_controller.json +671bdde024f725835b8d7c70294666d67d013905 assets/refinedstorage/blockstates/green_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/green_disk_manipulator.json +9ae0a3edbd87718686e42978e70725e170cd2e3a assets/refinedstorage/blockstates/green_fluid_grid.json +5d5a7cdf0fafae953b3a6d7bc0773eafd0bb36d1 assets/refinedstorage/blockstates/green_grid.json +1f68b48cce41bb6bef4c1499b4cf82873f3f4d23 assets/refinedstorage/blockstates/green_network_receiver.json +ad9ae867a12847c3a33451c315459660133f988e assets/refinedstorage/blockstates/green_network_transmitter.json +cb26162f351bf30aed31b993851156334371beac assets/refinedstorage/blockstates/green_pattern_grid.json +2df12e30a33dfe832a61465727cedc1ce9d4a808 assets/refinedstorage/blockstates/green_relay.json +c9bfb5d4002df591d9ac35054e719340799e7f52 assets/refinedstorage/blockstates/green_security_manager.json +53d5e92bf89fdf857816ebc8af61763c5aca0fa1 assets/refinedstorage/blockstates/green_wireless_transmitter.json +b3389b5e12d6bf8f1a4aab9281b5c3dee442da75 assets/refinedstorage/blockstates/grid.json +47f2adbd7d2a25cd564556f44b028459306d17d9 assets/refinedstorage/blockstates/light_gray_controller.json +9947ef84be868d3d911e386c09519db9eb5a87f5 assets/refinedstorage/blockstates/light_gray_crafter.json +0f66d91089d5e55e652ce8b7aee06bb0710bf2c3 assets/refinedstorage/blockstates/light_gray_crafter_manager.json +62f1453961eb0aa4bde17417a6d74759489c7db6 assets/refinedstorage/blockstates/light_gray_crafting_grid.json +4f49c3a2ed3fb80739efaa40c590bacee28ccd18 assets/refinedstorage/blockstates/light_gray_crafting_monitor.json +47f2adbd7d2a25cd564556f44b028459306d17d9 assets/refinedstorage/blockstates/light_gray_creative_controller.json +29d62af6861ef704d341f156e2b8ba422d2bc815 assets/refinedstorage/blockstates/light_gray_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/light_gray_disk_manipulator.json +0b83619570c7fd6276e63db434ab586964001e49 assets/refinedstorage/blockstates/light_gray_fluid_grid.json +58c51e122a1a6dc3ae49236e51b5ced8dd65f025 assets/refinedstorage/blockstates/light_gray_grid.json +291eca6f29ecb96d444d2239296681f06863abc2 assets/refinedstorage/blockstates/light_gray_network_receiver.json +7e9130f18c7c65a21040770b227062514cb64fe1 assets/refinedstorage/blockstates/light_gray_network_transmitter.json +2f51485ac6f31c6fc7f2c4b40dd6512ed191f441 assets/refinedstorage/blockstates/light_gray_pattern_grid.json +8d872d41d7c5d7938323ed7f1c0dfeb052e475d1 assets/refinedstorage/blockstates/light_gray_relay.json +568c5af660f6e73cbed6a0d71c1e7cd104789f38 assets/refinedstorage/blockstates/light_gray_security_manager.json +e04c8bfa9649765ff0faa30e8399786d56082006 assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json +9664192d13467956a09e888ca2842539beb097dd assets/refinedstorage/blockstates/lime_controller.json +569b62896e4ae49fd7979d028950a7c908eade31 assets/refinedstorage/blockstates/lime_crafter.json +f05e8def107036b057cfadd75cfc52f08da5978b assets/refinedstorage/blockstates/lime_crafter_manager.json +b01d62bbba055517755be182585aec9972775111 assets/refinedstorage/blockstates/lime_crafting_grid.json +1d5b0778259ae1c2f1ca523f8f1b6e6353935d51 assets/refinedstorage/blockstates/lime_crafting_monitor.json +9664192d13467956a09e888ca2842539beb097dd assets/refinedstorage/blockstates/lime_creative_controller.json +ad9f60051001a52e0b10b12e37f6210b05e2cc8d assets/refinedstorage/blockstates/lime_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/lime_disk_manipulator.json +4521dfe3f69c6168e1d72fff247ee3a3d361ff0d assets/refinedstorage/blockstates/lime_fluid_grid.json +6b5b6be70adbbc6eea356f00d7395dd2d181359c assets/refinedstorage/blockstates/lime_grid.json +f1af8de9b654aac6c1e67ad5e6cd03ab7ad36b2d assets/refinedstorage/blockstates/lime_network_receiver.json +ecd69149921b551c1dc18f6df43d703e83a68109 assets/refinedstorage/blockstates/lime_network_transmitter.json +f0bbcee38acf700e7598ec2256dec30359f6dade assets/refinedstorage/blockstates/lime_pattern_grid.json +50bcc8668c59ea7cc18307dc9a66710bb64a01a8 assets/refinedstorage/blockstates/lime_relay.json +186f9f08d55c7eed41bdf20224a29c1da86116b1 assets/refinedstorage/blockstates/lime_security_manager.json +31f6b78d9517e14f2eaee154b2bd016b8d122e99 assets/refinedstorage/blockstates/lime_wireless_transmitter.json +260ee50fd5b48a884478722a48d1a30718011b71 assets/refinedstorage/blockstates/magenta_controller.json +a4fd0d98391e23b4fb5eeb263aa4b3a4a0e8463c assets/refinedstorage/blockstates/magenta_crafter.json +334f9cd98067974c61d760b955499868cade5541 assets/refinedstorage/blockstates/magenta_crafter_manager.json +6120e96957450ae3ddae9f45159144d6bd5eba88 assets/refinedstorage/blockstates/magenta_crafting_grid.json +f37fd6d2cf884ea50df0e3498d4a1c79ab119643 assets/refinedstorage/blockstates/magenta_crafting_monitor.json +260ee50fd5b48a884478722a48d1a30718011b71 assets/refinedstorage/blockstates/magenta_creative_controller.json +be4821c7ef7e2e092182daeae240ca64ac64109c assets/refinedstorage/blockstates/magenta_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/magenta_disk_manipulator.json +015ec2f4a5391216b726c6f3a04e207aef8eb73f assets/refinedstorage/blockstates/magenta_fluid_grid.json +4df8d4e340437e044e274b93cbd3f530481b9a9c assets/refinedstorage/blockstates/magenta_grid.json +52ba7a0be6c7745dcf6c8dce2ee714c3e435a6be assets/refinedstorage/blockstates/magenta_network_receiver.json +10dd4186b77550077274cf71093f9ed5e669f6f7 assets/refinedstorage/blockstates/magenta_network_transmitter.json +0cd180c166969d567fd19b20335b3a79c58a5b5a assets/refinedstorage/blockstates/magenta_pattern_grid.json +cd0a58993fd70d4f45125bba65df310cf636e8b6 assets/refinedstorage/blockstates/magenta_relay.json +97be2ff3849c198bb435104273d6242b2394ed26 assets/refinedstorage/blockstates/magenta_security_manager.json +448d11572eb6e83a9c83bdc59a5db04b0bdf4055 assets/refinedstorage/blockstates/magenta_wireless_transmitter.json +c02181173dfdc836b36270f2d53047e768bd4d65 assets/refinedstorage/blockstates/network_receiver.json +d7ceb07865dd4532faa78a2292e35c6b47d5b5af assets/refinedstorage/blockstates/network_transmitter.json +59cbfcaabd03f853aca3f60329a7c95cb787c8e6 assets/refinedstorage/blockstates/orange_controller.json +c2e934d8f8332b9ef9f4860e0c5f5fc3e437fa9c assets/refinedstorage/blockstates/orange_crafter.json +827f42cfab50b0dd2ed5b5d9f76094028c9be5b3 assets/refinedstorage/blockstates/orange_crafter_manager.json +c770a2427a6474bdd86d98494c8685fca33ee741 assets/refinedstorage/blockstates/orange_crafting_grid.json +c979c60e1dfc954dd55ec707707f0ff6e892c4de assets/refinedstorage/blockstates/orange_crafting_monitor.json +59cbfcaabd03f853aca3f60329a7c95cb787c8e6 assets/refinedstorage/blockstates/orange_creative_controller.json +c33a89682e5a55748c59b150cada12a9d1b9c55d assets/refinedstorage/blockstates/orange_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/orange_disk_manipulator.json +c32fe65c75f75ef6d2b2f6b88022d950403f4a69 assets/refinedstorage/blockstates/orange_fluid_grid.json +2df3a077ef494d1296f566de4023d26569b31eee assets/refinedstorage/blockstates/orange_grid.json +46f988c8980d2ef48ae7abd74c79dd5e7e017f8d assets/refinedstorage/blockstates/orange_network_receiver.json +62ccc839c105f9668dc3c12f6ea696006fd2362d assets/refinedstorage/blockstates/orange_network_transmitter.json +0433e6562309eb58a721431184c99a52842a5386 assets/refinedstorage/blockstates/orange_pattern_grid.json +94b7f4ea5bfec14b016f8994659f37cc725f1481 assets/refinedstorage/blockstates/orange_relay.json +52977b1a88ecd1065a83ada462b5a8a550abd549 assets/refinedstorage/blockstates/orange_security_manager.json +93ad3d01bc10971f9e4f5c2d83f267fd458fb4b0 assets/refinedstorage/blockstates/orange_wireless_transmitter.json +853d43993b0ff5412f8664107e4602f7c9108670 assets/refinedstorage/blockstates/pattern_grid.json +e124d2cc9470854729e26e8bc95e82c8d12d66b3 assets/refinedstorage/blockstates/pink_controller.json +72d722e540d986a161de430d090812cbb6bec108 assets/refinedstorage/blockstates/pink_crafter.json +ba83f5db4d49f98108667801a53b8dffd59bd984 assets/refinedstorage/blockstates/pink_crafter_manager.json +8648689ae33328eaefbfcf5bd4c52b61afb38138 assets/refinedstorage/blockstates/pink_crafting_grid.json +66584320c7486816c3fcf9b28ed7af70a146a235 assets/refinedstorage/blockstates/pink_crafting_monitor.json +e124d2cc9470854729e26e8bc95e82c8d12d66b3 assets/refinedstorage/blockstates/pink_creative_controller.json +69fd216404681bf23ad1c7c117e4f7976a355ad8 assets/refinedstorage/blockstates/pink_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/pink_disk_manipulator.json +b67fc2fcdb0a21fd36d258e53516cd9f876d4dfb assets/refinedstorage/blockstates/pink_fluid_grid.json +73dbf1f3d783ebe6e191b4646b56cdab6b3f6e2e assets/refinedstorage/blockstates/pink_grid.json +10e8d8a00049240ae65eeae04c95701f632245fc assets/refinedstorage/blockstates/pink_network_receiver.json +3e808dbbcb61a670355520bed140d12952b74915 assets/refinedstorage/blockstates/pink_network_transmitter.json +0bf4783a34fc70b08f825fc1884afeafaec1c2eb assets/refinedstorage/blockstates/pink_pattern_grid.json +b408e8eb93f9bb1c384ab447af269e1d6291f359 assets/refinedstorage/blockstates/pink_relay.json +3c5ce44160aa8718c9c703ee9088949b8c0592f0 assets/refinedstorage/blockstates/pink_security_manager.json +c005a1b1d19d4d8a0bd5554ea0bdfc0215dcf22f assets/refinedstorage/blockstates/pink_wireless_transmitter.json +49b1d9978995934a26559798c700dcc6f62f07ce assets/refinedstorage/blockstates/purple_controller.json +17cf9e787325d128382838783327f03664c81700 assets/refinedstorage/blockstates/purple_crafter.json +975ad7db8e483731a66f57cfb06f579fff2d2611 assets/refinedstorage/blockstates/purple_crafter_manager.json +926110729d03c21d259ef4f44d43dc17e6e5c828 assets/refinedstorage/blockstates/purple_crafting_grid.json +34180be7994fcb0700b90090cb2a73f18506e28c assets/refinedstorage/blockstates/purple_crafting_monitor.json +49b1d9978995934a26559798c700dcc6f62f07ce assets/refinedstorage/blockstates/purple_creative_controller.json +47fe9b00de7749597a2846508c2dc423ca53c943 assets/refinedstorage/blockstates/purple_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/purple_disk_manipulator.json +f7bad620df59f5fdc15bd7648e29ff56c58fdcb2 assets/refinedstorage/blockstates/purple_fluid_grid.json +8dbb3d3793866969367ceb33c5d0fa2a57114f89 assets/refinedstorage/blockstates/purple_grid.json +b5b0f4e65c5729b3d291b2a180eef162d6065368 assets/refinedstorage/blockstates/purple_network_receiver.json +bc53f00fe156eb3e7fda7cc515c32c5e325a8574 assets/refinedstorage/blockstates/purple_network_transmitter.json +fafd9a507ac856250fe79ebf77591aa48978517d assets/refinedstorage/blockstates/purple_pattern_grid.json +42e4fdd1f5c123b3857c94cd27a376998f5f4c99 assets/refinedstorage/blockstates/purple_relay.json +c70b3c0c23bd2f910a185d8c1704b10e4d7e7f55 assets/refinedstorage/blockstates/purple_security_manager.json +6191786c1b4688b83ce872b46998e2769fe315a9 assets/refinedstorage/blockstates/purple_wireless_transmitter.json +0af344822971927dbabc9a3248c4b065f57380da assets/refinedstorage/blockstates/red_controller.json +d15483f33e14d52b696c148fc35074555ac34dc2 assets/refinedstorage/blockstates/red_crafter.json +01bbcbd3539bae6de40adb47e0f718c77d12fe0e assets/refinedstorage/blockstates/red_crafter_manager.json +9587b8ed2ad59cc4701de701117dae551bfa9f28 assets/refinedstorage/blockstates/red_crafting_grid.json +ccb731fe0e6f98f5ba987f1f628c0c643b43d2bc assets/refinedstorage/blockstates/red_crafting_monitor.json +0af344822971927dbabc9a3248c4b065f57380da assets/refinedstorage/blockstates/red_creative_controller.json +3535214510b28671e75e83091ed892a2ace93fe2 assets/refinedstorage/blockstates/red_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/red_disk_manipulator.json +2b0831c043a5db5801a83056db001bc9bea3e10d assets/refinedstorage/blockstates/red_fluid_grid.json +08ea6c75ab709d59b644a9b6f851b30297709c37 assets/refinedstorage/blockstates/red_grid.json +54c11f3818805a1f8c642fe9b39f8172cd0dbe9d assets/refinedstorage/blockstates/red_network_receiver.json +306ea9c1b5e720034d4a64216a246f66ff378374 assets/refinedstorage/blockstates/red_network_transmitter.json +0c146705612be3767b5580be6bdd2191da080f6d assets/refinedstorage/blockstates/red_pattern_grid.json +7824d4a6b0a909bd130b3c9b03499d5303c00d48 assets/refinedstorage/blockstates/red_relay.json +11a0de95d22a08e07cb7bccb5ee11b6998910aa8 assets/refinedstorage/blockstates/red_security_manager.json +568aa0fb5ede635323c6fccdc4f07f4242a02eab assets/refinedstorage/blockstates/red_wireless_transmitter.json +be302ad36912be59948baac2e7ec7d458f7ba790 assets/refinedstorage/blockstates/relay.json +eca4522120aade2750f46407dd0c4f3a622481f9 assets/refinedstorage/blockstates/security_manager.json +91dc10e68eccb57db9c8ba9c8740a586858d6b1d assets/refinedstorage/blockstates/white_controller.json +5af23026e097081db875ac14160d957c84ffb683 assets/refinedstorage/blockstates/white_crafter.json +c8db46d5b6688983ca6713252b618c8b854f6c48 assets/refinedstorage/blockstates/white_crafter_manager.json +65d789e8e0c1b327477301f435bfd4f02e987379 assets/refinedstorage/blockstates/white_crafting_grid.json +5e9fb377bcb1d89b7911e730121c575d42aee270 assets/refinedstorage/blockstates/white_crafting_monitor.json +91dc10e68eccb57db9c8ba9c8740a586858d6b1d assets/refinedstorage/blockstates/white_creative_controller.json +0841cf91a7f73f743fe3163044a10200cf1e1d2c assets/refinedstorage/blockstates/white_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/white_disk_manipulator.json +790778184e42c85287c157671786d4bddbb46859 assets/refinedstorage/blockstates/white_fluid_grid.json +c1cc1d5d09eaa77e3e2063f5fc67c938ae73bc1e assets/refinedstorage/blockstates/white_grid.json +6c0bd32d1ef222adf37252e798941269db9561d0 assets/refinedstorage/blockstates/white_network_receiver.json +ef79c48970c517a4466bca9c79a3f72ee94b2739 assets/refinedstorage/blockstates/white_network_transmitter.json +9582df2542be982efafea176a8a95f8f4ee33ae7 assets/refinedstorage/blockstates/white_pattern_grid.json +452c484028c224bbed3d37e630f87d9c47025557 assets/refinedstorage/blockstates/white_relay.json +3959a8de59e67d553d87f85b02563d49fd7024ae assets/refinedstorage/blockstates/white_security_manager.json +fdd7b224242f0c9d725fe4fe856359a19cde73e8 assets/refinedstorage/blockstates/white_wireless_transmitter.json +1bb50b333ed68b51fb4068ad1a294a1721afe6fb assets/refinedstorage/blockstates/wireless_transmitter.json +354e5098e85da4653b9f75a96f3bbae3b39cd4dc assets/refinedstorage/blockstates/yellow_controller.json +7f5ef4baae9693d421b3b4eef67cfbb6fcb86efd assets/refinedstorage/blockstates/yellow_crafter.json +1cb9354c8fc7094f9329fd21d0d6d8de6ebe70c2 assets/refinedstorage/blockstates/yellow_crafter_manager.json +698d185106d288e3e7b5162298d1cdb2719ebad1 assets/refinedstorage/blockstates/yellow_crafting_grid.json +893f864c644153a9883f6bedff779622057afd8d assets/refinedstorage/blockstates/yellow_crafting_monitor.json +354e5098e85da4653b9f75a96f3bbae3b39cd4dc assets/refinedstorage/blockstates/yellow_creative_controller.json +2ab0f370e0f93617df8f9244bd147d2ca03cb418 assets/refinedstorage/blockstates/yellow_detector.json +6714b970975b3b5d82f167505f497b00e5e7cf3d assets/refinedstorage/blockstates/yellow_disk_manipulator.json +a53c34950d398e238e5e00f846ab7b9f5613b137 assets/refinedstorage/blockstates/yellow_fluid_grid.json +f1a1ea426ae7caf8668631858f2943cdeba922c1 assets/refinedstorage/blockstates/yellow_grid.json +3df04e5fd0be4f4bc3f590aa7b18cfc2e62a6970 assets/refinedstorage/blockstates/yellow_network_receiver.json +9b04ef1034b8f0f53a331fca4a7a7f853b219f53 assets/refinedstorage/blockstates/yellow_network_transmitter.json +cb0c6edbce8a2ce0255c8b3a3a9cd1cc8741a71a assets/refinedstorage/blockstates/yellow_pattern_grid.json +fe89e69e7c6bf1e1863f8e9ee2fe3cacf27c3bf4 assets/refinedstorage/blockstates/yellow_relay.json +3cce759ae50cb0c471c9e0173dc3d8beb18e7c5b assets/refinedstorage/blockstates/yellow_security_manager.json +37ef58994e615ff1285ef554521dc1c5dc7f68aa assets/refinedstorage/blockstates/yellow_wireless_transmitter.json +7dd4d790b7ab67ac05a5465e93a5df75f0a19a7f assets/refinedstorage/models/block/controller/black.json +7ce5a4227982e3dbed579e8c9efe192ec3a46814 assets/refinedstorage/models/block/controller/blue.json +35aa8942bfca9ebb5593b06192b1337298a91566 assets/refinedstorage/models/block/controller/brown.json +4a7bc6807440bdacaf4a388001fff0af2178055d assets/refinedstorage/models/block/controller/cyan.json +59f918515830678508a58682d629ade5c7f127a6 assets/refinedstorage/models/block/controller/gray.json +533baa9de3602004178156576cc1c50b82970253 assets/refinedstorage/models/block/controller/green.json +55ffca09db55f6ff3651df021853cb4c67971d4c assets/refinedstorage/models/block/controller/light_blue.json +48afa16ef64605e47f8ef0718a04fe0ea4497be8 assets/refinedstorage/models/block/controller/light_gray.json +e25236415255c8e84e8425cd5ef5068af2e90bf5 assets/refinedstorage/models/block/controller/lime.json +719f9943433757fe6d544facfad02cf5c863b128 assets/refinedstorage/models/block/controller/magenta.json +ac1cb6e399a675e681a5c32be92cf2bbbabb845e assets/refinedstorage/models/block/controller/nearly_off.json +df5ef8ae2db4d693376007210753f08e8ed9aa1f assets/refinedstorage/models/block/controller/nearly_on.json +70e2a0e01172f7da1631c48358986597731f210f assets/refinedstorage/models/block/controller/off.json +197c8d6037075f2a32aa361a573a86a93b71d178 assets/refinedstorage/models/block/controller/orange.json +b5d54a0751d165ea36f32a545cd0d74cfec96138 assets/refinedstorage/models/block/controller/pink.json +f6f6681357c6759a6de3baac9116c45f4027ed0b assets/refinedstorage/models/block/controller/purple.json +d940dae104b67d6bb4eaadfa5c196d174cea0dd9 assets/refinedstorage/models/block/controller/red.json +c5377c73ba6e75dcfd191f1c28769bc380aa4447 assets/refinedstorage/models/block/controller/white.json +d5b65da238fd3119c615a589bcab6c32b93a2838 assets/refinedstorage/models/block/controller/yellow.json +a3fc2ae7524e81e7ac41d116f23dfcfe58fcca9a assets/refinedstorage/models/block/crafter/black.json +ca9f47ac28aa1e6779613d426b837526b50ae0e2 assets/refinedstorage/models/block/crafter/blue.json +58a500649c2d2a496f7228b9fa537802baf15a20 assets/refinedstorage/models/block/crafter/brown.json +cce737a93507d1eb58d51d2ddac6428c695c6b23 assets/refinedstorage/models/block/crafter/cyan.json +9abba05387aa43ead444a35b3337f87dcf8a07ce assets/refinedstorage/models/block/crafter/disconnected.json +7c6c30838702c3e43f7c9e62319d2cd486d1498a assets/refinedstorage/models/block/crafter/gray.json +c495e9d2fc43e5e6094b4799609961445d391927 assets/refinedstorage/models/block/crafter/green.json +8c493f345d1a6af778087a49cf36588954bb84fe assets/refinedstorage/models/block/crafter/light_blue.json +ce28ae9ae0553978724a134087ec1e836d1d7b84 assets/refinedstorage/models/block/crafter/light_gray.json +6d79cebd8c01ae4fd0f13914a9a0f15ed91fd8f0 assets/refinedstorage/models/block/crafter/lime.json +08d8c9040d77c717581b2ae3d485e0ffc5dd0d83 assets/refinedstorage/models/block/crafter/magenta.json +6952bdf6763143f35b9d80a42e3cc354cc4da15d assets/refinedstorage/models/block/crafter/orange.json +dd40faae420cdb526883f24a052992bf9b5c17a5 assets/refinedstorage/models/block/crafter/pink.json +3bcb7dcb9b8a6c8d6425d788e794ce84a62a1f91 assets/refinedstorage/models/block/crafter/purple.json +da30ebf53613bc7a7add1af2fd149f3497ad394a assets/refinedstorage/models/block/crafter/red.json +6c4add52ccbfc051ed8deda52c3664c35a96cc36 assets/refinedstorage/models/block/crafter/white.json +ead08d7a0ba6b368d8c9afb2907f3495ebc0238f assets/refinedstorage/models/block/crafter/yellow.json +c1ab462d97a36b71baa6d03b0aefab777377aa80 assets/refinedstorage/models/block/crafter_manager/black.json +947d1cacb3f457c5f9985961bf9a2cb64392f9c6 assets/refinedstorage/models/block/crafter_manager/blue.json +bdf1b91bb479fdc377250a925dd569c222b8b983 assets/refinedstorage/models/block/crafter_manager/brown.json +41746225550b6f965c0bcb2168aef5afa6ac5780 assets/refinedstorage/models/block/crafter_manager/cyan.json +3760e96ab56ce35790deccb0bc0dd5b777d5624a assets/refinedstorage/models/block/crafter_manager/disconnected.json +7470d98e9ed8ab00a4cac8b651d095dbc33a787a assets/refinedstorage/models/block/crafter_manager/gray.json +a6b801087e0e0311fa660ae060879aede938bfa0 assets/refinedstorage/models/block/crafter_manager/green.json +e6d7a1289f13a29a429db62287ac6c3143a9565a assets/refinedstorage/models/block/crafter_manager/light_blue.json +77c0967108d7a410b69ebdc3d2b5606b653aca4f assets/refinedstorage/models/block/crafter_manager/light_gray.json +341e45f850f25ba40d3af0ae3b269782c345db7e assets/refinedstorage/models/block/crafter_manager/lime.json +ec810637edf5e6cd5a52c21d7d01d76c0e12a5d0 assets/refinedstorage/models/block/crafter_manager/magenta.json +e20e3f306648768835867ba976b0ba1f6ab7d48e assets/refinedstorage/models/block/crafter_manager/orange.json +a67381c44b22482008ab6f9b7474987764b838ea assets/refinedstorage/models/block/crafter_manager/pink.json +c5b8ef34fd2b4c39efe5dfe3eff38f2631be9233 assets/refinedstorage/models/block/crafter_manager/purple.json +cc006d4e8b49165ab3d3dc584f7e68415dffb36c assets/refinedstorage/models/block/crafter_manager/red.json +6dbf08216a746ed970af93d43870cf9aff8e9398 assets/refinedstorage/models/block/crafter_manager/white.json +a65b6a6e90137b5b6d061637daca39cf0230a756 assets/refinedstorage/models/block/crafter_manager/yellow.json +4f4c3f024920850c65a87faeac77dd3659915287 assets/refinedstorage/models/block/crafting_grid/black.json +f1beacefdaf9aae0aaafc5a3c5e865e84173c2d4 assets/refinedstorage/models/block/crafting_grid/blue.json +3f85170b187def3b075ec11982f91775c72ea2bb assets/refinedstorage/models/block/crafting_grid/brown.json +e3a6ddbf8c7348f8f0678b7b88d7309c1c2048fb assets/refinedstorage/models/block/crafting_grid/cyan.json +d9bedeb26d136630195de1b309d67f58d771bfb5 assets/refinedstorage/models/block/crafting_grid/disconnected.json +c483c28bc8d003c214cd9d2c7de40500d9a14a5e assets/refinedstorage/models/block/crafting_grid/gray.json +53c5036ea2fd4bc481bccdcd3f37f4b4a3c0e25f assets/refinedstorage/models/block/crafting_grid/green.json +034ce68bb933818291cc7b28b6c5da5471c16f01 assets/refinedstorage/models/block/crafting_grid/light_blue.json +40ff2912140c39bd37734b18941d595d6308aac8 assets/refinedstorage/models/block/crafting_grid/light_gray.json +de80e07454eb9b8ad33af7a722d0fb0edc39ff56 assets/refinedstorage/models/block/crafting_grid/lime.json +1e02f68733741502624b4726ed521063efa3373b assets/refinedstorage/models/block/crafting_grid/magenta.json +60030a6c0d21492b10b027495cdec7d551592778 assets/refinedstorage/models/block/crafting_grid/orange.json +35609d8acbf324629aa92ac49ae0f64f9126989b assets/refinedstorage/models/block/crafting_grid/pink.json +a43ebf377c637ae6a90699ef5895241645d75020 assets/refinedstorage/models/block/crafting_grid/purple.json +8e685875e33fa52f88ddef1de0c370bbc1fc0717 assets/refinedstorage/models/block/crafting_grid/red.json +bfb178e21d7b46750737a1451ea29d57456d1763 assets/refinedstorage/models/block/crafting_grid/white.json +a69aa2d1c9aa0c0670d60c0f88cfa07ebe8d258c assets/refinedstorage/models/block/crafting_grid/yellow.json +e40a7af2d99a7ff0847a13865339fa00a3ebc439 assets/refinedstorage/models/block/crafting_monitor/black.json +52a2c625eb84f7586bdb98d8f709ffb3c17e4ee9 assets/refinedstorage/models/block/crafting_monitor/blue.json +9c8ceeee7c2dc1512e23d3798c51fa75387d411c assets/refinedstorage/models/block/crafting_monitor/brown.json +1d071a43fa223ffd8261704132df37b8ee916a1d assets/refinedstorage/models/block/crafting_monitor/cyan.json +185e19d54b212f6736caa383bfe0337f79439992 assets/refinedstorage/models/block/crafting_monitor/disconnected.json +1e2f04d1521c27e31f06940684c1ca7306fa3524 assets/refinedstorage/models/block/crafting_monitor/gray.json +ddf85353932580ced34a09ce5cd5fc121828e90d assets/refinedstorage/models/block/crafting_monitor/green.json +a161a5fa71b287a0eb7ff801458ad5c76a55a7c5 assets/refinedstorage/models/block/crafting_monitor/light_blue.json +8066136befa4b7e2d5cefdf9350f64b995051226 assets/refinedstorage/models/block/crafting_monitor/light_gray.json +3671b90902d442e18c4fb13d3e50756d7532be8e assets/refinedstorage/models/block/crafting_monitor/lime.json +d94ce990ec267a992686830fbcf10a43c23196cc assets/refinedstorage/models/block/crafting_monitor/magenta.json +cf4753ad43dbf73db3696dd4c19849e6a2b9a33c assets/refinedstorage/models/block/crafting_monitor/orange.json +cc142ac9d63ebe6bc9a8f94a39ac89d71565d569 assets/refinedstorage/models/block/crafting_monitor/pink.json +5c0ff643784ef39a297f050e4bdff46ca2b1cce5 assets/refinedstorage/models/block/crafting_monitor/purple.json +f1e3b6c58f99ac64ab48d2c735b8d675f9c74a0e assets/refinedstorage/models/block/crafting_monitor/red.json +08fe3f165275166eee5557a0c6edfbd4035eae8b assets/refinedstorage/models/block/crafting_monitor/white.json +b99b33fed141c1c979c4f68ac0e656ddacb7b041 assets/refinedstorage/models/block/crafting_monitor/yellow.json +2b8f350a8b1fb249e9b835aab5969f4bd76a6ea7 assets/refinedstorage/models/block/detector/black.json +c7298157a39315ff38d1310b4ebe77c708cf8a82 assets/refinedstorage/models/block/detector/blue.json +298af9d65b3e2334de2519ef7e19c78756c1ab99 assets/refinedstorage/models/block/detector/brown.json +d764ac8e477068bbb296c3854ad76a7b80d1d44a assets/refinedstorage/models/block/detector/cyan.json +50d618e3cb55a96d67dcc9a6b42bd17c58e1870c assets/refinedstorage/models/block/detector/gray.json +7845acde95c218ca098ec30a2e568b3334f09944 assets/refinedstorage/models/block/detector/green.json +c735ce9091c7a5ab2eb0c7b162af77c2ffac2ad8 assets/refinedstorage/models/block/detector/light_blue.json +b462ca74227c62a9e8567ab7461f45e5e95425d8 assets/refinedstorage/models/block/detector/light_gray.json +4f52368581621adf1d799660c42f108207217575 assets/refinedstorage/models/block/detector/lime.json +170d5328b3f1d9c05c2f6af3191a42d734e89e2b assets/refinedstorage/models/block/detector/magenta.json +d571bd12d733c62c3b7e28e6adbf44990429414e assets/refinedstorage/models/block/detector/off.json +2c735eca8fcf7770558758a49f7f8ea469225897 assets/refinedstorage/models/block/detector/orange.json +d795e18038baa420972781d7206c1809c7297ae8 assets/refinedstorage/models/block/detector/pink.json +0fe0d9e192b473fdb4cc8a5844ca44de22364e43 assets/refinedstorage/models/block/detector/purple.json +d07f6cedd294574ead99b3b024206c0126b26896 assets/refinedstorage/models/block/detector/red.json +a792d3daf2709048bf14ee378c7362b05c938bff assets/refinedstorage/models/block/detector/white.json +bb3725144c25a75f4e0e0a47e7efd174b7211261 assets/refinedstorage/models/block/detector/yellow.json +1785659b9e89cb0d4f027bc97e3a5812c8b1ccdb assets/refinedstorage/models/block/disk_manipulator/black.json +08feb52f08c96567bbdc6cd0ab9f289748c3bd1c assets/refinedstorage/models/block/disk_manipulator/blue.json +5050a32ef1afdb15f31f169d257596a29cf0e46d assets/refinedstorage/models/block/disk_manipulator/brown.json +9900ae5b9004204fea75cad20e4b18a6d8d3ec37 assets/refinedstorage/models/block/disk_manipulator/cyan.json +2621bf9ea6ba66ebeb9eb3130c9a58b5858c8f78 assets/refinedstorage/models/block/disk_manipulator/disconnected.json +8f78635bbb9015e9b3c710418adec9b96570b133 assets/refinedstorage/models/block/disk_manipulator/gray.json +588bb56e49677311063aa0eee9ebbb864e528fc0 assets/refinedstorage/models/block/disk_manipulator/green.json +46677b54fec1f540a8d63e8037bbf164f755b995 assets/refinedstorage/models/block/disk_manipulator/light_blue.json +2dc951c9ebb27963eab8bd4e311da3e3f6ad99e9 assets/refinedstorage/models/block/disk_manipulator/light_gray.json +08cf44fa79c6e90f420e3eeb2e02c52f875c06ff assets/refinedstorage/models/block/disk_manipulator/lime.json +72d202c30b016055cecc9084d61e5bbadfa0a761 assets/refinedstorage/models/block/disk_manipulator/loader.json +b4355a9e686dece664cd7a2129724823e0315abc assets/refinedstorage/models/block/disk_manipulator/magenta.json +577215970d538ba411e951ee561c71edf4719876 assets/refinedstorage/models/block/disk_manipulator/orange.json +b6a061ad8d84445979b2eddda4851ea7fe4557f2 assets/refinedstorage/models/block/disk_manipulator/pink.json +4296e50c7de8c775143eb16d5e75c3804b0ee19c assets/refinedstorage/models/block/disk_manipulator/purple.json +28244ffee47ac3ef6ccbd3228d7db8ffe8f8f00f assets/refinedstorage/models/block/disk_manipulator/red.json +d7c7712fe9dc02e0bde2ed57f5e886698b5d1d65 assets/refinedstorage/models/block/disk_manipulator/white.json +15c40e7373bff9f0a9e254aaf6d4aa9e3d2a1d53 assets/refinedstorage/models/block/disk_manipulator/yellow.json +7af6b31d785047fff3d4716c81fbf550a38f292b assets/refinedstorage/models/block/fluid_grid/black.json +2cc6db45ec512f617d3dfc74e56c812700e8c9be assets/refinedstorage/models/block/fluid_grid/blue.json +043ee02c82d506d6f5024246fafdf467bcba50f4 assets/refinedstorage/models/block/fluid_grid/brown.json +92c6f3c28c41f179c507434f9e13c41fb6713942 assets/refinedstorage/models/block/fluid_grid/cyan.json +0cbd7a5d7692ef3a031960eccc58307cf15d887d assets/refinedstorage/models/block/fluid_grid/disconnected.json +328db8a51dac5c943b005dd8178f70de0e69b03d assets/refinedstorage/models/block/fluid_grid/gray.json +3a012b462e69bdca95c5bb3e030d8dea2d438539 assets/refinedstorage/models/block/fluid_grid/green.json +7f05d7725b608fdb70ba2ae4c6ade712912b5d30 assets/refinedstorage/models/block/fluid_grid/light_blue.json +95d50b03de3385f617aa2d9641af547fbed68ae3 assets/refinedstorage/models/block/fluid_grid/light_gray.json +536cd514850a06a78582bc93f44fb1fe81460ccc assets/refinedstorage/models/block/fluid_grid/lime.json +511ea39721de8eaf9de4962eb0a953f460445c98 assets/refinedstorage/models/block/fluid_grid/magenta.json +93073d28da8386afb465c093c7c9a805faa5e843 assets/refinedstorage/models/block/fluid_grid/orange.json +34070d257c6e5fa057a914ace02db59fc4317c15 assets/refinedstorage/models/block/fluid_grid/pink.json +2d400582419ad444bf5950deac5da692cb1ad9ae assets/refinedstorage/models/block/fluid_grid/purple.json +6361903f6b6ff8f817e4511601b47990599f1edc assets/refinedstorage/models/block/fluid_grid/red.json +6886951919ccfce485e851045fa23ff7deddf9be assets/refinedstorage/models/block/fluid_grid/white.json +37e31039cba0204a03df2fa2130dc2383d303d29 assets/refinedstorage/models/block/fluid_grid/yellow.json +e845c4a37c72d5ad426fac7203353a9665648a46 assets/refinedstorage/models/block/grid/black.json +589f51309dbecb1964c070a70496b79ae1c4ebcb assets/refinedstorage/models/block/grid/blue.json +437076a560cbafb39c685b88e6fd2073c7c158d0 assets/refinedstorage/models/block/grid/brown.json +49f3eb8374ee309b81f9242bd048f66421eaa75e assets/refinedstorage/models/block/grid/cyan.json +b85adb5c23340beb39809692ae600bae8a8fbd97 assets/refinedstorage/models/block/grid/disconnected.json +3ad1130e18a706495810f1cc32e2658b4910607a assets/refinedstorage/models/block/grid/gray.json +83b393342de4c5aee81c50715479ec78efb21667 assets/refinedstorage/models/block/grid/green.json +3fb70b9aba3dbe38bc0279f1b2789695f8e0a784 assets/refinedstorage/models/block/grid/light_blue.json +0ea1bb0f7196763e843c2bfe7b6a24356af72768 assets/refinedstorage/models/block/grid/light_gray.json +0aa895ec1c87aa4d982f8ff244d7a9efa541183e assets/refinedstorage/models/block/grid/lime.json +3fdd4ff86575596e397c27025b12b78475c6a0af assets/refinedstorage/models/block/grid/magenta.json +700fdb55791027e838a317d60296ba99dcece579 assets/refinedstorage/models/block/grid/orange.json +63797a1d7f8c29bf803200cd6e20565e4fe6e56e assets/refinedstorage/models/block/grid/pink.json +1dab675f1583f789f2677c597bfd42cd1d310be1 assets/refinedstorage/models/block/grid/purple.json +06a1e40dd45c7650699eead04d99397f745cd39b assets/refinedstorage/models/block/grid/red.json +329229e786e1a6e0f36c547bd8f7e8e3adcd5f08 assets/refinedstorage/models/block/grid/white.json +b6ad5c9d362ca9c4cbb5727be2a3ea38f03e0a64 assets/refinedstorage/models/block/grid/yellow.json +79526257476cca709b95852c87d9e193ae645074 assets/refinedstorage/models/block/network_receiver/black.json +521b606adc714ae111325cfb4b86c2f00fc49838 assets/refinedstorage/models/block/network_receiver/blue.json +e988e5bf8a325e3ed5e80e5615e8d5b337e92892 assets/refinedstorage/models/block/network_receiver/brown.json +9feb023af7e1f64c0586fcaa67059743deb3da04 assets/refinedstorage/models/block/network_receiver/cyan.json +1ab3271c61288c831ec53f64d025a34c1805d87b assets/refinedstorage/models/block/network_receiver/disconnected.json +44587865547f9c2e58421ea0a880ff51cf8b8fbf assets/refinedstorage/models/block/network_receiver/gray.json +180555a0b56ddbe2def2b86d44ad8d8747bffbea assets/refinedstorage/models/block/network_receiver/green.json +cd3a8952d2246b8ae436f6b6b66ee7f7f3f51fa7 assets/refinedstorage/models/block/network_receiver/light_blue.json +46a376a32289cef91d22fddc292ebff32ca4d2cb assets/refinedstorage/models/block/network_receiver/light_gray.json +09a5924b295c3b1a3668cd9523c2bb9f46a320bc assets/refinedstorage/models/block/network_receiver/lime.json +9233ffacf2b28e6feaa1b119996d4eb2cdfa1363 assets/refinedstorage/models/block/network_receiver/magenta.json +16e69b8fee05153dc0664b24b88cf954c6b20fb6 assets/refinedstorage/models/block/network_receiver/orange.json +2c0a43f2a69b4d78493d9af87b056f38b0c9b6b3 assets/refinedstorage/models/block/network_receiver/pink.json +1ada9d35a3ed9942d5e50346f21dbcafc3b9199e assets/refinedstorage/models/block/network_receiver/purple.json +acc750e5d48c10a4c638f0c86d3f721c75333606 assets/refinedstorage/models/block/network_receiver/red.json +4067e93a775337668dbfb612b2d4fb411b43a6a9 assets/refinedstorage/models/block/network_receiver/white.json +6d8e8c64a39485cba7b479337426f4f7319b8d77 assets/refinedstorage/models/block/network_receiver/yellow.json +c17ae790076c791a6f51b86f307c71452a47e5b9 assets/refinedstorage/models/block/network_transmitter/black.json +c4e1615846d83ab4c806b6b24373be722261d1f3 assets/refinedstorage/models/block/network_transmitter/blue.json +0f59245da158e77b1cf84cfab5164eeb8814384d assets/refinedstorage/models/block/network_transmitter/brown.json +d1dd664110221c97fe2d22a111800cd2b6df6982 assets/refinedstorage/models/block/network_transmitter/cyan.json +90f410054ba60b9f9b4cc7212cefb0ec54b8d0db assets/refinedstorage/models/block/network_transmitter/disconnected.json +8d516cc91c6e1bd3fb8e2eee31e268bf10b590df assets/refinedstorage/models/block/network_transmitter/gray.json +ce9afe78c7f30a826630135797ca4c90f7cccbb8 assets/refinedstorage/models/block/network_transmitter/green.json +3a230a4a14c2151ac1de52072514b622a4fac746 assets/refinedstorage/models/block/network_transmitter/light_blue.json +754dee3959694a095c12735306116793453d34d0 assets/refinedstorage/models/block/network_transmitter/light_gray.json +363224b570a61889ec29ec9744a8d1a0d85ccb27 assets/refinedstorage/models/block/network_transmitter/lime.json +fcce3c3813f180f8158038f90f20d49bee3e0f11 assets/refinedstorage/models/block/network_transmitter/magenta.json +c1ece04fd664cf9748c06f945e9c20037d215346 assets/refinedstorage/models/block/network_transmitter/orange.json +260f3dc7a7da3073e7ebd39e646f484a9a78c366 assets/refinedstorage/models/block/network_transmitter/pink.json +137cb226c908a271b70748685a385b54e63d16ae assets/refinedstorage/models/block/network_transmitter/purple.json +ef2ca4a218be25d42a994a308d3a684f82aeb3e8 assets/refinedstorage/models/block/network_transmitter/red.json +49ca8fa27667cfdd1d696d0deb56c376be3a8170 assets/refinedstorage/models/block/network_transmitter/white.json +594e5350dd5d3d02769a7ba72f066545ec9d3ad8 assets/refinedstorage/models/block/network_transmitter/yellow.json +92cbce2a0d88d653d3efa0ffb517b44dfe21fe33 assets/refinedstorage/models/block/pattern_grid/black.json +09d8500c01a62a454e8e1a817a82e1ad19deace2 assets/refinedstorage/models/block/pattern_grid/blue.json +50406c5a5a65c0d46e91ef389cd3fd23a2b2599b assets/refinedstorage/models/block/pattern_grid/brown.json +6ce91be1821a684898a59d3a8cfbe13ba4f6b707 assets/refinedstorage/models/block/pattern_grid/cyan.json +d06e4411da2bf8312b42cfefc1830610befa8bfd assets/refinedstorage/models/block/pattern_grid/disconnected.json +3257be294252ab0a567fc96486e30b028ba6009d assets/refinedstorage/models/block/pattern_grid/gray.json +b0713d7de5cd75e371bc83e9abd33e842702f1cc assets/refinedstorage/models/block/pattern_grid/green.json +5412d15ff025c0ba4bf04e74cbecb765932cb697 assets/refinedstorage/models/block/pattern_grid/light_blue.json +3abffd3cc264e735317ecb712b1db01f1d381c91 assets/refinedstorage/models/block/pattern_grid/light_gray.json +fc8cf5e162ee8f030011f5e09a3fb5373c497e08 assets/refinedstorage/models/block/pattern_grid/lime.json +e32a45b233d1786edb383080382a5025c6cb502c assets/refinedstorage/models/block/pattern_grid/magenta.json +57e784c0b36a70aba86e137b541198934a3e8719 assets/refinedstorage/models/block/pattern_grid/orange.json +58bc5125052ca7ce23db697ac29acea919e33ee7 assets/refinedstorage/models/block/pattern_grid/pink.json +80126ef472a778e8aa64c20c7828aa033de4b3cf assets/refinedstorage/models/block/pattern_grid/purple.json +eee9128ba674f306ff5f6795468b07a1593f6431 assets/refinedstorage/models/block/pattern_grid/red.json +0ea80f03eb7eca83ec65634635f0164bfa053524 assets/refinedstorage/models/block/pattern_grid/white.json +e6b978a202ab3b7096443862fc70418fab92d528 assets/refinedstorage/models/block/pattern_grid/yellow.json +35968a567e5abe3851f3833477c6b1ee8462d423 assets/refinedstorage/models/block/relay/black.json +3918e0f6307e76c72f112b9e5a26977e4b32bb1a assets/refinedstorage/models/block/relay/blue.json +2e79077645de1d34de0d3f01102d5242a577440d assets/refinedstorage/models/block/relay/brown.json +a683b28b4b41949b663208e28c393746419e5f1f assets/refinedstorage/models/block/relay/cyan.json +d27657d53a4ea85f6c28d11f82d08015af9ef0e2 assets/refinedstorage/models/block/relay/disconnected.json +9705e6e41a83a5349f74e4478284f6fe8b63a6dd assets/refinedstorage/models/block/relay/gray.json +2d21af4bfa0fade473addf82032db9e3187af096 assets/refinedstorage/models/block/relay/green.json +f53061187c76cce0787d11c6b800745dfd48b36a assets/refinedstorage/models/block/relay/light_blue.json +a85088b47aaef37ebd03eaec92b3818f02de8463 assets/refinedstorage/models/block/relay/light_gray.json +8502941d07ca9e6ac70c02b2e03b2a870c94e92f assets/refinedstorage/models/block/relay/lime.json +81bff5b425404e1f01f6e4e815fce9eae20299cb assets/refinedstorage/models/block/relay/magenta.json +e940a4ba52e06c3033c43a29fa092506fa3dd683 assets/refinedstorage/models/block/relay/orange.json +9c48be51ec6d911626bebcdea25bbfe4171c02f1 assets/refinedstorage/models/block/relay/pink.json +28844a3913a24f63b7d202e8b55a081ed3cf9301 assets/refinedstorage/models/block/relay/purple.json +c3223281fef269d54225e938165d3ef4742673a0 assets/refinedstorage/models/block/relay/red.json +9bd4c02a1e524d88b722a2b81ee49fa47beb9261 assets/refinedstorage/models/block/relay/white.json +d6e52eb671800d61b5565e502f395f91c5b650a0 assets/refinedstorage/models/block/relay/yellow.json +995ac6124cb9667fa89fb87eb8cf8485e7b7e197 assets/refinedstorage/models/block/security_manager/black.json +e6dcfb1bfa2cd2ce4f3d3dc2aae7da3ad344bbda assets/refinedstorage/models/block/security_manager/blue.json +cacca03ecf0de2bce557ca841401033c45cf4cc1 assets/refinedstorage/models/block/security_manager/brown.json +e241938c7d93a4fc12a09fa9a1ee847d129e92b9 assets/refinedstorage/models/block/security_manager/cyan.json +101c60b99c9c532a248ed15adb59f64ec4bcd186 assets/refinedstorage/models/block/security_manager/disconnected.json +5fcb0264b7cc0d4132cf9f18deafa366c6066f53 assets/refinedstorage/models/block/security_manager/gray.json +871b6c7a028d339a551e10d432a936e316f7910e assets/refinedstorage/models/block/security_manager/green.json +f068112ed910080dfc74f2309228f2d5c41ea1b6 assets/refinedstorage/models/block/security_manager/light_blue.json +2d7bf81078298c7cb9a9d0091fc219e7253c16d5 assets/refinedstorage/models/block/security_manager/light_gray.json +7ca8fa49596d79f4d4eb61f34462cd8baad63221 assets/refinedstorage/models/block/security_manager/lime.json +449ceab92dbc8b14edc8b0fe8fbd0648910c8a38 assets/refinedstorage/models/block/security_manager/magenta.json +5b0a97090b976df2388119ffb8a8f5a4c5eae78d assets/refinedstorage/models/block/security_manager/orange.json +da7ef346c5d9f2da82bfc0f15ba7cf8594bf9c40 assets/refinedstorage/models/block/security_manager/pink.json +859171bc7c84c43ef6406b3749bf235011f4bc23 assets/refinedstorage/models/block/security_manager/purple.json +04198d42366f1a9278466585994f388fc2d01fe9 assets/refinedstorage/models/block/security_manager/red.json +a865ead60de383ea8e84c5c16ffdcc2fcbd2791a assets/refinedstorage/models/block/security_manager/white.json +291f61f7abfe33116b5a0c915d84160cb0db2fbb assets/refinedstorage/models/block/security_manager/yellow.json +382ba985cb3eb98190df982cf81e85f1d00d0f98 assets/refinedstorage/models/block/wireless_transmitter/black.json +f338756587a7c6bce14677030543f7399aee9259 assets/refinedstorage/models/block/wireless_transmitter/blue.json +667bad1eaa409dbd56bb9db7048a029a610dc5c0 assets/refinedstorage/models/block/wireless_transmitter/brown.json +eeb75332e2a0a9a10b1f5d47b8621340c3913877 assets/refinedstorage/models/block/wireless_transmitter/cyan.json +ca0a18305f47bf6b1e01014b9c557cefbd2873af assets/refinedstorage/models/block/wireless_transmitter/disconnected.json +732c1094b53f66b96e04630b2e3549f1ae3f3d3e assets/refinedstorage/models/block/wireless_transmitter/gray.json +2cb3ccf208c6144c461f8b6d05e45360f88e31f1 assets/refinedstorage/models/block/wireless_transmitter/green.json +f0c6cd01aa8af1558c43033433096942fdda103e assets/refinedstorage/models/block/wireless_transmitter/light_blue.json +b1e599007cf64e1a4140a4180ea642c3e208d41c assets/refinedstorage/models/block/wireless_transmitter/light_gray.json +e329e6a86f119589ba724bc4036922bce1f0e716 assets/refinedstorage/models/block/wireless_transmitter/lime.json +efbe23834aaae087892464faccad675b344c35af assets/refinedstorage/models/block/wireless_transmitter/magenta.json +578a2d53d7d7a800200525b04d91f356e3340014 assets/refinedstorage/models/block/wireless_transmitter/orange.json +c2e51f822376d1968fc07e6987f70ff069d460d4 assets/refinedstorage/models/block/wireless_transmitter/pink.json +495be998c5278225bebc0d6340640e7904e1f4cb assets/refinedstorage/models/block/wireless_transmitter/purple.json +747ea39519e81abea94ca278f2e610e7c55d342e assets/refinedstorage/models/block/wireless_transmitter/red.json +c6258775f847e0957a14fdfd24dcce3116d90acc assets/refinedstorage/models/block/wireless_transmitter/white.json +556c8e5da522c6e27f8a6ee8de69fc95fafb504e assets/refinedstorage/models/block/wireless_transmitter/yellow.json +b281a426469c35fbbb1cb3e87795daa52ec3f97b assets/refinedstorage/models/item/black_controller.json +942d718968e1b8d27b203bc661801d37d154b5f2 assets/refinedstorage/models/item/black_crafter.json +75ac21fb6def11be4568d2ac5ff2651f3564f25d assets/refinedstorage/models/item/black_crafter_manager.json +28891a28805f96c47409a34943342830a15e6690 assets/refinedstorage/models/item/black_crafting_grid.json +ddb0a90214bf85dc8e188068f73ae2b20f82150f assets/refinedstorage/models/item/black_crafting_monitor.json +b281a426469c35fbbb1cb3e87795daa52ec3f97b assets/refinedstorage/models/item/black_creative_controller.json +241b9b206acf6f4c9ac3151c4044dac213bc0670 assets/refinedstorage/models/item/black_detector.json +ac9dc77f9d6ba5ee90101187aa09e406c0d14fbd assets/refinedstorage/models/item/black_disk_manipulator.json +876fc7ec3dda3568c1fd1e8d2b6ceb200d1380ab assets/refinedstorage/models/item/black_fluid_grid.json +17c651836f3308723635b7a7a1f9e879098b33c5 assets/refinedstorage/models/item/black_grid.json +fac0c63adf0b1c802ebd5cdd9fc5c9dec030b35e assets/refinedstorage/models/item/black_network_receiver.json +d823ba7bc1affa7af633185834d1ff582882f2e6 assets/refinedstorage/models/item/black_network_transmitter.json +6c30fa933b83c1c01d2e069167729e91ed249ec7 assets/refinedstorage/models/item/black_pattern_grid.json +61861f588ea12538786c06129c3d0a1040394f16 assets/refinedstorage/models/item/black_relay.json +c634efc545854df54c57dd2bf61d6e03448742e6 assets/refinedstorage/models/item/black_security_manager.json +6a1e27442bf1512ba949fafaf135502ae0420169 assets/refinedstorage/models/item/black_wireless_transmitter.json +691f05fe24b16b4eb7688992e08b2f3f5afb02ee assets/refinedstorage/models/item/blue_controller.json +2de69e179294ad396ebe181228c3e9c1787ab550 assets/refinedstorage/models/item/blue_crafter.json +cdea55152a48642717bdc630f74ee6fcf1d8f667 assets/refinedstorage/models/item/blue_crafter_manager.json +c75d3ac7fb95df1b57ae997f5bf9ed7aad112eb0 assets/refinedstorage/models/item/blue_crafting_grid.json +4fba5520838ccf9f88f51853ad95b9bd6c6c9b9c assets/refinedstorage/models/item/blue_crafting_monitor.json +691f05fe24b16b4eb7688992e08b2f3f5afb02ee assets/refinedstorage/models/item/blue_creative_controller.json +f59b716bc576eed79556110ef355fa28cf92d10a assets/refinedstorage/models/item/blue_detector.json +5f8275097f6478a4f23e1ce55dde36a5dc2e5407 assets/refinedstorage/models/item/blue_disk_manipulator.json +675c756edd54900ab155bc45d5a7134cf6dac3a3 assets/refinedstorage/models/item/blue_fluid_grid.json +99c3ceae65e98ca0eab0ab04c7739a872102bee0 assets/refinedstorage/models/item/blue_grid.json +41c944af80509024d3de1ed1c5ab74336d3787e8 assets/refinedstorage/models/item/blue_network_receiver.json +0af6f3152bc7fcd1ca79fd0adf77d1a52e098b6f assets/refinedstorage/models/item/blue_network_transmitter.json +8053c22618e7d51150fab4172a1cb2e3c9d36b4c assets/refinedstorage/models/item/blue_pattern_grid.json +763ebca22b3642be09f396deac9cd9c54b90e58f assets/refinedstorage/models/item/blue_relay.json +5abbfde1e5a947ae44fde121c3294f9fb2b60e7d assets/refinedstorage/models/item/blue_security_manager.json +e38c127e67a2ef649d7ed595577947c93473d3d2 assets/refinedstorage/models/item/blue_wireless_transmitter.json +4be65b24bde8f3b4dd101ee78b74bb8e22cfd193 assets/refinedstorage/models/item/brown_controller.json +0fb2cc9e3e05d19d9fcc5e04c6baeaa2cb04265c assets/refinedstorage/models/item/brown_crafter.json +022322ce32ac742f4ce5498d3da128741fe0767d assets/refinedstorage/models/item/brown_crafter_manager.json +eb37e649bbb3f087df69a30c22215418b3fc901d assets/refinedstorage/models/item/brown_crafting_grid.json +4556f504e89f87de6ab73c12259b73eb151e8d7a assets/refinedstorage/models/item/brown_crafting_monitor.json +4be65b24bde8f3b4dd101ee78b74bb8e22cfd193 assets/refinedstorage/models/item/brown_creative_controller.json +470afaeaaaec68a1474b2efcb2e027382b6d4069 assets/refinedstorage/models/item/brown_detector.json +12c9098c38f118056d9576671287b9783e50be98 assets/refinedstorage/models/item/brown_disk_manipulator.json +7fcf4b0092b4a6e733046548217f8cd40a0b0c01 assets/refinedstorage/models/item/brown_fluid_grid.json +67016265a1d6961ef06211484795a61cc310e6b4 assets/refinedstorage/models/item/brown_grid.json +db89e452a0539344eafd946085a171bfd104a9cd assets/refinedstorage/models/item/brown_network_receiver.json +293b7ae86745d49806b8cf07d9f7f3fb900129f8 assets/refinedstorage/models/item/brown_network_transmitter.json +a852eda91b130409a8127af77cf1a00b2aab81c8 assets/refinedstorage/models/item/brown_pattern_grid.json +023fb3d3d0164e237d6d8c83028e66ffb080905f assets/refinedstorage/models/item/brown_relay.json +45c70a18a9b27b3a0f7cd41a450ba23ba4b97faf assets/refinedstorage/models/item/brown_security_manager.json +3c329581c36a66b21409184843a78e90eae25c50 assets/refinedstorage/models/item/brown_wireless_transmitter.json +016151e185659bb813f613e2fd854b97f409e6ee assets/refinedstorage/models/item/controller.json +712a2408676f6ce1208b196d0cfe065136d612fe assets/refinedstorage/models/item/crafter.json +2adb1c2ed2c30890df2492069293f20c085eddf2 assets/refinedstorage/models/item/crafter_manager.json +2ef1da280a960eafd61369b67ea1647966fdcc0c assets/refinedstorage/models/item/crafting_grid.json +ea61beccbf6896f3fdf99b8d4787be67573595dc assets/refinedstorage/models/item/crafting_monitor.json +016151e185659bb813f613e2fd854b97f409e6ee assets/refinedstorage/models/item/creative_controller.json +0771c634ffd9a6a354ca2464a26c48bfbb19699d assets/refinedstorage/models/item/cyan_controller.json +5b3089cc0257509445e335427fcee15a0c6d19e4 assets/refinedstorage/models/item/cyan_crafter.json +734e1865d2b25eda65d72541f7db30b277d3cf73 assets/refinedstorage/models/item/cyan_crafter_manager.json +c4fc9d67c903d107548d25237173d1df0dfad2ee assets/refinedstorage/models/item/cyan_crafting_grid.json +133a84e4fd76123350bffc37cab6156ae6a0f61f assets/refinedstorage/models/item/cyan_crafting_monitor.json +0771c634ffd9a6a354ca2464a26c48bfbb19699d assets/refinedstorage/models/item/cyan_creative_controller.json +3e224af44dddb95f804967974a776f3d39e14f79 assets/refinedstorage/models/item/cyan_detector.json +db51d1db8c2ef34f4ca03499081995031fc9bd75 assets/refinedstorage/models/item/cyan_disk_manipulator.json +959e0627277816d1d5a0a529bee59631aa2cbd59 assets/refinedstorage/models/item/cyan_fluid_grid.json +5e4dec30d4dffc887cd8e8b967ca0d43e5f53d18 assets/refinedstorage/models/item/cyan_grid.json +eb2db4269ca283c9665b9fa5e1235862af32b000 assets/refinedstorage/models/item/cyan_network_receiver.json +6a5dfd3fc40fda27327da49c895775099d0406bb assets/refinedstorage/models/item/cyan_network_transmitter.json +f404bf86051e76eb736827ecb9a7acbb78a86a0c assets/refinedstorage/models/item/cyan_pattern_grid.json +2c6119b52833d26535d5c9c826f806b1a799745c assets/refinedstorage/models/item/cyan_relay.json +c3bcb743cd9b551b8e3e07dd16a039ccce65167f assets/refinedstorage/models/item/cyan_security_manager.json +9ab085f44867d2c6e6431914ee0b8d5b20f1f6ea assets/refinedstorage/models/item/cyan_wireless_transmitter.json +a14c5f121b112f80f018eb39e4017a044f5176c2 assets/refinedstorage/models/item/detector.json +b864dd2a574cb0ff0f87373ba145b7e7c4b6a315 assets/refinedstorage/models/item/disk_manipulator.json +b6f77a02dc8f84c8dc50af0e3ca8d4a2597894fb assets/refinedstorage/models/item/fluid_grid.json +9dfedbca7429678288b5e569f4ca99b1723c24b2 assets/refinedstorage/models/item/gray_controller.json +f201a4dc689054fbf5afa4cd9318059b45e34fac assets/refinedstorage/models/item/gray_crafter.json +d699ea44dc8ba183d453f865bb5dd816cae8a628 assets/refinedstorage/models/item/gray_crafter_manager.json +e8beb5658c198903aa882e818e9f1a12fb219ed2 assets/refinedstorage/models/item/gray_crafting_grid.json +a24b4fb9353df1c8b9ba48ec7cda1402a0d18e06 assets/refinedstorage/models/item/gray_crafting_monitor.json +9dfedbca7429678288b5e569f4ca99b1723c24b2 assets/refinedstorage/models/item/gray_creative_controller.json +3a62caa71a381e853fb8e1fd09e6eca16de95b8c assets/refinedstorage/models/item/gray_detector.json +876cf3b8ad044945e93a2dcf595e5ee851a95801 assets/refinedstorage/models/item/gray_disk_manipulator.json +4eb03c2834f4d92be29707d3a7e3412d2e5afae7 assets/refinedstorage/models/item/gray_fluid_grid.json +1ba67cee521c3d178eae56d0ee44c13dc244ecc6 assets/refinedstorage/models/item/gray_grid.json +dd9a85970dd5e0f4f7f0da196cda01b3f1156007 assets/refinedstorage/models/item/gray_network_receiver.json +d549169a533feee23ee8f3e1b39b7c4bcf23b475 assets/refinedstorage/models/item/gray_network_transmitter.json +558bee5f5c8415c73aae98e67851e9f192ab7157 assets/refinedstorage/models/item/gray_pattern_grid.json +39bd74ec45ffe304d1e339d184b2164117d88b5f assets/refinedstorage/models/item/gray_relay.json +9db80d9e795dbe5edff7a565671cf0095a7c4973 assets/refinedstorage/models/item/gray_security_manager.json +be60c25b51488e5a1f5db9aa0b8ce834b4f843b6 assets/refinedstorage/models/item/gray_wireless_transmitter.json +83f880c7750bb4e0ab772b23955faa259792b078 assets/refinedstorage/models/item/green_controller.json +36aec4f5a603dddd1817a815a612a4eb7190e222 assets/refinedstorage/models/item/green_crafter.json +6fce1c029999c014a5d9bd0ac7b2b24838dc0cf6 assets/refinedstorage/models/item/green_crafter_manager.json +3d835f157f4ace96a84a0e990276fe03fe1758c4 assets/refinedstorage/models/item/green_crafting_grid.json +cbb61098395bda16b743c82f56529a00d91a708a assets/refinedstorage/models/item/green_crafting_monitor.json +83f880c7750bb4e0ab772b23955faa259792b078 assets/refinedstorage/models/item/green_creative_controller.json +7ec5ba813db5c1ae5663bebfa659b53c8e75096c assets/refinedstorage/models/item/green_detector.json +7b0b74419933a23e3921672b49edc8830d1b3045 assets/refinedstorage/models/item/green_disk_manipulator.json +a8c70489b145ecafc07040195946c329ae30da41 assets/refinedstorage/models/item/green_fluid_grid.json +5e5828f3f71c072a6b5aea5d219123eb392fb7b3 assets/refinedstorage/models/item/green_grid.json +a0b8687000680d8d8a55a7d6e21a6a5b8c3ba935 assets/refinedstorage/models/item/green_network_receiver.json +9be69ecfb8d48aa8b7a1dfe97e428ab50b261864 assets/refinedstorage/models/item/green_network_transmitter.json +ffa8411a90dd0a79f72936c46b1514340c561fdc assets/refinedstorage/models/item/green_pattern_grid.json +ca9981a8b7c74fbdea91c12409b1c56929f829a2 assets/refinedstorage/models/item/green_relay.json +29860d74f6f59ebabc4534eb3e437c50d82e6d75 assets/refinedstorage/models/item/green_security_manager.json +0f626e543261b13e2d9021d09fc804236b9c9ca5 assets/refinedstorage/models/item/green_wireless_transmitter.json +8e62b1170a93f317a3a0463eb2dc331bc6a29fc8 assets/refinedstorage/models/item/grid.json +2269e15b0f486194980cd1fe6ed2c7c506d10c3c assets/refinedstorage/models/item/light_gray_controller.json +1280d243a5ee781a911776123a92280f6871e92b assets/refinedstorage/models/item/light_gray_crafter.json +63d91aa91f0b04bc56661d77cba3802a028b14c3 assets/refinedstorage/models/item/light_gray_crafter_manager.json +5447f9412ac89a2453495f7012906936556f3f97 assets/refinedstorage/models/item/light_gray_crafting_grid.json +589f1eab82f17738f7c84408250051526612166c assets/refinedstorage/models/item/light_gray_crafting_monitor.json +2269e15b0f486194980cd1fe6ed2c7c506d10c3c assets/refinedstorage/models/item/light_gray_creative_controller.json +c0fe9601a0b96cb28e05777646e8b1fa06dff11c assets/refinedstorage/models/item/light_gray_detector.json +a015d9065f13234987d35e242922e19a39cda358 assets/refinedstorage/models/item/light_gray_disk_manipulator.json +792b2649c17462ffad43035187f9ae62faf2f741 assets/refinedstorage/models/item/light_gray_fluid_grid.json +7a93c48e5851c4d45de5a6d138c16556faee7090 assets/refinedstorage/models/item/light_gray_grid.json +d7492fb5ea426b156d29d90cac3c068a69257993 assets/refinedstorage/models/item/light_gray_network_receiver.json +180ce6ef10d59c8495a35a00dd05ba68011f0238 assets/refinedstorage/models/item/light_gray_network_transmitter.json +0574aa946a4db136d2141b599587b5e06b4cb5f4 assets/refinedstorage/models/item/light_gray_pattern_grid.json +4b04ebd4de4cc44d66f69595a15e19c986bd89c5 assets/refinedstorage/models/item/light_gray_relay.json +72c8be165eead23444e70fd27b214fbe4b4c8f5c assets/refinedstorage/models/item/light_gray_security_manager.json +cf8a25b86388ed35135d6f7abc84c9db2f8c3147 assets/refinedstorage/models/item/light_gray_wireless_transmitter.json +011d6b505683c116a6dec86ac3f6a6164f6b9d6a assets/refinedstorage/models/item/lime_controller.json +b5fe18a5faa8b19bca2356055bed26e3c4b7d6da assets/refinedstorage/models/item/lime_crafter.json +c06a4c91f48f582ec7bbddf1992632496f628052 assets/refinedstorage/models/item/lime_crafter_manager.json +5cd081548f10fccc38406afa4e62211a67068868 assets/refinedstorage/models/item/lime_crafting_grid.json +d42a9b602a6b3e8ca87f44093bd5dbb8d025b83b assets/refinedstorage/models/item/lime_crafting_monitor.json +011d6b505683c116a6dec86ac3f6a6164f6b9d6a assets/refinedstorage/models/item/lime_creative_controller.json +acc983f06040f4785c84fca542678df7bf93eba6 assets/refinedstorage/models/item/lime_detector.json +19e1e36a546b3ec487a2a4356d85b0f0d72ad69d assets/refinedstorage/models/item/lime_disk_manipulator.json +2d485286e0757a593ca7ce9cd37ce34ba036fc4f assets/refinedstorage/models/item/lime_fluid_grid.json +16d5987ef2c508c6ce6c4b06d79d34ae5e43a985 assets/refinedstorage/models/item/lime_grid.json +2bca4fdbc24291df49aed6c594df508b01b32a24 assets/refinedstorage/models/item/lime_network_receiver.json +a9be76a8a262a6a315f1227d33c8d7304b21f04a assets/refinedstorage/models/item/lime_network_transmitter.json +9c3504533314ded4447251d7321f662e651587f7 assets/refinedstorage/models/item/lime_pattern_grid.json +95676494b1360458129336fb1c89a827d9887d9a assets/refinedstorage/models/item/lime_relay.json +c06aaadeb1e8573ee6a8f4d66c47a908df9df070 assets/refinedstorage/models/item/lime_security_manager.json +4ac21895d402f5824f599daeae315330deeeb5cc assets/refinedstorage/models/item/lime_wireless_transmitter.json +9f27b43f99677fca67591759cbe5f6edd73bb50a assets/refinedstorage/models/item/magenta_controller.json +7ae69165d5905f17a5e837de77d22941f3f22181 assets/refinedstorage/models/item/magenta_crafter.json +97a0c41ddb54000647c33b56095215033b7f364a assets/refinedstorage/models/item/magenta_crafter_manager.json +fea6df9eea90ca27131d5b9e37b08d50b1cb3618 assets/refinedstorage/models/item/magenta_crafting_grid.json +3bf88ca8bbd2ebe7eba52cd6a90a81d4af0391b0 assets/refinedstorage/models/item/magenta_crafting_monitor.json +9f27b43f99677fca67591759cbe5f6edd73bb50a assets/refinedstorage/models/item/magenta_creative_controller.json +5fdee8b4342e1b1b8e09a8ab300fcb9dbdcf8530 assets/refinedstorage/models/item/magenta_detector.json +44ff4ad0e90b6b4bc72653d833e04e5352241304 assets/refinedstorage/models/item/magenta_disk_manipulator.json +220ab0b014958d16917799de11a951e9ab8b207c assets/refinedstorage/models/item/magenta_fluid_grid.json +8e3ea806407ae7ec6dd0619f8bdb2edf0c6fe0aa assets/refinedstorage/models/item/magenta_grid.json +89da8c0449d5c16adbf793f08fa64e78ad320018 assets/refinedstorage/models/item/magenta_network_receiver.json +6228fdb00897e8e25454017336570fe15410ee4c assets/refinedstorage/models/item/magenta_network_transmitter.json +1aeb5a567564f664893434a89d95c640006c3d0e assets/refinedstorage/models/item/magenta_pattern_grid.json +7cde3959bc32026f58cdc12755d1c9ecedb74f51 assets/refinedstorage/models/item/magenta_relay.json +d7bcf381a5d9689d554438184f0fec0012f65f05 assets/refinedstorage/models/item/magenta_security_manager.json +833c0a8c3e209c604cad8146468143470693f42a assets/refinedstorage/models/item/magenta_wireless_transmitter.json +6dbbe55fd346aaa8eec23b2808ffd18d5840d832 assets/refinedstorage/models/item/network_receiver.json +54f8841b6832f05b8e5076cfb5a714ef66c4b159 assets/refinedstorage/models/item/network_transmitter.json +4c5f868c405f5a821344993b45ce1c7eb53b39ef assets/refinedstorage/models/item/orange_controller.json +2a934a32a43fd58110eebc7b3e4b05f71c21b76c assets/refinedstorage/models/item/orange_crafter.json +3e7fbb114a1270c3e2cf2d79f043c62e869de2dc assets/refinedstorage/models/item/orange_crafter_manager.json +4f35a7cc88dff4dc4ee066261024f14f123f8227 assets/refinedstorage/models/item/orange_crafting_grid.json +0c7188e1968be58e1797720861a5d104f7dae2a4 assets/refinedstorage/models/item/orange_crafting_monitor.json +4c5f868c405f5a821344993b45ce1c7eb53b39ef assets/refinedstorage/models/item/orange_creative_controller.json +833cc370275e91e9088bba3505b52e9199beafca assets/refinedstorage/models/item/orange_detector.json +cc94b04311c3c1089dc1e488464540f5ef04b448 assets/refinedstorage/models/item/orange_disk_manipulator.json +846a0e2b574b4518a392916902564fc692b72994 assets/refinedstorage/models/item/orange_fluid_grid.json +862b3b4e3b1eaddb034cb8b4384c1cf7374a0778 assets/refinedstorage/models/item/orange_grid.json +7d58c259c555a33cad472a3edfc3bd33f4160c66 assets/refinedstorage/models/item/orange_network_receiver.json +0e1f7e25ce5bbc1369116550f3f7c095cff3df12 assets/refinedstorage/models/item/orange_network_transmitter.json +cae021973ae73db4f26907bc20af071b4788a7d1 assets/refinedstorage/models/item/orange_pattern_grid.json +8dab67d1e96096cdc41c4b62dcabfd81019b518c assets/refinedstorage/models/item/orange_relay.json +fc333d59e066c62ef6bad598dfaadcc030655f23 assets/refinedstorage/models/item/orange_security_manager.json +27557f3fd10361a51c867fe8211073807576f040 assets/refinedstorage/models/item/orange_wireless_transmitter.json +4368418d5b92cbaa041d20e6f25d06ab3f24fd6f assets/refinedstorage/models/item/pattern_grid.json +ee76a877974d73451d88c2ca231c8854ada09a1b assets/refinedstorage/models/item/pink_controller.json +3b472cd0ed96b6eb64c7695429cc7a76e629f1a6 assets/refinedstorage/models/item/pink_crafter.json +03a29baf74da2cbf3d7ee5ae8d9925d19c34e8f3 assets/refinedstorage/models/item/pink_crafter_manager.json +e0710739ed2c8c74147585c990fe62d9fdb18ab0 assets/refinedstorage/models/item/pink_crafting_grid.json +71045a36761dca453325aced8d84cff206c81817 assets/refinedstorage/models/item/pink_crafting_monitor.json +ee76a877974d73451d88c2ca231c8854ada09a1b assets/refinedstorage/models/item/pink_creative_controller.json +6c67a4fc7796172f625c4862cf616c86bf8cba79 assets/refinedstorage/models/item/pink_detector.json +75c748b9473e195554615573406e1571b5ccac10 assets/refinedstorage/models/item/pink_disk_manipulator.json +c3b2796d126d95f9141472a0c0009d88bd7cb855 assets/refinedstorage/models/item/pink_fluid_grid.json +9af67ec1885b0215227dcd252606a5893eb04302 assets/refinedstorage/models/item/pink_grid.json +b376b5e220c3ae55cf3ecfb69495d57b554f9223 assets/refinedstorage/models/item/pink_network_receiver.json +ba12ed9891fa73b2336ff93ab4bfd0d3b1492652 assets/refinedstorage/models/item/pink_network_transmitter.json +869f05efe6e5d262b6094b68913c99472c11895d assets/refinedstorage/models/item/pink_pattern_grid.json +6d6d9cd242688e2891cd6fc8c74eb19dcf36ac19 assets/refinedstorage/models/item/pink_relay.json +fe2fc6e128f619dddc5d9f04486264a245c2b457 assets/refinedstorage/models/item/pink_security_manager.json +332f608a7dc84019b8b0fa2a5e44ad9f78e430de assets/refinedstorage/models/item/pink_wireless_transmitter.json +4dfb50d2cd83c9592a6273cebe727c01aa4f1636 assets/refinedstorage/models/item/purple_controller.json +506b89f03df977db6eb43c09d39b8aa8d7fcc28a assets/refinedstorage/models/item/purple_crafter.json +b3b6be54491ba314822a6b47b20a55955b81a986 assets/refinedstorage/models/item/purple_crafter_manager.json +413fffa72205e3c3f50106162bf88e8d18cad8ab assets/refinedstorage/models/item/purple_crafting_grid.json +ac159f10aab33c9e95009384d994a46caf4e9c5b assets/refinedstorage/models/item/purple_crafting_monitor.json +4dfb50d2cd83c9592a6273cebe727c01aa4f1636 assets/refinedstorage/models/item/purple_creative_controller.json +a137fc45d5f9b891ef00d75a2855258a88177668 assets/refinedstorage/models/item/purple_detector.json +525576087501ad8483619e8339a614951eada2b6 assets/refinedstorage/models/item/purple_disk_manipulator.json +80fb0c7bc38471d990c1623918a96db182bbe93b assets/refinedstorage/models/item/purple_fluid_grid.json +87e4943c1c019cac11083c479a4c5f563051ddd2 assets/refinedstorage/models/item/purple_grid.json +f319ca93c15a56a7927d022c123608dfb1a91f21 assets/refinedstorage/models/item/purple_network_receiver.json +46eb95a94c5d12503bcfbcdaf849a03a176974b9 assets/refinedstorage/models/item/purple_network_transmitter.json +c5a01a9ddace2e421e32b12c83d7a0b384be75fa assets/refinedstorage/models/item/purple_pattern_grid.json +e2efaf0e99c7dc1125b32370201be809a67c25d9 assets/refinedstorage/models/item/purple_relay.json +3c3ed303d605e0e9345940fc1756e2ecd1c48287 assets/refinedstorage/models/item/purple_security_manager.json +ef7d480ea1f08c1a2a7c2aebcbe3ca751df9f9b6 assets/refinedstorage/models/item/purple_wireless_transmitter.json +30cae1f86496d859b04120d0f0948597323b1c6b assets/refinedstorage/models/item/red_controller.json +6804c531235f5c7cd13f0c734a30aa58855c66d8 assets/refinedstorage/models/item/red_crafter.json +f2804c202120637bff89dd8b2ab8e43ba1f5aafc assets/refinedstorage/models/item/red_crafter_manager.json +acddcd41152a23916905fd85ad62081f5cb8c90c assets/refinedstorage/models/item/red_crafting_grid.json +5a93d02b15f7ef2d9803ef0d004930ed1766707b assets/refinedstorage/models/item/red_crafting_monitor.json +30cae1f86496d859b04120d0f0948597323b1c6b assets/refinedstorage/models/item/red_creative_controller.json +4c1c2a7322dada203e2521225d80c5b516cacb62 assets/refinedstorage/models/item/red_detector.json +262bdaf7a4a2a587dc88e3fb5c72c22e16829998 assets/refinedstorage/models/item/red_disk_manipulator.json +67e092b9a6df25cb4396d3ae4464dd3c009c60b2 assets/refinedstorage/models/item/red_fluid_grid.json +beb09fb2b90d4a5d0e2debb2b496f7cc5e1906af assets/refinedstorage/models/item/red_grid.json +c2f491455989b852e1c40a2e2003aeb482b5a628 assets/refinedstorage/models/item/red_network_receiver.json +d2127558a02a6cb0a6c58a1feb8a4b9eb251d544 assets/refinedstorage/models/item/red_network_transmitter.json +591164ab827c9f7fd0cfa0f7e7b42c94f801fac6 assets/refinedstorage/models/item/red_pattern_grid.json +4eaa387e037be30d51852c185d80ee1eea03559f assets/refinedstorage/models/item/red_relay.json +37b2c3f4b626765fb97a1aada4c0cc5b60ffac67 assets/refinedstorage/models/item/red_security_manager.json +05e22d0e5fafbbe8c6864c896a05907b1808c4cf assets/refinedstorage/models/item/red_wireless_transmitter.json +58e008aea088a9e1903885a2bc6e14d9f0b2c333 assets/refinedstorage/models/item/relay.json +e0546ec6993e456e7ef61a35cccc862382b15fd5 assets/refinedstorage/models/item/security_manager.json +346c26a65981ebc056b0ee27d2de9c51ba4994dd assets/refinedstorage/models/item/white_controller.json +c6e5a16319d0fad19ac8ede0108b658cd4028146 assets/refinedstorage/models/item/white_crafter.json +e6194df137b2c614d6402d6dc672beae80430d38 assets/refinedstorage/models/item/white_crafter_manager.json +399926c00694fa7abefd1709cc3da37d7eb0c5af assets/refinedstorage/models/item/white_crafting_grid.json +ecff06abfe1465fb6630f027f9253965ceb2ed60 assets/refinedstorage/models/item/white_crafting_monitor.json +346c26a65981ebc056b0ee27d2de9c51ba4994dd assets/refinedstorage/models/item/white_creative_controller.json +5f1ae8346d30d2e4f6b5aed97504d35ec05eecfe assets/refinedstorage/models/item/white_detector.json +0eec3932d36ed9e265a48b90fc1ae83bb95a3aa3 assets/refinedstorage/models/item/white_disk_manipulator.json +ca0c7707acf771758db0194f30f1247d4721ae50 assets/refinedstorage/models/item/white_fluid_grid.json +42e10b1a94e013425fc1ff146d9cdc07c4b242b4 assets/refinedstorage/models/item/white_grid.json +39d06d08ba1e35d8322386345828d14eb16ac0d8 assets/refinedstorage/models/item/white_network_receiver.json +4c147f69e564648441aaeecee3c2fc132501fc05 assets/refinedstorage/models/item/white_network_transmitter.json +6a4add44bd9ff08a7d30fc79d38c45f9f9aa55da assets/refinedstorage/models/item/white_pattern_grid.json +8fc4acd3d401ce6496db2af111ab2b97716349bf assets/refinedstorage/models/item/white_relay.json +42c146254c8c634eb9f79f29b909535b0504d6a5 assets/refinedstorage/models/item/white_security_manager.json +dffc5e13406d4370d1cc3fcc69c7556029406e98 assets/refinedstorage/models/item/white_wireless_transmitter.json +08797906f5356ea0ccc061347d188bab0c63c02d assets/refinedstorage/models/item/wireless_transmitter.json +ffd57aa30d902404da8963c14320fa8be54d6451 assets/refinedstorage/models/item/yellow_controller.json +1bf5a3d8d72edcd34ddf8266caaac89717a02ecb assets/refinedstorage/models/item/yellow_crafter.json +6b33ac9d2c729a4ea8dd42efb8feeb553a434d70 assets/refinedstorage/models/item/yellow_crafter_manager.json +b628289d264ed316cd2d88c297fb8712f8bbffd2 assets/refinedstorage/models/item/yellow_crafting_grid.json +496e7503c51cf826e718301641235d07ddb24de7 assets/refinedstorage/models/item/yellow_crafting_monitor.json +ffd57aa30d902404da8963c14320fa8be54d6451 assets/refinedstorage/models/item/yellow_creative_controller.json +04e4c31f56373507a46da2deccc4890305fe671e assets/refinedstorage/models/item/yellow_detector.json +6412b4000a8034e4b5e019b9a6d9c32085cda263 assets/refinedstorage/models/item/yellow_disk_manipulator.json +5b6b9685ed940cdfcede5c4df4b6836fbd748895 assets/refinedstorage/models/item/yellow_fluid_grid.json +bf3386182b6e8b29a9e4e8f72eaeec17169a39e5 assets/refinedstorage/models/item/yellow_grid.json +e0283cdc201bd14bf272859692be8f71c0f9cbeb assets/refinedstorage/models/item/yellow_network_receiver.json +29a2c43527626231f73d53badc08a9f6f11f7615 assets/refinedstorage/models/item/yellow_network_transmitter.json +b9bfe30d83136faf826f2391fb7a3ed3742ae22e assets/refinedstorage/models/item/yellow_pattern_grid.json +bd7660f94971400544ee3ea14876efab3f493b96 assets/refinedstorage/models/item/yellow_relay.json +fc534d01e53b660bf69498968487d1dae1b6de02 assets/refinedstorage/models/item/yellow_security_manager.json +e6c24f334bd8249c5c629b86fc761d92d9f901e5 assets/refinedstorage/models/item/yellow_wireless_transmitter.json diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json index 459e9dd53..ff6f106ec 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/black" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/black_crafter.json index 725c5af86..f46eb7533 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/black", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/black" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/black", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/black", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/black", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/black", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/black", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/black", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/black" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/black", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/black_crafter_manager.json index 12cc9f6f4..a7a109212 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/black" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/black", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/black", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/black", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/black" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/black", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/black", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json index 97737be0b..ad57bf531 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/black" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/black", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/black", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/black", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/black" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/black", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/black", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_monitor.json index 7361444e9..0e58ab3a2 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/black" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/black", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/black", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/black", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/black" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/black", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/black", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json index 459e9dd53..ff6f106ec 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/black" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/black_fluid_grid.json index f62dad549..ecda34b98 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/black" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/black", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/black", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/black", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/black" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/black", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/black", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json index c711ac496..7317771fb 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/black" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/black", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/black", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/black", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/black" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/black", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/black", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/black_pattern_grid.json index c4d61d8c5..351a37983 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/black" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/black", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/black", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/black", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/black" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/black", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/black", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json index 7efac74c5..a070ce974 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/black" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/black", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/black", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/black", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/black" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/black", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/black", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json index ab8b9311e..f7e357d43 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/black" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/black", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/black", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/black", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/black", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/black" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/black", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json index 14c8a49d4..2ea391b47 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/blue" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter.json index b7c1f2057..2d19df78b 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/blue", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/blue" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/blue", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/blue", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/blue", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/blue", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/blue", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/blue", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/blue" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/blue", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter_manager.json index 0e77a6142..1e2d6de49 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json index f4da39197..50c198217 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_monitor.json index 7b728cbcd..241216d14 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json index 14c8a49d4..2ea391b47 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/blue" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_fluid_grid.json index b1f412012..4db987cd1 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json index 003ebf8d1..6ef661d7c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_pattern_grid.json index 2e54b1941..62ebb7cbc 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json index fa6942b13..f417cdd09 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json index e0e7b444e..62b54d3be 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/blue" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/blue", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/blue", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/blue", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/blue", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/blue" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/blue", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json index 488709971..19522ef0d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/brown" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter.json index a3990f1a0..8628b856c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/brown", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/brown" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/brown", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/brown", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/brown", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/brown", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/brown", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/brown", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/brown" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/brown", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter_manager.json index d0c72cfe6..6b97ff8c4 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/brown" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/brown", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/brown", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/brown", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/brown" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/brown", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/brown", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json index 8ddb80baf..cf17fc18d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/brown" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/brown", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/brown", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/brown", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/brown" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/brown", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/brown", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_monitor.json index f7e722a21..270a50895 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/brown" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/brown", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/brown", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/brown", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/brown" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/brown", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/brown", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json index 488709971..19522ef0d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/brown" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_fluid_grid.json index 3de0fbda1..77a1c3d4c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/brown" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/brown", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/brown", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/brown", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/brown" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/brown", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/brown", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json index b955c05f6..6c525a841 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/brown" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/brown", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/brown", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/brown", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/brown" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/brown", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/brown", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_pattern_grid.json index ea35154ee..dd806bf2c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/brown" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/brown", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/brown", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/brown", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/brown" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/brown", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/brown", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json index b279db833..b13dd60e7 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/brown" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/brown", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/brown", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/brown", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/brown" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/brown", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/brown", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json index a3383f99c..e9d833ec1 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/brown" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/brown", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/brown", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/brown", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/brown", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/brown" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/brown", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/controller.json b/src/generated/resources/assets/refinedstorage/blockstates/controller.json index a54a674ac..27cf06439 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/light_blue" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/crafter.json index 5756533c4..e5734ab85 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/light_blue", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/light_blue" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/light_blue", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/light_blue", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/light_blue", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/light_blue", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/light_blue", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/light_blue", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/light_blue" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/light_blue", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/crafter_manager.json index d215ebf5d..5cd3d32d9 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/light_blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/light_blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/light_blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/light_blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/light_blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/light_blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/light_blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json index 1dbe1c5a7..7699db5a6 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/light_blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/light_blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/light_blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/light_blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/light_blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/crafting_monitor.json index 15e6bc7d4..26e0aa622 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/light_blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/light_blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/light_blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/light_blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/light_blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/light_blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/light_blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json index a54a674ac..27cf06439 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/light_blue" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json index ab59143ca..b6d412eaa 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/cyan" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json index 99c74ca89..eaddacce6 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/cyan", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/cyan" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/cyan", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/cyan", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/cyan", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/cyan", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/cyan", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/cyan", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/cyan" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/cyan", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter_manager.json index 9c02b3280..07d5ac1e8 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/cyan" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/cyan", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/cyan", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/cyan", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/cyan" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/cyan", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/cyan", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json index 8b7f70f7a..42671f29f 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/cyan" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/cyan", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/cyan", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/cyan", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/cyan" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/cyan", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/cyan", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_monitor.json index bf5a97194..a34350000 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/cyan" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/cyan", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/cyan", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/cyan", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/cyan" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/cyan", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/cyan", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json index ab59143ca..b6d412eaa 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/cyan" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_fluid_grid.json index 3cb9339a8..339c86546 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/cyan" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/cyan", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/cyan", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/cyan", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/cyan" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/cyan", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/cyan", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json index b0f30df13..13fa19fcc 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/cyan" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/cyan", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/cyan", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/cyan", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/cyan" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/cyan", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/cyan", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_pattern_grid.json index 6711dd7b4..c045dd275 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/cyan" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/cyan", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/cyan", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/cyan", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/cyan" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/cyan", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/cyan", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json index 141ca9004..c0f99f83f 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/cyan" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/cyan", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/cyan", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/cyan", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/cyan" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/cyan", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/cyan", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json index 4b8afbf1c..75e77f66e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/cyan" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/cyan", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/cyan", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/cyan", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/cyan", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/cyan" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/cyan", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/fluid_grid.json index 0df2b3b25..df20c940f 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/light_blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/light_blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/light_blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/light_blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/light_blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/light_blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/light_blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json index d5b77de39..16c5288fe 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/gray" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json index b629d8e23..2aa1f9c8a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/gray", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/gray" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/gray", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/gray", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/gray", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/gray", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/gray", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/gray", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/gray" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/gray", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter_manager.json index f18531b99..b01f5aab3 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json index 422ec2930..2349b0569 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_monitor.json index 15d28a741..37878bc9e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json index d5b77de39..16c5288fe 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/gray" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_fluid_grid.json index 5c8206abf..470717b6a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json index bd663bb1d..2d7660f08 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_pattern_grid.json index 010b641a3..fa0541d2a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json index 9cd87089e..db14e837e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json index 8d8b40842..70bc6c5bd 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/gray" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/gray", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/gray", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/gray", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/gray", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/gray" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/gray", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json index 35628686c..985393957 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/green" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json index da41932e4..1a6c89c1e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/green", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/green" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/green", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/green", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/green", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/green", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/green", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/green", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/green" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/green", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/green_crafter_manager.json index 2d8211130..8288b1676 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/green" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/green", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/green", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/green", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/green" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/green", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/green", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json index 014982f4d..651716a3c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/green" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/green", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/green", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/green", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/green" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/green", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/green", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_monitor.json index 8cdbf1c9b..c30b2df56 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/green" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/green", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/green", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/green", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/green" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/green", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/green", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json index 35628686c..985393957 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/green" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/green_fluid_grid.json index 0d1d87efb..6d781c1ff 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/green" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/green", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/green", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/green", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/green" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/green", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/green", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json index 872e655e4..0a0ec6b1c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/green" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/green", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/green", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/green", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/green" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/green", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/green", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/green_pattern_grid.json index 6394afc3f..415883392 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/green" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/green", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/green", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/green", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/green" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/green", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/green", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json index e91f8d5c8..c9f6bcaa5 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/green" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/green", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/green", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/green", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/green" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/green", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/green", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json index cb28c7f03..d00ce9389 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/green" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/green", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/green", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/green", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/green", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/green" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/green", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/grid.json b/src/generated/resources/assets/refinedstorage/blockstates/grid.json index a253f334a..ead56a348 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/light_blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/light_blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/light_blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/light_blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/light_blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/light_blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/light_blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json index b07fa29ec..4c3aff946 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/light_gray" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json index 16d45df34..a9e4aa5c6 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/light_gray" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/light_gray", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/light_gray", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/light_gray", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/light_gray", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/light_gray" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/light_gray", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter_manager.json index dafd412f7..186aaa2cb 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/light_gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/light_gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/light_gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/light_gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/light_gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/light_gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/light_gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json index dd1fc9cf1..b32eec445 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/light_gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/light_gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/light_gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/light_gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/light_gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_monitor.json index 689533cab..7c61d729e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/light_gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/light_gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/light_gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/light_gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/light_gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/light_gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/light_gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json index b07fa29ec..4c3aff946 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/light_gray" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_fluid_grid.json index b537fe3c1..07e9256dd 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/light_gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/light_gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/light_gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/light_gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/light_gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/light_gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/light_gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json index 7bf96cbeb..ee3fb2593 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/light_gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/light_gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/light_gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/light_gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/light_gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/light_gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/light_gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_pattern_grid.json index 68c563eb4..bca16f938 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/light_gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/light_gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/light_gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/light_gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/light_gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/light_gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/light_gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json index 6515a6ec3..bafdd4800 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/light_gray" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/light_gray", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/light_gray", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/light_gray", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/light_gray" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/light_gray", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/light_gray", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json index 722a1a04d..39352b5d7 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/light_gray" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/light_gray", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/light_gray", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/light_gray", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/light_gray", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/light_gray" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/light_gray", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json index dbba7f61a..d9593164b 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/lime" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json index e762069db..569b21c58 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/lime", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/lime" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/lime", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/lime", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/lime", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/lime", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/lime", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/lime", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/lime" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/lime", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter_manager.json index 63dee54a5..eac5c75aa 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/lime" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/lime", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/lime", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/lime", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/lime" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/lime", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/lime", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json index 2da019d13..2c0274884 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/lime" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/lime", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/lime", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/lime", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/lime" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/lime", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/lime", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_monitor.json index e218cd94d..241760dc5 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/lime" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/lime", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/lime", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/lime", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/lime" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/lime", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/lime", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json index dbba7f61a..d9593164b 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/lime" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_fluid_grid.json index 7ef49e2d6..032c10c0c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/lime" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/lime", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/lime", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/lime", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/lime" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/lime", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/lime", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json index 62fb57814..2a541b444 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/lime" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/lime", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/lime", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/lime", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/lime" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/lime", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/lime", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_pattern_grid.json index 14b5a7940..09ed8894d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/lime" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/lime", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/lime", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/lime", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/lime" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/lime", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/lime", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json index c861f6122..e2787477d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/lime" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/lime", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/lime", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/lime", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/lime" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/lime", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/lime", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json index 5ceddc0b4..0687af1dc 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/lime" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/lime", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/lime", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/lime", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/lime", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/lime" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/lime", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json index 6d69f98cc..81297674c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/magenta" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json index e841b0291..f21df1587 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/magenta", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/magenta" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/magenta", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/magenta", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/magenta", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/magenta", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/magenta", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/magenta", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/magenta" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/magenta", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter_manager.json index a5af94418..985d90a71 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/magenta" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/magenta", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/magenta", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/magenta", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/magenta" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/magenta", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/magenta", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json index 6eaec799d..e22128bb9 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/magenta" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/magenta", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/magenta", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/magenta", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/magenta" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/magenta", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/magenta", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_monitor.json index 28c2ecbe5..7691bcc77 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/magenta" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/magenta", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/magenta", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/magenta", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/magenta" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/magenta", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/magenta", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json index 6d69f98cc..81297674c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/magenta" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_fluid_grid.json index 6a786e159..465d8d30d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/magenta" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/magenta", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/magenta", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/magenta", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/magenta" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/magenta", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/magenta", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json index cbbab9ea9..50cc41f2f 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/magenta" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/magenta", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/magenta", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/magenta", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/magenta" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/magenta", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/magenta", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_pattern_grid.json index dca496f41..c03ed937a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/magenta" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/magenta", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/magenta", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/magenta", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/magenta" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/magenta", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/magenta", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json index 905336504..eb22eeb21 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/magenta" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/magenta", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/magenta", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/magenta", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/magenta" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/magenta", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/magenta", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json index cdc67b1bd..d3bd0eef6 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/magenta" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/magenta", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/magenta", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/magenta", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/magenta", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/magenta" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/magenta", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json index 6751392ea..f1705413e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/orange" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json index e8cb93430..6bd75a25d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/orange", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/orange" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/orange", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/orange", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/orange", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/orange", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/orange", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/orange", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/orange" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/orange", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter_manager.json index 004114f72..38538e672 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/orange" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/orange", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/orange", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/orange", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/orange" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/orange", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/orange", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json index d5ae55c75..6f1c051f7 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/orange" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/orange", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/orange", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/orange", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/orange" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/orange", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/orange", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_monitor.json index 9d30859b6..db8d00c82 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/orange" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/orange", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/orange", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/orange", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/orange" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/orange", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/orange", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json index 6751392ea..f1705413e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/orange" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_fluid_grid.json index 9d6af22bf..960a24612 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/orange" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/orange", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/orange", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/orange", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/orange" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/orange", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/orange", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json index 2f8d87055..d7d64f232 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/orange" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/orange", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/orange", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/orange", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/orange" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/orange", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/orange", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_pattern_grid.json index d384df979..6b4cd772a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/orange" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/orange", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/orange", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/orange", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/orange" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/orange", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/orange", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json index d245d9186..dfc15cb40 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/orange" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/orange", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/orange", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/orange", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/orange" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/orange", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/orange", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json index 401170b3c..4c9de99de 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/orange" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/orange", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/orange", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/orange", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/orange", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/orange" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/orange", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/pattern_grid.json index d753bc8d4..25afa82b5 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/light_blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/light_blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/light_blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/light_blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/light_blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/light_blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/light_blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json index 59ebaac2a..3d57ce30e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/pink" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json index 31e715d54..a11c9c135 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/pink", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/pink" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/pink", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/pink", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/pink", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/pink", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/pink", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/pink", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/pink" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/pink", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter_manager.json index 8707e341d..e66001c92 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/pink" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/pink", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/pink", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/pink", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/pink" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/pink", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/pink", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json index 2798646a0..794b71ede 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/pink" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/pink", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/pink", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/pink", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/pink" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/pink", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/pink", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_monitor.json index 1d9085290..1bf3b1be1 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/pink" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/pink", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/pink", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/pink", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/pink" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/pink", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/pink", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json index 59ebaac2a..3d57ce30e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/pink" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_fluid_grid.json index d987207c5..bc5d0fe77 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/pink" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/pink", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/pink", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/pink", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/pink" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/pink", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/pink", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json index 5ceddceff..3c16a74d6 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/pink" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/pink", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/pink", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/pink", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/pink" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/pink", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/pink", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_pattern_grid.json index 9e7fe0e07..97355518a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/pink" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/pink", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/pink", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/pink", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/pink" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/pink", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/pink", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json index 17c33c025..04594ceae 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/pink" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/pink", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/pink", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/pink", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/pink" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/pink", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/pink", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json index 4a6ff2f8c..191f03d86 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/pink" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/pink", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/pink", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/pink", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/pink", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/pink" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/pink", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json index 9beb35881..a4801ca37 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/purple" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json index 55292575f..216383888 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/purple", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/purple" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/purple", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/purple", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/purple", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/purple", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/purple", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/purple", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/purple" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/purple", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter_manager.json index 41e1e2a7a..13071135b 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/purple" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/purple", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/purple", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/purple", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/purple" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/purple", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/purple", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json index 374f8911d..b0f676da6 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/purple" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/purple", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/purple", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/purple", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/purple" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/purple", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/purple", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_monitor.json index a8c3eda23..403b7e82d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/purple" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/purple", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/purple", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/purple", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/purple" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/purple", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/purple", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json index 9beb35881..a4801ca37 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/purple" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_fluid_grid.json index 738b9a9a7..086f07c5b 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/purple" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/purple", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/purple", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/purple", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/purple" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/purple", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/purple", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json index 0c527d42c..2291698c1 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/purple" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/purple", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/purple", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/purple", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/purple" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/purple", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/purple", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_pattern_grid.json index b94f5dadd..34de59476 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/purple" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/purple", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/purple", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/purple", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/purple" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/purple", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/purple", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json index 28b3f6b37..768cec132 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/purple" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/purple", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/purple", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/purple", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/purple" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/purple", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/purple", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json index 09de9d6fd..48719c62a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/purple" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/purple", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/purple", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/purple", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/purple", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/purple" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/purple", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json index 29d847ce6..fc2d99d73 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/red" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json index 69997b460..33e6291af 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/red", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/red" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/red", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/red", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/red", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/red", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/red", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/red", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/red" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/red", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/red_crafter_manager.json index e7298d3d1..c18f2b696 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/red" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/red", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/red", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/red", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/red" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/red", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/red", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json index fceba5714..c1dc71682 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/red" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/red", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/red", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/red", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/red" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/red", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/red", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_monitor.json index 2a61921cb..3a9ba032d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/red" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/red", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/red", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/red", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/red" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/red", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/red", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json index 29d847ce6..fc2d99d73 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/red" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/red_fluid_grid.json index cefa3f52d..8f49d9bb8 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/red" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/red", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/red", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/red", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/red" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/red", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/red", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json index 60aa7594c..ef8f4a50e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/red" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/red", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/red", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/red", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/red" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/red", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/red", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/red_pattern_grid.json index b11ef1bdf..0c58be4d8 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/red" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/red", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/red", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/red", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/red" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/red", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/red", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json index 47a03a242..d4ac6a6de 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/red" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/red", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/red", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/red", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/red" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/red", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/red", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json index 9cf0ed6b4..0b054533a 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/red" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/red", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/red", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/red", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/red", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/red" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/red", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json index 359d9ab5c..b496e079c 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/light_blue" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/light_blue", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/light_blue", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/light_blue", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/light_blue" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/light_blue", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/light_blue", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json index f1734de04..6739a58a2 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/white" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json index e50d88bc8..a54c4b178 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/white", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/white" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/white", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/white", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/white", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/white", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/white", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/white", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/white" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/white", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/white_crafter_manager.json index e55b40943..17dddf24d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/white" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/white", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/white", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/white", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/white" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/white", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/white", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json index eafc69dbc..af7bf4e4e 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/white" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/white", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/white", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/white", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/white" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/white", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/white", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_monitor.json index 2863a457f..79b8ab3e4 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/white" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/white", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/white", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/white", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/white" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/white", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/white", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json index f1734de04..6739a58a2 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/white" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/white_fluid_grid.json index 4e3b28a50..54dd6c09d 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/white" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/white", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/white", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/white", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/white" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/white", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/white", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json index e7ee7da7f..1cb154a09 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/white" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/white", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/white", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/white", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/white" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/white", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/white", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/white_pattern_grid.json index d1afd5bbc..757f79277 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/white" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/white", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/white", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/white", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/white" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/white", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/white", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json index 300c09ec7..42e54f535 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/white" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/white", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/white", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/white", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/white" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/white", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/white", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json index 76fa9a145..b93b8d6a3 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/white" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/white", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/white", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/white", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/white", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/white" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/white", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json index d543e882e..84a12c864 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/light_blue" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/light_blue", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/light_blue", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/light_blue", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/light_blue", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/light_blue" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/light_blue", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json index a0ec1bec2..8ac80652b 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/yellow" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json index c266b585f..3f0bb55ad 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json @@ -4,53 +4,53 @@ "model": "refinedstorage:block/crafter/disconnected", "x": 180 }, - "connected=true,direction=down": { - "model": "refinedstorage:block/crafter/yellow", - "x": 180 - }, - "connected=false,direction=up": { - "model": "refinedstorage:block/crafter/disconnected" - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/crafter/yellow" + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter/disconnected", + "x": 90, + "y": 90 }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter/disconnected", "x": 90 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter/yellow", - "x": 90 - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter/yellow", - "x": 90, - "y": 180 + "connected=false,direction=up": { + "model": "refinedstorage:block/crafter/disconnected" }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter/disconnected", "x": 90, "y": 270 }, - "connected=true,direction=west": { + "connected=true,direction=down": { "model": "refinedstorage:block/crafter/yellow", - "x": 90, - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter/disconnected", - "x": 90, - "y": 90 + "x": 180 }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter/yellow", "x": 90, "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter/yellow", + "x": 90 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter/yellow", + "x": 90, + "y": 180 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/crafter/yellow" + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter/yellow", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter_manager.json index 7a252b6f2..f9cc9a782 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafter_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafter_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafter_manager/yellow" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafter_manager/yellow", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafter_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafter_manager/yellow", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafter_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafter_manager/yellow", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafter_manager/yellow" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafter_manager/yellow", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafter_manager/yellow", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json index 8bcf8a3f6..a6a3404ce 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_grid/yellow" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_grid/yellow", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_grid/yellow", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_grid/yellow", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/yellow" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/yellow", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/yellow", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_monitor.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_monitor.json index ad23cfe5b..d3a639f15 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_monitor.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_monitor.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/crafting_monitor/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/crafting_monitor/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/crafting_monitor/yellow" - }, "connected=false,direction=south": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/crafting_monitor/yellow", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/crafting_monitor/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/crafting_monitor/yellow", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/crafting_monitor/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/crafting_monitor/yellow", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/crafting_monitor/yellow" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/crafting_monitor/yellow", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/crafting_monitor/yellow", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json index a0ec1bec2..8ac80652b 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json @@ -1,14 +1,14 @@ { "variants": { - "energy_type=off": { - "model": "refinedstorage:block/controller/off" - }, "energy_type=nearly_off": { "model": "refinedstorage:block/controller/nearly_off" }, "energy_type=nearly_on": { "model": "refinedstorage:block/controller/nearly_on" }, + "energy_type=off": { + "model": "refinedstorage:block/controller/off" + }, "energy_type=on": { "model": "refinedstorage:block/controller/yellow" } diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_fluid_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_fluid_grid.json index f8045b0b2..618f65169 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_fluid_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_fluid_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/fluid_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/fluid_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/fluid_grid/yellow" - }, "connected=false,direction=south": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/fluid_grid/yellow", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/fluid_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/fluid_grid/yellow", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/fluid_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/fluid_grid/yellow", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/fluid_grid/yellow" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/fluid_grid/yellow", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/fluid_grid/yellow", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json index 9d5368044..a941d7471 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/grid/yellow" - }, "connected=false,direction=south": { "model": "refinedstorage:block/grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/grid/yellow", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/grid/yellow", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/grid/yellow", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/grid/yellow" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/grid/yellow", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/grid/yellow", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_pattern_grid.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_pattern_grid.json index ed4a41859..04c534024 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_pattern_grid.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_pattern_grid.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/pattern_grid/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/pattern_grid/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/pattern_grid/yellow" - }, "connected=false,direction=south": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/pattern_grid/yellow", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/pattern_grid/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/pattern_grid/yellow", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/pattern_grid/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/pattern_grid/yellow", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/pattern_grid/yellow" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/pattern_grid/yellow", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/pattern_grid/yellow", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json index b0520e0f1..bc463f8df 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json @@ -1,34 +1,34 @@ { "variants": { + "connected=false,direction=east": { + "model": "refinedstorage:block/security_manager/disconnected", + "y": 90 + }, "connected=false,direction=north": { "model": "refinedstorage:block/security_manager/disconnected" }, - "connected=true,direction=north": { - "model": "refinedstorage:block/security_manager/yellow" - }, "connected=false,direction=south": { "model": "refinedstorage:block/security_manager/disconnected", "y": 180 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/security_manager/yellow", - "y": 180 - }, "connected=false,direction=west": { "model": "refinedstorage:block/security_manager/disconnected", "y": 270 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/security_manager/yellow", - "y": 270 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/security_manager/disconnected", - "y": 90 - }, "connected=true,direction=east": { "model": "refinedstorage:block/security_manager/yellow", "y": 90 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/security_manager/yellow" + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/security_manager/yellow", + "y": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/security_manager/yellow", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json b/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json index d126dfdb4..2838130b9 100644 --- a/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json +++ b/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json @@ -3,54 +3,54 @@ "connected=false,direction=down": { "model": "refinedstorage:block/wireless_transmitter/disconnected" }, - "connected=true,direction=down": { - "model": "refinedstorage:block/wireless_transmitter/yellow" - }, - "connected=false,direction=up": { + "connected=false,direction=east": { "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 180 - }, - "connected=true,direction=up": { - "model": "refinedstorage:block/wireless_transmitter/yellow", - "x": 180 + "x": 90, + "y": 270 }, "connected=false,direction=north": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 180 }, - "connected=true,direction=north": { - "model": "refinedstorage:block/wireless_transmitter/yellow", - "x": 90, - "y": 180 - }, "connected=false,direction=south": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90 }, - "connected=true,direction=south": { - "model": "refinedstorage:block/wireless_transmitter/yellow", - "x": 90 + "connected=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/disconnected", + "x": 180 }, "connected=false,direction=west": { "model": "refinedstorage:block/wireless_transmitter/disconnected", "x": 90, "y": 90 }, - "connected=true,direction=west": { - "model": "refinedstorage:block/wireless_transmitter/yellow", - "x": 90, - "y": 90 - }, - "connected=false,direction=east": { - "model": "refinedstorage:block/wireless_transmitter/disconnected", - "x": 90, - "y": 270 + "connected=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/yellow" }, "connected=true,direction=east": { "model": "refinedstorage:block/wireless_transmitter/yellow", "x": 90, "y": 270 + }, + "connected=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 90, + "y": 180 + }, + "connected=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 90 + }, + "connected=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 180 + }, + "connected=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 90, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/black.json b/src/generated/resources/assets/refinedstorage/models/block/controller/black.json index 30bc24dbd..8087bbe4f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/black.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/black" + "cutout": "refinedstorage:block/controller/cutouts/black", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json b/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json index 37e24bc7a..4c38dd911 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/blue" + "cutout": "refinedstorage:block/controller/cutouts/blue", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json b/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json index 9fb14b95d..de12fee45 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/brown" + "cutout": "refinedstorage:block/controller/cutouts/brown", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json index 2fcc5d75c..fa788c9b8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/cyan" + "cutout": "refinedstorage:block/controller/cutouts/cyan", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json b/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json index 9712b49fa..5f6282fa8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/gray" + "cutout": "refinedstorage:block/controller/cutouts/gray", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/green.json b/src/generated/resources/assets/refinedstorage/models/block/controller/green.json index 7d2159e12..c625a642a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/green.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/green" + "cutout": "refinedstorage:block/controller/cutouts/green", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json index 09ca8c305..32fb164f2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/light_blue" + "cutout": "refinedstorage:block/controller/cutouts/light_blue", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json index b374bb44a..ddddd4cb3 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/light_gray" + "cutout": "refinedstorage:block/controller/cutouts/light_gray", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json b/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json index 9b88b2db9..0915deb30 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/lime" + "cutout": "refinedstorage:block/controller/cutouts/lime", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json index 5a8f01c72..f5fc0fb2a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/magenta" + "cutout": "refinedstorage:block/controller/cutouts/magenta", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_off.json b/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_off.json index 339c7e7d7..0cea4595f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_off.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_off.json @@ -1,9 +1,9 @@ { "parent": "refinedstorage:block/controller_nearly", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/nearly_off_gray", "cutout_gray": "refinedstorage:block/controller/cutouts/nearly_off", - "cutout": "refinedstorage:block/controller/cutouts/nearly_off_gray" + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_on.json b/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_on.json index 2deacc5e3..3230d015c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_on.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/nearly_on.json @@ -1,9 +1,9 @@ { "parent": "refinedstorage:block/controller_nearly", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/nearly_on_gray", "cutout_gray": "refinedstorage:block/controller/cutouts/nearly_on", - "cutout": "refinedstorage:block/controller/cutouts/nearly_on_gray" + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/off.json b/src/generated/resources/assets/refinedstorage/models/block/controller/off.json index 258afefee..2aaf85f05 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/off.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/off.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/off", - "cutout": "refinedstorage:block/controller/cutouts/off" + "cutout": "refinedstorage:block/controller/cutouts/off", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json b/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json index b9258afa1..4fda503b8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/orange" + "cutout": "refinedstorage:block/controller/cutouts/orange", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json b/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json index 582abaf9e..0a8786c9d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/pink" + "cutout": "refinedstorage:block/controller/cutouts/pink", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json b/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json index 6e52d5ea5..417d22e64 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/purple" + "cutout": "refinedstorage:block/controller/cutouts/purple", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/red.json b/src/generated/resources/assets/refinedstorage/models/block/controller/red.json index 8aeb1ed39..56a5fb8f0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/red.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/red" + "cutout": "refinedstorage:block/controller/cutouts/red", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/white.json b/src/generated/resources/assets/refinedstorage/models/block/controller/white.json index a81a95cb6..25e03eef2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/white.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/white" + "cutout": "refinedstorage:block/controller/cutouts/white", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json index 6e0ef25c4..a1e85b745 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/controller/off", "all": "refinedstorage:block/controller/on", - "cutout": "refinedstorage:block/controller/cutouts/yellow" + "cutout": "refinedstorage:block/controller/cutouts/yellow", + "particle": "refinedstorage:block/controller/off" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json index b3ba0f784..b40c53f25 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_black", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_black", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_black", "cutout_north": "refinedstorage:block/crafter/cutouts/side_black", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_black" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_black", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_black", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_black", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json index 5168015af..d4ffb0816 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_blue", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_blue", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_blue", "cutout_north": "refinedstorage:block/crafter/cutouts/side_blue", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_blue" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_blue", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_blue", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json index 7116a8bd0..b25c00215 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_brown", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_brown", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_brown", "cutout_north": "refinedstorage:block/crafter/cutouts/side_brown", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_brown" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_brown", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_brown", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_brown", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json index 518ce3afd..4d5c75dc1 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_cyan", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_cyan", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_cyan", "cutout_north": "refinedstorage:block/crafter/cutouts/side_cyan", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_cyan" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_cyan", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_cyan", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_cyan", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json index 7247574b1..d15472b3b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_disconnected", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_disconnected", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_disconnected", "cutout_north": "refinedstorage:block/crafter/cutouts/side_disconnected", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_disconnected" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_disconnected", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_disconnected", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_disconnected", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json index a70995695..cbba20ffe 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_gray", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_gray", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_gray", "cutout_north": "refinedstorage:block/crafter/cutouts/side_gray", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_gray" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_gray", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_gray", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json index 6bcbae1fc..e1ebc3e2b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_green", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_green", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_green", "cutout_north": "refinedstorage:block/crafter/cutouts/side_green", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_green" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_green", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_green", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_green", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json index 0b7680919..fa3b497cf 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_light_blue", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_light_blue", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_light_blue", "cutout_north": "refinedstorage:block/crafter/cutouts/side_light_blue", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_light_blue" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_light_blue", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_light_blue", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_light_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json index ca369cceb..b244e2edf 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_light_gray", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_light_gray", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_light_gray", "cutout_north": "refinedstorage:block/crafter/cutouts/side_light_gray", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_light_gray" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_light_gray", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_light_gray", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_light_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json index 2086519bb..62e8159f8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_lime", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_lime", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_lime", "cutout_north": "refinedstorage:block/crafter/cutouts/side_lime", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_lime" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_lime", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_lime", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_lime", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json index 689f2be8a..2ef662b2a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_magenta", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_magenta", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_magenta", "cutout_north": "refinedstorage:block/crafter/cutouts/side_magenta", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_magenta" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_magenta", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_magenta", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_magenta", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json index d1a5ac19a..518652851 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_orange", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_orange", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_orange", "cutout_north": "refinedstorage:block/crafter/cutouts/side_orange", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_orange" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_orange", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_orange", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_orange", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json index da4eb00fb..c7a45d6a2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_pink", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_pink", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_pink", "cutout_north": "refinedstorage:block/crafter/cutouts/side_pink", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_pink" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_pink", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_pink", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_pink", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json index 465c5e1b7..c857c51bb 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_purple", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_purple", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_purple", "cutout_north": "refinedstorage:block/crafter/cutouts/side_purple", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_purple" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_purple", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_purple", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_purple", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json index 44c9547fd..f5b9c2425 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_red", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_red", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_red", "cutout_north": "refinedstorage:block/crafter/cutouts/side_red", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_red" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_red", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_red", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_red", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json index 95c8c4574..c279a92d8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_white", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_white", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_white", "cutout_north": "refinedstorage:block/crafter/cutouts/side_white", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_white" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_white", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_white", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_white", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json index d2f255c30..08d2792e6 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/crafter/side", - "east": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "west": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/crafter/side", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_yellow", - "cutout_west": "refinedstorage:block/crafter/cutouts/side_yellow", - "cutout_south": "refinedstorage:block/crafter/cutouts/side_yellow", "cutout_north": "refinedstorage:block/crafter/cutouts/side_yellow", - "cutout_up": "refinedstorage:block/crafter/cutouts/top_yellow" + "cutout_south": "refinedstorage:block/crafter/cutouts/side_yellow", + "cutout_up": "refinedstorage:block/crafter/cutouts/top_yellow", + "cutout_west": "refinedstorage:block/crafter/cutouts/side_yellow", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter/side", + "north": "refinedstorage:block/crafter/side", + "particle": "refinedstorage:block/crafter/side", + "south": "refinedstorage:block/crafter/side", + "up": "refinedstorage:block/crafter/top", + "west": "refinedstorage:block/crafter/side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/black.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/black.json index a34457e80..9d610c81e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/black.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/black", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/black" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/blue.json index 5a0e27837..36f37f162 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/blue" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/brown.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/brown.json index 7f1ae0df4..ae21bd6c3 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/brown.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/brown", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/brown" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/cyan.json index 2f3698e95..240f3c0ea 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/cyan.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/cyan", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/cyan" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json index c483779f2..7794045c7 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/disconnected", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/disconnected" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/gray.json index 6b39cc964..62f9facfa 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/gray" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/green.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/green.json index f8a745253..08f98c4be 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/green.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/green", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/green" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_blue.json index 1f7fc3f8c..b5e675301 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/light_blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/light_blue" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_gray.json index 87600bf28..d84986840 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/light_gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/light_gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/light_gray" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/lime.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/lime.json index 54490c467..f4b87428b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/lime.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/lime", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/lime" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/magenta.json index a7753765c..78bd57492 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/magenta.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/magenta", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/magenta" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/orange.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/orange.json index e74f2ea3b..3461b78eb 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/orange.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/orange", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/orange" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/pink.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/pink.json index f81f82820..2c1a345eb 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/pink.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/pink", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/pink" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/purple.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/purple.json index f27328484..36ed63397 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/purple.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/purple", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/purple" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/red.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/red.json index bbdacda46..e30547c02 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/red.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/red", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/red" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/white.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/white.json index fbeb025e5..407942e81 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/white.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/white", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/white" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/yellow.json index 27e62f77c..b2219a604 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/yellow.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafter_manager/right", - "east": "refinedstorage:block/crafter_manager/right", - "south": "refinedstorage:block/crafter_manager/back", - "west": "refinedstorage:block/crafter_manager/left", - "up": "refinedstorage:block/crafter_manager/top", + "cutout": "refinedstorage:block/crafter_manager/cutouts/yellow", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafter_manager/right", "north": "refinedstorage:block/crafter_manager/front", - "cutout": "refinedstorage:block/crafter_manager/cutouts/yellow" + "particle": "refinedstorage:block/crafter_manager/right", + "south": "refinedstorage:block/crafter_manager/back", + "up": "refinedstorage:block/crafter_manager/top", + "west": "refinedstorage:block/crafter_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json index 3eb167152..2bbc16bb4 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/black", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/black" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json index ae594632a..b5c6e08a6 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/blue" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json index 4805d1e6f..cd6f131cd 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/brown", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/brown" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json index 8b11085eb..24cd363d6 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/cyan", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/cyan" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json index 5b4ac4d59..8378dd852 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/disconnected" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json index 9fec2a089..7cf79509f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/gray" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json index 1d436f783..5d4d22e6d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/green", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/green" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json index a2d1ef8c8..777485eef 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/light_blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/light_blue" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json index 82be391aa..f0487057b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/light_gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/light_gray" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json index c93bd98f9..c3bc7eb3f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/lime", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/lime" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json index 4118eaa51..95d824c9a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/magenta", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/magenta" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json index a059c3f19..71e3999a5 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/orange", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/orange" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json index 5b9034e1f..e4e988f3c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/pink", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/pink" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json index ec5732b52..32fd9da4f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/purple", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/purple" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json index 33b978214..52269437c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/red", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/red" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json index f7e4de436..69550029f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/white", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/white" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json index f0e99f93e..6e2be86b5 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_grid/right", - "east": "refinedstorage:block/crafting_grid/right", - "south": "refinedstorage:block/crafting_grid/back", - "west": "refinedstorage:block/crafting_grid/left", - "up": "refinedstorage:block/crafting_grid/top", + "cutout": "refinedstorage:block/crafting_grid/cutouts/yellow", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", "north": "refinedstorage:block/crafting_grid/front", - "cutout": "refinedstorage:block/crafting_grid/cutouts/yellow" + "particle": "refinedstorage:block/crafting_grid/right", + "south": "refinedstorage:block/crafting_grid/back", + "up": "refinedstorage:block/crafting_grid/top", + "west": "refinedstorage:block/crafting_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/black.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/black.json index 859ef96f1..4f8f002e2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/black.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/black", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/black" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/blue.json index 10be6a255..11151ca99 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/blue" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/brown.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/brown.json index 176954ccf..7c9c317dd 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/brown.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/brown", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/brown" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/cyan.json index f6dfc8251..1905780fa 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/cyan.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/cyan", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/cyan" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json index 35c409664..ad88be609 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/disconnected", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/disconnected" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/gray.json index dbfd72566..cbd3f220e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/gray" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/green.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/green.json index e4a5a8d1b..3fa6d513e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/green.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/green", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/green" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_blue.json index 3d7fee19d..2060aa74e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/light_blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/light_blue" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_gray.json index 373090937..851f2863a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/light_gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/light_gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/light_gray" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/lime.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/lime.json index fb28aa0dc..2ee7f1a1b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/lime.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/lime", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/lime" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/magenta.json index a64542145..be8fd93df 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/magenta.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/magenta", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/magenta" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/orange.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/orange.json index b854dbaf4..52b2d14cc 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/orange.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/orange", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/orange" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/pink.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/pink.json index 423c685fd..53331f2bd 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/pink.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/pink", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/pink" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/purple.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/purple.json index 2ae40988a..17231c959 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/purple.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/purple", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/purple" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/red.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/red.json index 36b4743f6..b0768e61f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/red.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/red", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/red" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/white.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/white.json index d56978a69..4fcb5d2d2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/white.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/white", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/white" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/yellow.json index ed498ad16..4b2b8533b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/yellow.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/crafting_monitor/right", - "east": "refinedstorage:block/crafting_monitor/right", - "south": "refinedstorage:block/crafting_monitor/back", - "west": "refinedstorage:block/crafting_monitor/left", - "up": "refinedstorage:block/crafting_monitor/top", + "cutout": "refinedstorage:block/crafting_monitor/cutouts/yellow", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_monitor/right", "north": "refinedstorage:block/crafting_monitor/front", - "cutout": "refinedstorage:block/crafting_monitor/cutouts/yellow" + "particle": "refinedstorage:block/crafting_monitor/right", + "south": "refinedstorage:block/crafting_monitor/back", + "up": "refinedstorage:block/crafting_monitor/top", + "west": "refinedstorage:block/crafting_monitor/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/black.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/black.json index 70371a6cc..16d70ee12 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/black.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/black", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/black" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/blue.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/blue.json index 575e19d94..4da7b58d6 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/blue" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/brown.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/brown.json index ec1908f84..f5d07826c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/brown.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/brown", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/brown" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/cyan.json index c0f5881d3..867be455d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/cyan.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/cyan", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/cyan" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json index 49e2c7eed..6bbd50a69 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/disconnected" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/gray.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/gray.json index 867c2b199..0b3f23fb9 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/gray" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/green.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/green.json index 845d4f8a5..11b6eb728 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/green.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/green", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/green" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_blue.json index d1db5c2e4..69c206bc2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/light_blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/light_blue" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_gray.json index 11fc5cfdc..f94d04735 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/light_gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/light_gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/light_gray" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/lime.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/lime.json index 3e299406a..9f2b81c0e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/lime.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/lime", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/lime" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/magenta.json index 9166b4e01..7966bbfb2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/magenta.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/magenta", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/magenta" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/orange.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/orange.json index 7fe1cb482..86d1512d0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/orange.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/orange", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/orange" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/pink.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/pink.json index 3f2a30c77..5b4dca0af 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/pink.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/pink", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/pink" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/purple.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/purple.json index d49b393e3..8a44ab798 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/purple.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/purple", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/purple" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/red.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/red.json index 872121dd5..83beba4e9 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/red.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/red", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/red" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/white.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/white.json index 1c9b12b3c..a5ba174b7 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/white.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/white", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/white" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/yellow.json index 8f1f430dd..7f291524e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/yellow.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/fluid_grid/right", - "east": "refinedstorage:block/fluid_grid/right", - "south": "refinedstorage:block/fluid_grid/back", - "west": "refinedstorage:block/fluid_grid/left", - "up": "refinedstorage:block/fluid_grid/top", + "cutout": "refinedstorage:block/fluid_grid/cutouts/yellow", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/fluid_grid/right", "north": "refinedstorage:block/fluid_grid/front", - "cutout": "refinedstorage:block/fluid_grid/cutouts/yellow" + "particle": "refinedstorage:block/fluid_grid/right", + "south": "refinedstorage:block/fluid_grid/back", + "up": "refinedstorage:block/fluid_grid/top", + "west": "refinedstorage:block/fluid_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/black.json b/src/generated/resources/assets/refinedstorage/models/block/grid/black.json index 9c01ae3bd..423e28f1c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/black.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/black", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/black" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json b/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json index 91558921e..bf2ba1403 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/blue" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json b/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json index 11299efa7..937603e42 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/brown", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/brown" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json index 2bbdfe768..ba49bb205 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/cyan", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/cyan" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json index d19e58a75..3f5a5e069 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/disconnected" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json b/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json index bf05fcbc7..f84165aea 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/gray" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/green.json b/src/generated/resources/assets/refinedstorage/models/block/grid/green.json index f8295d72e..3d8af9189 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/green.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/green", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/green" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json index 13b407096..dc0bfbcd5 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/light_blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/light_blue" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json index 63822633f..c04b91707 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/light_gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/light_gray" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json b/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json index e9b6b2883..49716ccbb 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/lime", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/lime" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json index e6d5ce685..cb3291a64 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/magenta", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/magenta" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json b/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json index 3d37d245a..0b6ee5be9 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/orange", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/orange" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json b/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json index 0b1a92170..3ed9db7c6 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/pink", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/pink" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json b/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json index f96c8ddc9..0089e9a91 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/purple", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/purple" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/red.json b/src/generated/resources/assets/refinedstorage/models/block/grid/red.json index 04c5e25b6..a3631fc2f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/red.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/red", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/red" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/white.json b/src/generated/resources/assets/refinedstorage/models/block/grid/white.json index 5e65d3038..faa3372b0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/white.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/white", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/white" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json index ffe21039e..ed8750cd7 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/grid/right", - "east": "refinedstorage:block/grid/right", - "south": "refinedstorage:block/grid/back", - "west": "refinedstorage:block/grid/left", - "up": "refinedstorage:block/grid/top", + "cutout": "refinedstorage:block/grid/cutouts/yellow", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", "north": "refinedstorage:block/grid/front", - "cutout": "refinedstorage:block/grid/cutouts/yellow" + "particle": "refinedstorage:block/grid/right", + "south": "refinedstorage:block/grid/back", + "up": "refinedstorage:block/grid/top", + "west": "refinedstorage:block/grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json index f38dd5a5a..3f803e632 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/black" + "cutout": "refinedstorage:block/network_receiver/cutouts/black", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json index dc83765db..46b26cb9a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/blue" + "cutout": "refinedstorage:block/network_receiver/cutouts/blue", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json index 8b8fb3b69..b9d7945c9 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/brown" + "cutout": "refinedstorage:block/network_receiver/cutouts/brown", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json index f1353c75d..093e0d1cb 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/cyan" + "cutout": "refinedstorage:block/network_receiver/cutouts/cyan", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json index 7c057bd17..d2a6a5743 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/disconnected" + "cutout": "refinedstorage:block/network_receiver/cutouts/disconnected", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json index 97a47907b..2be279f2a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/gray" + "cutout": "refinedstorage:block/network_receiver/cutouts/gray", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json index d380950b9..e11efd152 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/green" + "cutout": "refinedstorage:block/network_receiver/cutouts/green", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json index 3ef2d3dca..62afe8a79 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/light_blue" + "cutout": "refinedstorage:block/network_receiver/cutouts/light_blue", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json index 8f825e664..71c4bd38e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/light_gray" + "cutout": "refinedstorage:block/network_receiver/cutouts/light_gray", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json index 8549c838e..38f969051 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/lime" + "cutout": "refinedstorage:block/network_receiver/cutouts/lime", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json index a80aab2e1..872701742 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/magenta" + "cutout": "refinedstorage:block/network_receiver/cutouts/magenta", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json index 3c95c40d2..f9d9d4538 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/orange" + "cutout": "refinedstorage:block/network_receiver/cutouts/orange", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json index 2763633ce..485ac3d8a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/pink" + "cutout": "refinedstorage:block/network_receiver/cutouts/pink", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json index 281578685..459f4722c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/purple" + "cutout": "refinedstorage:block/network_receiver/cutouts/purple", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json index 1debbcb7e..036872de0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/red" + "cutout": "refinedstorage:block/network_receiver/cutouts/red", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json index b1d10fe7d..792ca54c2 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/white" + "cutout": "refinedstorage:block/network_receiver/cutouts/white", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json index 556d333df..57d9fe529 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_receiver/network_receiver", "all": "refinedstorage:block/network_receiver/network_receiver", - "cutout": "refinedstorage:block/network_receiver/cutouts/yellow" + "cutout": "refinedstorage:block/network_receiver/cutouts/yellow", + "particle": "refinedstorage:block/network_receiver/network_receiver" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json index 32b46fa30..ea52f264f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/black" + "cutout": "refinedstorage:block/network_transmitter/cutouts/black", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json index 05c8f2a93..0aabeaa47 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/blue" + "cutout": "refinedstorage:block/network_transmitter/cutouts/blue", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json index d2915e7d2..4ca9c23ef 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/brown" + "cutout": "refinedstorage:block/network_transmitter/cutouts/brown", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json index 4efa2f0c7..ab96b822d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/cyan" + "cutout": "refinedstorage:block/network_transmitter/cutouts/cyan", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json index 4b4406b4d..afe1c92ca 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/disconnected" + "cutout": "refinedstorage:block/network_transmitter/cutouts/disconnected", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json index ff0b368e0..1d0761247 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/gray" + "cutout": "refinedstorage:block/network_transmitter/cutouts/gray", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json index 9eaab2c1c..a33f76129 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/green" + "cutout": "refinedstorage:block/network_transmitter/cutouts/green", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json index 736f71b49..f2fbb7919 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/light_blue" + "cutout": "refinedstorage:block/network_transmitter/cutouts/light_blue", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json index 5d37370cd..47b9a0faf 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/light_gray" + "cutout": "refinedstorage:block/network_transmitter/cutouts/light_gray", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json index 407702735..5a8d69769 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/lime" + "cutout": "refinedstorage:block/network_transmitter/cutouts/lime", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json index 8214bae3b..404cef130 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/magenta" + "cutout": "refinedstorage:block/network_transmitter/cutouts/magenta", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json index 79ffb8b75..765024ac5 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/orange" + "cutout": "refinedstorage:block/network_transmitter/cutouts/orange", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json index 8e066549e..3144075a1 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/pink" + "cutout": "refinedstorage:block/network_transmitter/cutouts/pink", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json index 24a8a3299..e579b2a91 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/purple" + "cutout": "refinedstorage:block/network_transmitter/cutouts/purple", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json index 526d5a5aa..5c53e46fa 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/red" + "cutout": "refinedstorage:block/network_transmitter/cutouts/red", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json index 8d9e69779..a189eda59 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/white" + "cutout": "refinedstorage:block/network_transmitter/cutouts/white", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json index cd43328cc..5c9121bd0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/network_transmitter/network_transmitter", "all": "refinedstorage:block/network_transmitter/network_transmitter", - "cutout": "refinedstorage:block/network_transmitter/cutouts/yellow" + "cutout": "refinedstorage:block/network_transmitter/cutouts/yellow", + "particle": "refinedstorage:block/network_transmitter/network_transmitter" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/black.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/black.json index 3e111e9a5..14644b370 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/black.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/black", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/black" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/blue.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/blue.json index fdff2ca18..e2845f0e0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/blue" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/brown.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/brown.json index 97bcff2f6..51cd13dcf 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/brown.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/brown", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/brown" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/cyan.json index 560638da0..40400b333 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/cyan.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/cyan", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/cyan" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json index bb3106892..4a0435908 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/disconnected" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/gray.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/gray.json index 07c8e7134..03da15ed0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/gray" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/green.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/green.json index 73de2321d..97e316450 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/green.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/green", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/green" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_blue.json index 67e83b06e..e23763594 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_blue.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/light_blue", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/light_blue" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_gray.json index e9464b963..feb8e2a16 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/light_gray.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/light_gray", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/light_gray" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/lime.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/lime.json index 81b1b5882..636e53cc8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/lime.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/lime", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/lime" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/magenta.json index 2a2062fbf..4bc134230 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/magenta.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/magenta", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/magenta" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/orange.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/orange.json index 2708623d8..be3e593bd 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/orange.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/orange", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/orange" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/pink.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/pink.json index 2a19fa2bc..0c4874a92 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/pink.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/pink", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/pink" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/purple.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/purple.json index 2a6fd3c98..7ddc6a432 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/purple.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/purple", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/purple" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/red.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/red.json index 47613fe10..b2199e5eb 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/red.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/red", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/red" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/white.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/white.json index 72c96dc9c..3d6513285 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/white.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/white", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/white" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/yellow.json index 0bab597e8..2740724c0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/yellow.json @@ -1,13 +1,13 @@ { "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:block/pattern_grid/right", - "east": "refinedstorage:block/pattern_grid/right", - "south": "refinedstorage:block/pattern_grid/back", - "west": "refinedstorage:block/pattern_grid/left", - "up": "refinedstorage:block/pattern_grid/top", + "cutout": "refinedstorage:block/pattern_grid/cutouts/yellow", "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/pattern_grid/right", "north": "refinedstorage:block/pattern_grid/front", - "cutout": "refinedstorage:block/pattern_grid/cutouts/yellow" + "particle": "refinedstorage:block/pattern_grid/right", + "south": "refinedstorage:block/pattern_grid/back", + "up": "refinedstorage:block/pattern_grid/top", + "west": "refinedstorage:block/pattern_grid/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/black.json b/src/generated/resources/assets/refinedstorage/models/block/relay/black.json index 040a96d9d..f6e2a4e25 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/black.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/black" + "cutout": "refinedstorage:block/relay/cutouts/black", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json b/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json index e28b8e23a..4e4ea9918 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/blue" + "cutout": "refinedstorage:block/relay/cutouts/blue", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json b/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json index b5b233922..dd97a60dc 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/brown" + "cutout": "refinedstorage:block/relay/cutouts/brown", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json index 20da9967f..c02e249cf 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/cyan" + "cutout": "refinedstorage:block/relay/cutouts/cyan", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json index 0dbbcf391..0e414bfbf 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/disconnected" + "cutout": "refinedstorage:block/relay/cutouts/disconnected", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json b/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json index 8e813f28b..5fa59966c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/gray" + "cutout": "refinedstorage:block/relay/cutouts/gray", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/green.json b/src/generated/resources/assets/refinedstorage/models/block/relay/green.json index b0eaf716e..bad4f8d12 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/green.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/green" + "cutout": "refinedstorage:block/relay/cutouts/green", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json index e25529618..a787df563 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/light_blue" + "cutout": "refinedstorage:block/relay/cutouts/light_blue", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json index 1b56d62b2..ecc77fe38 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/light_gray" + "cutout": "refinedstorage:block/relay/cutouts/light_gray", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json b/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json index bd97a8378..d16eb728d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/lime" + "cutout": "refinedstorage:block/relay/cutouts/lime", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json index 2f2e1e5cb..4c4a491d0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/magenta" + "cutout": "refinedstorage:block/relay/cutouts/magenta", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json b/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json index a79ac9d68..b3b71d0f8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/orange" + "cutout": "refinedstorage:block/relay/cutouts/orange", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json b/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json index 7a2082722..df592414d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/pink" + "cutout": "refinedstorage:block/relay/cutouts/pink", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json b/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json index 1177cfd49..21f0f714b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/purple" + "cutout": "refinedstorage:block/relay/cutouts/purple", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/red.json b/src/generated/resources/assets/refinedstorage/models/block/relay/red.json index caae97b42..c09bb79ad 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/red.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/red" + "cutout": "refinedstorage:block/relay/cutouts/red", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/white.json b/src/generated/resources/assets/refinedstorage/models/block/relay/white.json index 4bc38cc27..0d02ce5a5 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/white.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/white" + "cutout": "refinedstorage:block/relay/cutouts/white", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json index eb4fe62de..60a0542f8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json @@ -1,8 +1,8 @@ { "parent": "refinedstorage:block/cube_all_cutout", "textures": { - "particle": "refinedstorage:block/relay/relay", "all": "refinedstorage:block/relay/relay", - "cutout": "refinedstorage:block/relay/cutouts/yellow" + "cutout": "refinedstorage:block/relay/cutouts/yellow", + "particle": "refinedstorage:block/relay/relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json index 46ad2c811..3df6d1f11 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_black", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_black", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_black", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_black", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_black" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_black", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_black", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_black", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json index 0eb87e8c5..75a9aa50d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_blue", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_blue", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_blue", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_blue", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_blue" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_blue", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_blue", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json index 71dfee75a..8b6bf380c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_brown", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_brown", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_brown", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_brown", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_brown" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_brown", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_brown", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_brown", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json index daf2ecb19..f8d25e594 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_cyan", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_cyan", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_cyan", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_cyan", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_cyan" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_cyan", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_cyan", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_cyan", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json index 6c2fecb85..e47c5ef9b 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_disconnected", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_disconnected", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_disconnected", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_disconnected", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_disconnected" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_disconnected", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_disconnected", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_disconnected", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json index 7de6f94c7..bf87d308d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_gray", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_gray", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_gray", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_gray", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_gray" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_gray", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_gray", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json index 009459c62..3ebdb8001 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_green", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_green", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_green", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_green", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_green" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_green", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_green", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_green", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json index 8e260e8bb..b81223062 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_light_blue", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_light_blue", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_light_blue", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_light_blue", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_light_blue" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_light_blue", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_light_blue", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_light_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json index 01877de81..049770f01 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_light_gray", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_light_gray", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_light_gray", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_light_gray", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_light_gray" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_light_gray", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_light_gray", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_light_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json index 516881b37..ed50cb7de 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_lime", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_lime", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_lime", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_lime", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_lime" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_lime", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_lime", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_lime", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json index ad5dc7864..8e66919e0 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_magenta", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_magenta", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_magenta", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_magenta", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_magenta" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_magenta", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_magenta", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_magenta", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json index 1d97fb768..56dadda2d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_orange", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_orange", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_orange", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_orange", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_orange" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_orange", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_orange", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_orange", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json index 7a51631d8..15a65fd8d 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_pink", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_pink", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_pink", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_pink", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_pink" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_pink", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_pink", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_pink", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json index 17840b590..2e1123221 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_purple", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_purple", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_purple", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_purple", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_purple" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_purple", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_purple", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_purple", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json index 6429eb11a..4adceccd1 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_red", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_red", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_red", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_red", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_red" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_red", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_red", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_red", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json index 08480d685..0d3a11b06 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_white", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_white", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_white", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_white", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_white" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_white", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_white", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_white", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json index 22cf9bdfe..078dd9704 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json @@ -1,18 +1,18 @@ { "parent": "refinedstorage:block/cube_cutout", "textures": { - "particle": "refinedstorage:block/security_manager/front", - "east": "refinedstorage:block/security_manager/right", - "south": "refinedstorage:block/security_manager/back", - "west": "refinedstorage:block/security_manager/left", - "up": "refinedstorage:block/security_manager/top", - "down": "refinedstorage:block/bottom", - "north": "refinedstorage:block/security_manager/front", "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_yellow", - "cutout_west": "refinedstorage:block/security_manager/cutouts/left_yellow", - "cutout_south": "refinedstorage:block/security_manager/cutouts/back_yellow", "cutout_north": "refinedstorage:block/security_manager/cutouts/front_yellow", - "cutout_up": "refinedstorage:block/security_manager/cutouts/top_yellow" + "cutout_south": "refinedstorage:block/security_manager/cutouts/back_yellow", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top_yellow", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left_yellow", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/front", + "south": "refinedstorage:block/security_manager/back", + "up": "refinedstorage:block/security_manager/top", + "west": "refinedstorage:block/security_manager/left" } } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json b/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json index 054628461..2157aa497 100644 --- a/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json +++ b/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json @@ -1,22 +1,21 @@ { - "replace": false, "values": [ - "#refinedstorage:controller", - "#refinedstorage:crafting_monitor", - "#refinedstorage:relay", - "#refinedstorage:crafter_manager", - "#refinedstorage:crafter", - "#refinedstorage:crafting_grid", - "#refinedstorage:network_receiver", - "#refinedstorage:disk_manipulator", - "#refinedstorage:creative_controller", "#refinedstorage:pattern_grid", "#refinedstorage:network_transmitter", "#refinedstorage:security_manager", + "#refinedstorage:creative_controller", "#refinedstorage:fluid_grid", - "#refinedstorage:detector", + "#refinedstorage:crafter", "#refinedstorage:grid", "#refinedstorage:wireless_transmitter", + "#refinedstorage:detector", + "#refinedstorage:crafting_monitor", + "#refinedstorage:controller", + "#refinedstorage:network_receiver", + "#refinedstorage:relay", + "#refinedstorage:crafter_manager", + "#refinedstorage:crafting_grid", + "#refinedstorage:disk_manipulator", "refinedstorage:1k_storage_block", "refinedstorage:4k_storage_block", "refinedstorage:16k_storage_block", diff --git a/src/generated/resources/data/packingtape/tags/block_entity_type/blacklist/problematic.json b/src/generated/resources/data/packingtape/tags/block_entity_type/blacklist/problematic.json index e888de87d..973f2df36 100644 --- a/src/generated/resources/data/packingtape/tags/block_entity_type/blacklist/problematic.json +++ b/src/generated/resources/data/packingtape/tags/block_entity_type/blacklist/problematic.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:controller", "refinedstorage:creative_controller", diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_controller.json index 02890df65..943e6d0be 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter.json index 83fc3eef1..c1e9b9330 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter_manager.json index aace33f12..9fb7b8b83 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_grid.json index f595d356b..fd7bacb8d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_monitor.json index 0d349fd51..504d1c7ff 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_detector.json index 090a3f8cc..a240b86ee 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_disk_manipulator.json index 3eca867b5..5b152a71d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_fluid_grid.json index 2bc8a78f8..68c45dbd9 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_grid.json index 463fa30cb..653cbeb33 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_receiver.json index f642ef381..d8f26f4a7 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_transmitter.json index 6b657dd90..8e9a95cbc 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_pattern_grid.json index 73527f157..f9cd2be0f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_relay.json index b6c36cb59..187204a53 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_security_manager.json index 2c914ce4f..f0892752c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_wireless_transmitter.json index fdf0859d1..6ea6182e1 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/black_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/black_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/black_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/black_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_controller.json index 944483e90..4da8ddf8e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter.json index 1b4e4ac77..5edeedcf5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter_manager.json index 4ee403cfb..1080266d5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_grid.json index 11432f69a..190bb2efa 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_monitor.json index c96860d31..8274cafb6 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_detector.json index 49edd0867..f2fd4f375 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_disk_manipulator.json index 1c6a1618c..88fcf43d1 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_fluid_grid.json index 92bee169f..4efd90908 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_grid.json index 51bf0b825..09e12054b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_receiver.json index 2db4ea6cb..5e10453f7 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_transmitter.json index 8b96825ca..e970f18c9 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_pattern_grid.json index 233554d88..b7483ecab 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_relay.json index c13c924fe..1595b3474 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_security_manager.json index a6c1277d5..ed00edc6c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_wireless_transmitter.json index 00a254d71..2feebcf0f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/blue_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/blue_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/blue_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/blue_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/blue_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_controller.json index f7bcaf380..0fa2ca98b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter.json index 1f42f4fd8..54eb5493a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter_manager.json index b8619cb43..ffcf53657 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_grid.json index c75075d3c..bb82a74fc 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_monitor.json index 202db7205..907075817 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_detector.json index 71745677f..1a6e231e8 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_disk_manipulator.json index 73eaba29c..955004250 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_fluid_grid.json index f04bd7bf8..e2080a2a5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_grid.json index 47e539bf5..fd277d142 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_receiver.json index 21fab198e..dce4351fb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_transmitter.json index 22e257e1c..d3c26f8bb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_pattern_grid.json index 5916db477..38c549a76 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_relay.json index 46408c30d..6373f7029 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_security_manager.json index da19ff713..e538cfdb0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_wireless_transmitter.json index 870ac87ac..b7d344682 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/brown_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/brown_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/brown_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/brown_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/brown_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/controller.json index 16c939f01..a476b14d5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter.json index f56611f31..f8883891f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter_manager.json index 6f8703c48..f98fd1cf1 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_grid.json index dae47735a..09cdc0533 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_monitor.json index c09ea0445..e70209832 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_controller.json index 2ebb22d44..3fc126214 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter.json index c47c2986f..78f337508 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter_manager.json index 38dbc6b1d..aa75c6783 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_grid.json index a3efbe5f6..14ab6ecc0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_monitor.json index e53cf893e..cc799921e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_detector.json index 87c356534..61fa79907 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_disk_manipulator.json index 3c4e204c1..e11863e56 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_fluid_grid.json index b058dc260..9a3343c47 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_grid.json index 9105514ae..976449e42 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_receiver.json index 44b87cefd..08a1bcba3 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_transmitter.json index e630efb65..b743a4da0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_pattern_grid.json index fc8b14a89..e5921fb85 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_relay.json index fd37401a0..93f637fd5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_security_manager.json index 05b22bf60..20ae1a6cf 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_wireless_transmitter.json index e0fe15e06..24616abec 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/cyan_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/cyan_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/cyan_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/cyan_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/cyan_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/cyan_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/detector.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/detector.json index 8f45983ed..1a498700d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/disk_manipulator.json index 0d82d0312..6b79fb44b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/fluid_grid.json index 90222ea9e..74b6e0baf 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_controller.json index 9791e170c..f7c6acf22 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter.json index 2d682ee25..156da358f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter_manager.json index a4d22e28f..1ce137e4e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_grid.json index 71f512a4b..7bb2a5151 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_monitor.json index 94304481c..6fee4c314 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_detector.json index 24c49322b..18fc9fa0f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_disk_manipulator.json index f9415a3c6..1bbfe2342 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_fluid_grid.json index 2605e6090..a0418fd3a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_grid.json index 92db23ea9..fa1626188 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_receiver.json index baa95c738..e9f584832 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_transmitter.json index fae8563b7..24e3807a7 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_pattern_grid.json index 49462ed51..b84e7fa62 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_relay.json index 126eb4156..2818d351c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_security_manager.json index ee14a6ca7..e8d93f380 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_wireless_transmitter.json index cdd323e0b..8dd9dc498 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/gray_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/gray_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/gray_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/gray_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/gray_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/gray_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_controller.json index 9b6351901..d25cf3678 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter.json index 0e70d4e22..481b2d3fe 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter_manager.json index dc7a79047..ab69eab43 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_grid.json index 43029834e..04499777f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_monitor.json index 709d307ac..ef23ab490 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_detector.json index c7e9b8057..432cf89ba 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_disk_manipulator.json index daa8f9b53..1788ff0d2 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_fluid_grid.json index 8e9274374..6b1934379 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_grid.json index 7921ec1bf..77e1274db 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_receiver.json index a6b9def7b..a9e7ba1f8 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_transmitter.json index d5eb896b6..c286d7fd4 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_pattern_grid.json index 88e3fa124..f60c7c879 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_relay.json index 80a2ecc2f..7020d209c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_security_manager.json index 9c71a4292..3b787a40d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_wireless_transmitter.json index 933e8d68e..ad94ddcd2 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/green_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/green_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/green_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/green_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/green_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/green_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/grid.json index 8d20ee8ae..a8640a869 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_controller.json index 5b0fb7a8f..830633d42 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter.json index 42de7a4c3..8343f4d5b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter_manager.json index b1296b3e1..990dc6d90 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_grid.json index 7c351477d..370a27531 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_monitor.json index 4c56ab925..6cb630658 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_detector.json index 887ae9d85..058b29cbf 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_disk_manipulator.json index 9d44da6b0..70bcaf99a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_fluid_grid.json index 3ec6ecb62..eeba9397f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_grid.json index 9faab4abb..a95c6d851 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_receiver.json index 6a52d024f..2cfdd43a8 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_transmitter.json similarity index 80% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_transmitter.json index ffdf68d12..296def188 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_pattern_grid.json index a1da3f659..fe8a0adba 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_relay.json index 6e5818f56..082b3b55b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_security_manager.json index 117156cd3..68c6b5d54 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_wireless_transmitter.json similarity index 80% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_wireless_transmitter.json index 5c35f052a..6faaa3a2d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/light_gray_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/light_gray_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/light_gray_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/light_gray_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/light_gray_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/light_gray_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_controller.json index 806b34bc7..f2f77eb2d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter.json index 37dd51c95..e9de923a5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter_manager.json index 004034285..fe9192871 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_grid.json index 24e33e524..2e5cd7d08 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_monitor.json index dfc1441a6..18c2a440a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_detector.json index 551a3ea5c..20694ac10 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_disk_manipulator.json index 53ea21748..3387cd0d8 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_fluid_grid.json index 14b8812f2..d55c21d5f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_grid.json index 317657297..4ab135403 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_receiver.json index 3440feab2..6cb3f04ed 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_transmitter.json index 0d0df9688..f4059f2f8 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_pattern_grid.json index 01a30b7aa..d4d2f2df3 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_relay.json index 883cb8b3b..bbdb6e31b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_security_manager.json index 6d026eaae..ab650e8ef 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_wireless_transmitter.json index 8f18bcc97..444b887f3 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/lime_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/lime_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/lime_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/lime_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/lime_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/lime_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_controller.json index c0c0e91cb..b8aa9a9c4 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter.json index 9698d6a65..1709618bb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter_manager.json index 906c76ddf..a50ad2a0e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_grid.json index e0d2a58d9..4f7a19e1d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_monitor.json index 19bf17995..77ec2980e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_detector.json index 65566b06f..e6884afd5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_disk_manipulator.json index f95bbb056..c649c04fb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_fluid_grid.json index e9b797cef..9a1a24b12 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_grid.json index 18211ba37..7fe727387 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_receiver.json index 04240c467..96f9ba247 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_transmitter.json index 228460fc3..c000f4245 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_pattern_grid.json index f0ee2522a..a37cae2e3 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_relay.json index 610bafed2..3b593b30b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_security_manager.json index eb7bb4197..dd3d8a4c0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_wireless_transmitter.json similarity index 80% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_wireless_transmitter.json index f87f155e5..368991cab 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/magenta_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/magenta_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/magenta_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/magenta_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/magenta_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/magenta_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_receiver.json index 921df371c..1c255b567 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_transmitter.json index 6beb07473..8d83cbbe5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_controller.json index f664bf952..e48328e40 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter.json index 3cc027352..62b9680c5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter_manager.json index 3b59b1391..b6621ab34 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_grid.json index fe1bff2d6..d892e68e0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_monitor.json index ef7d042de..f9d8f45cb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_detector.json index d853c6d5b..92992a2bb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_disk_manipulator.json index cf1b74b9c..0911b7866 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_fluid_grid.json index ae388467d..57650363c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_grid.json index dd80f253b..7aee7a99b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_receiver.json index 49cbf0f2e..664bcccb6 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_transmitter.json index 20c570376..76b60611e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_pattern_grid.json index 36efbfe24..bc66b1550 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_relay.json index b7151d1ff..1264d4993 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_security_manager.json index e932859eb..aa7b33361 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_wireless_transmitter.json index 807136b3f..bf645187f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/orange_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/orange_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/orange_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/orange_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/orange_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/orange_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pattern_grid.json index fc363b804..5fbf51e23 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_controller.json index 4b6aa1601..4688e4c16 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter.json index 8c2c8f90e..fe027a570 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter_manager.json index 064547e34..10003592d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_grid.json index d9316099c..73f262d45 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_monitor.json index 590d84fc5..f2d35d960 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_detector.json index 25d4d4278..010029c8e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_disk_manipulator.json index 06a07ee57..2c9bc7545 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_fluid_grid.json index 8a6534d51..186d1eae0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_grid.json index a0c7c4f96..708a2a83d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_receiver.json index 6ea442691..e4ae6f08f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_transmitter.json index d337bf60f..dbe09ad4a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_pattern_grid.json index 008189b33..80cb6af63 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_relay.json index f822f85ea..23eb701a6 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_security_manager.json index a87f9d186..a41416864 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_wireless_transmitter.json index 6adffcb8e..1f840b642 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/pink_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/pink_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/pink_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/pink_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/pink_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/pink_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_controller.json index eca172885..d035e302f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter.json index 5a5eeeea5..ccddf5ba1 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter_manager.json index 6f716af5a..6d4a4bf80 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_grid.json index 6de610075..e7563b585 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_monitor.json index 953f7d108..642cbcd70 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_detector.json index b4adbb1b3..abdb73dbb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_disk_manipulator.json index ea48f7ecb..b3ca1d00b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_fluid_grid.json index 1353a2d09..f5a45cc8e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_grid.json index 83f84bfc3..5842f6597 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_receiver.json index 7135e984e..b6e406941 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_transmitter.json index b950fc646..5b3d1593c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_pattern_grid.json index 62fdf13c9..75aba897b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_relay.json index 285f1fdfb..1b1e4dfbd 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_security_manager.json index 1fc2e6ce1..9c59f6355 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_wireless_transmitter.json index 1e4ebfa51..0d688967f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/purple_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/purple_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/purple_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/purple_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/purple_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/purple_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_controller.json index 05d305c66..e4de4461e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter.json index 3aaac7021..b3ca2e64b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter_manager.json index 4682d8ae1..3bf5ef754 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_grid.json index 9b8c11826..be2d50d3d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_monitor.json index 8cea5d8f6..609e66a6c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_detector.json index 2bad5a464..c21e81cf2 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_disk_manipulator.json index a1ddae1db..3dec357e3 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_fluid_grid.json index 76a155ed6..e2f2b0e0d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_grid.json index d248257ea..2013ded14 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_receiver.json index b37d819ef..e829e5d05 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_transmitter.json index 90c3a8193..59295343d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_pattern_grid.json index 6ed8b1240..ef715751a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_relay.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_relay.json index e31983e31..7ea752f02 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_security_manager.json index 61e88f114..f5edeb103 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_wireless_transmitter.json index 563bf2cd6..ae92ad79a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/red_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/red_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/red_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/red_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/red_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/red_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/relay.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/relay.json index cc26f5dbe..fffc1ec35 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/security_manager.json index 671b6ba8d..2f9aeee74 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_controller.json index 3067864ef..a9b5a913e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter.json index dcb8ea869..a4220032d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter_manager.json index f4c06b323..c9b4d8cd8 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_grid.json index ee4209250..11474ce84 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_monitor.json index 0e905dfec..5b7b72d87 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_detector.json index 892372a4b..daff23712 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_disk_manipulator.json index f1defdf84..983ce9ae9 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_fluid_grid.json index 8ae3f0e90..11e903947 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_grid.json index f3152928d..8c8bd0eca 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_receiver.json index aa121c523..e29f0bee5 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_transmitter.json index 47564e3a7..2a5348712 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_pattern_grid.json index 52c41c1ec..341e9a94a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_relay.json index f3bd2c18a..2043e50ee 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_security_manager.json index 8a5a70c68..0b3f3890c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_wireless_transmitter.json index 2de5688f3..4c85e4a7b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/white_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/white_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/white_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/white_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/white_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/white_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/wireless_transmitter.json index f760d6c9b..56f293944 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_controller.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_controller.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_controller.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_controller.json index 6fa201092..845b953b2 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_controller.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_controller.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_controller" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_controller" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_controller" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_controller" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter.json index 9ae8cc622..63b59d477 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_crafter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_crafter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_crafter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_crafter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter_manager.json index f374229ab..6aa8245be 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafter_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_crafter_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_crafter_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_crafter_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_crafter_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_grid.json index 4c30cc444..261226f43 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_monitor.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_monitor.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_monitor.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_monitor.json index 225f19659..9b8bc0298 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_crafting_monitor.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_crafting_monitor" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_crafting_monitor" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_crafting_monitor" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_crafting_monitor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_detector.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_detector.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_detector.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_detector.json index 29e9917f2..c83a5cfd7 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_detector.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_detector.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_detector" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_detector" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_detector" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_detector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_disk_manipulator.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_disk_manipulator.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_disk_manipulator.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_disk_manipulator.json index ec49ed47e..508e75689 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_disk_manipulator.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_disk_manipulator" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_disk_manipulator" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_disk_manipulator" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_disk_manipulator" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_fluid_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_fluid_grid.json index 61c732ecd..cbccf2bd9 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_grid.json index 85efd3ae3..02967dbdd 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_receiver.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_receiver.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_receiver.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_receiver.json index b39785f84..e95f02442 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_receiver.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_network_receiver" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_network_receiver" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_network_receiver" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_transmitter.json index c3c2268d7..2a721480d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_network_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_network_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_network_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_network_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_pattern_grid.json index 2a5ba3879..2155c8316 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_relay.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_relay.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_relay.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_relay.json index fe585b357..4faa9d6cd 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_relay.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_relay.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_relay" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_relay" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_relay" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_relay" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_security_manager.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_security_manager.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_security_manager.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_security_manager.json index e629e8891..554b3943c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_security_manager.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_security_manager.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_security_manager" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_security_manager" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_security_manager" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_wireless_transmitter.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_wireless_transmitter.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_wireless_transmitter.json index 331f53548..ac81a788f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/yellow_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/coloring_recipes/yellow_wireless_transmitter.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:coloring_recipes/yellow_wireless_transmitter" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring_recipes/yellow_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:controller": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:coloring_recipes/yellow_wireless_transmitter" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:controller", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring_recipes/yellow_wireless_transmitter" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/black_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/black_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/black_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/black_crafting_grid.json index 525ead2aa..9aed9e4f2 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/black_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/black_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/black_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/black_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/black_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/black_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/blue_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/blue_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/blue_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/blue_crafting_grid.json index 059ee3e30..f698b0d6e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/blue_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/blue_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/blue_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/blue_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/blue_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/blue_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/brown_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/brown_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/brown_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/brown_crafting_grid.json index 644943d34..4dfc23b3e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/brown_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/brown_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/brown_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/brown_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/brown_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/brown_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/crafting_grid.json index dd3dfc0c0..23aafc090 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/cyan_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/cyan_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/cyan_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/cyan_crafting_grid.json index bdd4d589e..22e7615b2 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/cyan_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/cyan_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/cyan_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/cyan_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/cyan_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/cyan_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/gray_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/gray_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/gray_crafting_grid.json index b2fa67563..4c30dc5f0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/gray_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/gray_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/gray_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/gray_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/gray_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/green_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/green_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/green_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/green_crafting_grid.json index 922e7c5b3..935e908f2 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/green_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/green_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/green_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/green_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/green_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/green_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/light_gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/light_gray_crafting_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/light_gray_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/light_gray_crafting_grid.json index c2c1dfa5d..72b031431 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/light_gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/light_gray_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/light_gray_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/light_gray_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/light_gray_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/light_gray_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/lime_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/lime_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/lime_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/lime_crafting_grid.json index 5a12e17da..124737e1a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/lime_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/lime_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/lime_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/lime_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/lime_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/lime_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/magenta_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/magenta_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/magenta_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/magenta_crafting_grid.json index cca8e2467..e0df37787 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/magenta_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/magenta_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/magenta_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/magenta_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/magenta_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/magenta_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/orange_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/orange_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/orange_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/orange_crafting_grid.json index 97e529bd5..d6026bf5c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/orange_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/orange_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/orange_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/orange_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/orange_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/orange_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/pink_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/pink_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/pink_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/pink_crafting_grid.json index 6fc22ac59..47d2d207a 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/pink_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/pink_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/pink_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/pink_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/pink_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/pink_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/purple_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/purple_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/purple_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/purple_crafting_grid.json index 7acd579d2..d6f88189d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/purple_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/purple_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/purple_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/purple_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/purple_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/purple_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/red_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/red_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/red_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/red_crafting_grid.json index e340eb4c6..1fefe4e40 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/red_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/red_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/red_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/red_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/red_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/red_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/white_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/white_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/white_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/white_crafting_grid.json index 416462b70..5c7036b87 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/white_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/white_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/white_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/white_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/white_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/white_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/yellow_crafting_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/yellow_crafting_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/yellow_crafting_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/yellow_crafting_grid.json index a6e456134..d3085747f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/crafting_grid/yellow_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/crafting_grid/yellow_crafting_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:crafting_grid/yellow_crafting_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:crafting_grid/yellow_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:crafting_grid/yellow_crafting_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:crafting_grid/yellow_crafting_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/black_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/black_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/black_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/black_fluid_grid.json index 777ca4a5f..884f0a486 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/black_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/black_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/black_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/black_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/black_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/black_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/blue_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/blue_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/blue_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/blue_fluid_grid.json index 9430b3a99..85c9cdd9d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/blue_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/blue_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/blue_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/blue_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/blue_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/blue_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/brown_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/brown_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/brown_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/brown_fluid_grid.json index fa1abf628..4597d7d0d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/brown_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/brown_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/brown_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/brown_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/brown_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/brown_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/cyan_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/cyan_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/cyan_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/cyan_fluid_grid.json index 62b4ae3c6..52b0533d7 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/cyan_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/cyan_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/cyan_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/cyan_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/cyan_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/cyan_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/fluid_grid.json index 1d752ef83..6f34d5bac 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/gray_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/gray_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/gray_fluid_grid.json index e6b2225a7..278ccb873 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/gray_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/gray_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/gray_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/gray_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/gray_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/green_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/green_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/green_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/green_fluid_grid.json index 086500be0..f47656285 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/green_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/green_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/green_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/green_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/green_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/green_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/light_gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/light_gray_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/light_gray_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/light_gray_fluid_grid.json index 9ee17cf09..06c1b792f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/light_gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/light_gray_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/light_gray_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/light_gray_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/light_gray_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/light_gray_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/lime_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/lime_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/lime_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/lime_fluid_grid.json index be34c4b97..ac1e4a3a0 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/lime_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/lime_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/lime_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/lime_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/lime_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/lime_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/magenta_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/magenta_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/magenta_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/magenta_fluid_grid.json index 3a0d3533b..3eb4578bd 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/magenta_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/magenta_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/magenta_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/magenta_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/magenta_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/magenta_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/orange_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/orange_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/orange_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/orange_fluid_grid.json index 1a441fd73..a641781bb 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/orange_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/orange_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/orange_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/orange_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/orange_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/orange_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/pink_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/pink_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/pink_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/pink_fluid_grid.json index 1fa24ceb7..c2703ae86 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/pink_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/pink_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/pink_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/pink_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/pink_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/pink_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/purple_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/purple_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/purple_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/purple_fluid_grid.json index a60e2d23a..f217dbb1c 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/purple_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/purple_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/purple_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/purple_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/purple_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/purple_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/red_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/red_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/red_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/red_fluid_grid.json index eb9e41d91..4f0bcb79f 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/red_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/red_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/red_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/red_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/red_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/red_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/white_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/white_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/white_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/white_fluid_grid.json index 4fd67490e..6cea5615d 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/white_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/white_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/white_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/white_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/white_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/white_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/yellow_fluid_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/yellow_fluid_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/yellow_fluid_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/yellow_fluid_grid.json index 7498b1c5d..7057ed452 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/fluid_grid/yellow_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/fluid_grid/yellow_fluid_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:fluid_grid/yellow_fluid_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:fluid_grid/yellow_fluid_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:fluid_grid/yellow_fluid_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:fluid_grid/yellow_fluid_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/black_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/black_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/black_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/black_pattern_grid.json index 3e8927828..0e2c8cc56 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/black_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/black_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/black_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/black_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/black_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/black_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/blue_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/blue_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/blue_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/blue_pattern_grid.json index cf1d54a37..58c454f23 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/blue_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/blue_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/blue_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/blue_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/blue_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/blue_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/brown_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/brown_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/brown_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/brown_pattern_grid.json index 968dad157..8dc5d9b24 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/brown_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/brown_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/brown_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/brown_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/brown_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/brown_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/cyan_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/cyan_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/cyan_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/cyan_pattern_grid.json index 00045c0d8..5cb6e12b6 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/cyan_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/cyan_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/cyan_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/cyan_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/cyan_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/cyan_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/gray_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/gray_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/gray_pattern_grid.json index 4cacf8bb8..4db996efa 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/gray_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/gray_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/gray_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/gray_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/gray_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/green_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/green_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/green_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/green_pattern_grid.json index 4bba84a49..b91e69a77 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/green_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/green_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/green_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/green_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/green_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/green_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/light_gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/light_gray_pattern_grid.json similarity index 79% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/light_gray_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/light_gray_pattern_grid.json index 87fb044af..ce09a40f6 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/light_gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/light_gray_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/light_gray_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/light_gray_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/light_gray_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/light_gray_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/lime_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/lime_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/lime_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/lime_pattern_grid.json index 30d895ef1..9f6f72a1e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/lime_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/lime_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/lime_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/lime_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/lime_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/lime_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/magenta_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/magenta_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/magenta_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/magenta_pattern_grid.json index 72f698f2c..0f162fd64 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/magenta_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/magenta_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/magenta_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/magenta_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/magenta_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/magenta_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/orange_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/orange_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/orange_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/orange_pattern_grid.json index d4052d5e2..52d617a9e 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/orange_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/orange_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/orange_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/orange_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/orange_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/orange_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/pattern_grid.json index 92eb89d40..47d001458 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pink_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/pink_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pink_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/pink_pattern_grid.json index f1a11a36a..b83cf0166 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/pink_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/pink_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/pink_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/pink_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/pink_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/pink_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/purple_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/purple_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/purple_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/purple_pattern_grid.json index c2f8efdbd..2b03a5acd 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/purple_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/purple_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/purple_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/purple_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/purple_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/purple_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/red_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/red_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/red_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/red_pattern_grid.json index fbe70eb14..cbabf89cc 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/red_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/red_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/red_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/red_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/red_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/red_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/white_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/white_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/white_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/white_pattern_grid.json index 31ae66be9..80596be5b 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/white_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/white_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/white_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/white_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/white_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/white_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/yellow_pattern_grid.json b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/yellow_pattern_grid.json similarity index 78% rename from src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/yellow_pattern_grid.json rename to src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/yellow_pattern_grid.json index be01bdab0..3e2b7b389 100644 --- a/src/generated/resources/data/refinedstorage/advancements/recipes/refinedstorage/pattern_grid/yellow_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/advancements/recipes/misc/pattern_grid/yellow_pattern_grid.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "refinedstorage:pattern_grid/yellow_pattern_grid" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:pattern_grid/yellow_pattern_grid" + }, + "trigger": "minecraft:recipe_unlocked" + }, "refinedstorage:grid": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "refinedstorage:pattern_grid/yellow_pattern_grid" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "refinedstorage:grid", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "refinedstorage:pattern_grid/yellow_pattern_grid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_controller.json index d4db1ec70..ce08e60d9 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:black_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter.json index 290aa6dd0..d1944097b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:black_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter_manager.json index 71251b211..f520b998d 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_grid.json index adf38db91..8f0b69498 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_monitor.json index f5c44c0ff..49fc1c08e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_creative_controller.json index ba909e374..5ec03bd97 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_detector.json index 40a5ca0fa..52898b736 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_disk_manipulator.json index 952035d43..80d5dfbb1 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_fluid_grid.json index ab73dfae3..4ba5ec2d0 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_grid.json index e97144a72..e574c4fdd 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_receiver.json index 612c305fd..c4384836c 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_transmitter.json index d8c5c6774..a9ed752ae 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_pattern_grid.json index 3ba70826a..1bbbc9cf6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_relay.json index 1153c7833..8d07fbbd0 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_security_manager.json index f90e2f677..defbf005a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_wireless_transmitter.json index 5d45eaebb..3933a7c36 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/black_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:black_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/black_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_controller.json index 3c3bfcf3e..436defb79 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:blue_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter.json index d9bd4bde7..62f7c65c7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:blue_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter_manager.json index 1753496dd..ed86f0a00 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_grid.json index f584e8b65..1bb7d29e5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_monitor.json index 582477a6c..0ffa73827 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_creative_controller.json index e835d9040..12da65050 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_detector.json index 77f3eed69..0809791cb 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_disk_manipulator.json index 33d325b35..0c10116b4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_fluid_grid.json index cbce3d850..e9dc37674 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_grid.json index 60bc5fa51..a44f903cf 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_receiver.json index 20f7208b0..217df93e6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_transmitter.json index 9622547a1..2cc41cc84 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_pattern_grid.json index e708838af..1158b0064 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_relay.json index 8bbbaa920..96b197d1b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_security_manager.json index 7e1dfd5d6..e75eaaab8 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_wireless_transmitter.json index d8346b4b0..984dcc955 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/blue_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:blue_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/blue_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_controller.json index b6163e8fd..29b67b1e1 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:brown_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter.json index b9ec9d652..fb7c2c20f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:brown_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter_manager.json index 7e7e6080f..f92274d92 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_grid.json index 12cd2e05d..428bae5fe 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_monitor.json index 92299ee07..484e81479 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_creative_controller.json index bdbe3db65..bd406e189 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_detector.json index b3b8d0e1b..c27e729d3 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_disk_manipulator.json index 88e15456e..edea76543 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_fluid_grid.json index 3e5d56739..19323fa66 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_grid.json index c7d91dfb3..a4f3fdc25 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_receiver.json index 4fe0bfc02..772cc7a3a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_transmitter.json index 73b49f0d6..1e2dc8f4e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_pattern_grid.json index b33e99e27..684d5e8c9 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_relay.json index ddb231bb5..866982400 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_security_manager.json index 0ebafc3ce..efaa86333 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_wireless_transmitter.json index 531a56a52..3312f0440 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/brown_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:brown_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/brown_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/controller.json index 7ca3f3cdf..566ee8e23 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter.json index b6f7eaa6d..872b07c16 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter_manager.json index 147562cbf..83786d3bd 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_grid.json index 524eaa013..757bac51c 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_monitor.json index 87e7c1fb2..3591a4eb7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/creative_controller.json index 36df049c9..c76ba2f3a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_controller.json index be2810195..30972ba8b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:cyan_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter.json index a6e33b02e..d1778649e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:cyan_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter_manager.json index de39b4866..b40e53b46 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_grid.json index d05852236..e412b1d4d 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_monitor.json index 7b830f744..35e1332c9 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_creative_controller.json index fa20d4361..c105f081c 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_detector.json index 984a82cd9..5f9ae121e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_disk_manipulator.json index b161f9702..e6a3efde5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_fluid_grid.json index 18d55e736..ce0c5ac45 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_grid.json index e5ed8a1c8..7954e6cf2 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_receiver.json index 4bb0de860..3731c0cfb 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_transmitter.json index b51b0ba2f..f8126882b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_pattern_grid.json index 209218c0a..1e3e94404 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_relay.json index c3949f642..0bb33a77e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_security_manager.json index d4496245b..ccd1d4309 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_wireless_transmitter.json index eb964e28f..d6e57fea8 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/cyan_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:cyan_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/cyan_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/detector.json index 27b1b7c9b..158f38e5e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/disk_manipulator.json index 4e50ea19e..2bb36a630 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/fluid_grid.json index 8ad54b97f..346c293d6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_controller.json index 464f59cca..78af148af 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:gray_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter.json index bb751363d..67d3f9460 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:gray_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter_manager.json index a3a0de01d..3891382d1 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_grid.json index daf285244..30b2c0f42 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_monitor.json index 377565324..d2cd88b2b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_creative_controller.json index ff4c085e9..c09227605 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_detector.json index c5478802e..91ad54b1f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_disk_manipulator.json index 265977fc5..29089579e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_fluid_grid.json index de304ff44..dbb86d8f5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_grid.json index dc402b077..6ee8c592e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_receiver.json index de4f7665e..ea905f0f9 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_transmitter.json index a355e0cdc..83b00cd87 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_pattern_grid.json index f7b42e723..8d9660d5a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_relay.json index c52a5320a..635106c6a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_security_manager.json index 8dc5c72c0..c48615268 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_wireless_transmitter.json index a60e4b623..244be7449 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/gray_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:gray_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/gray_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_controller.json index abe0370ae..17aa6b42e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:green_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter.json index 755171113..7d5dbed6a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:green_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter_manager.json index db32b35f6..b06b814b6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_grid.json index f282a77b2..36d2e970e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_monitor.json index 6d7178106..d74ab5f7b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_creative_controller.json index b3ba55cee..ca4cdc980 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_detector.json index ca097cbfc..b0ce29372 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_disk_manipulator.json index ba4bbc8e2..0e9ab2862 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_fluid_grid.json index b26c9d8c5..0655c9377 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_grid.json index 11557bf0f..0c3640b49 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_receiver.json index c678fa2a1..3396f152f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_transmitter.json index 1d1bd6322..aeb7ec831 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_pattern_grid.json index dfacbd3c8..25e15cb87 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_relay.json index f2a66a6fe..effbee11b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_security_manager.json index e14c26d3f..477a5def5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_wireless_transmitter.json index 01ef6b365..facfa38a7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/green_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:green_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/green_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/grid.json index d1d157286..1d872c7a7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_controller.json index 5ce1cbef6..b4b04eac1 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:light_gray_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter.json index 4cab42097..cccff3301 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:light_gray_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter_manager.json index 7df6fa165..6f7594374 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_grid.json index 23052d20a..e923a22c8 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_monitor.json index 69be8fc18..56ccb23f7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_creative_controller.json index 691822b21..fed9b9a50 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_detector.json index bf140a4bf..d0ab4ca69 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_disk_manipulator.json index 68fc0fbce..b39db9c21 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_fluid_grid.json index fe941f359..4a384dccd 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_grid.json index e188643a6..dbdf999f9 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_receiver.json index 82c04d8d8..2d160c49b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_transmitter.json index d2738d00d..c650f9b12 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_pattern_grid.json index 7f8f20043..9346120a7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_relay.json index 40dd6635f..48a5e7f03 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_security_manager.json index ec51ecd85..48e4e6b02 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_wireless_transmitter.json index a7555f1dd..ddf3e5d0a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/light_gray_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:light_gray_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/light_gray_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_controller.json index 4d34ae4a3..6c9a83b14 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:lime_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter.json index fa1d31c03..d92bca548 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:lime_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter_manager.json index f75e0a7d3..c7f0e44bb 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_grid.json index 7f18b1dfd..57cc8b57c 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_monitor.json index 83e67e589..7a83af0ed 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_creative_controller.json index 52e548dd1..fdd127086 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_detector.json index 6f15e95ed..b56c8ee45 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_disk_manipulator.json index 1dc2bed89..c551ab914 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_fluid_grid.json index e013e56dd..5fc9d9cce 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_grid.json index 97ef7f34b..e3244476e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_receiver.json index 6fbc0fba2..bb87854ee 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_transmitter.json index 47494c6ae..98678ab6d 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_pattern_grid.json index 6cc6e86ab..4c5fd5b37 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_relay.json index f1b468fa1..23d4b416b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_security_manager.json index 04c9d8571..5a276b206 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_wireless_transmitter.json index 38f3e7e54..7fa08e6be 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/lime_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:lime_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/lime_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_controller.json index e9b123aa3..766ec7421 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:magenta_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter.json index 63f5c382d..050953718 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:magenta_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter_manager.json index 424bf310b..ca1c3e75c 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_grid.json index c4b3513fa..213e7070f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_monitor.json index e2f02029f..c88ead441 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_creative_controller.json index 785612438..3386023c0 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_detector.json index 4e916dc0a..75cbfb2df 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_disk_manipulator.json index 3249bf5e3..788eafd47 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_fluid_grid.json index 88596c212..0ca00357b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_grid.json index 6b07508e8..a3b9967da 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_receiver.json index f0ebb7727..20c7c3fc7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_transmitter.json index f9d13f4af..519cc93c5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_pattern_grid.json index d8d1f026a..d6da01e5b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_relay.json index 4cd7dcaed..9d5ae07c8 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_security_manager.json index c7578285b..e99c042f4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_wireless_transmitter.json index db912ce6a..98150a16a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/magenta_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:magenta_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/magenta_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_receiver.json index e3d4a1993..a2b0583de 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_transmitter.json index 7474df855..54bd2e7c4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_controller.json index a6046992a..f6a4687ad 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:orange_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter.json index abed7f422..c1244bee2 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:orange_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter_manager.json index 2d7869cb7..8d0000544 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_grid.json index c075d9c98..2d58ffded 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_monitor.json index 180bf43e3..cef90eeb8 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_creative_controller.json index b9a3db7cf..d3288c66e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_detector.json index c82c38400..f606197b6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_disk_manipulator.json index dc8a1380f..bba221ee4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_fluid_grid.json index e4eda0dfc..6e1ec880e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_grid.json index 32a7be11d..2f8450762 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_receiver.json index 9b4e95b58..06e007fd4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_transmitter.json index 04e6d7654..66a257655 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_pattern_grid.json index 9a648e853..964916d38 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_relay.json index 6b07e21a9..b39a4057a 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_security_manager.json index 1bc0547e3..d38d3f6ae 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_wireless_transmitter.json index 4f450c19f..45ebec51f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/orange_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:orange_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/orange_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pattern_grid.json index 479fe022d..f395323e7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_controller.json index de79b464c..9a842bcb5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:pink_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter.json index 18312ebef..d03773502 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:pink_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter_manager.json index e1b880167..ab15dcac7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_grid.json index 0acd29c55..56e94f59e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_monitor.json index 3c800243d..ef8f00271 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_creative_controller.json index 851920b8a..614cbbfa5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_detector.json index ebd7ef141..cc9ef919e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_disk_manipulator.json index 2a5c3934f..4da87887b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_fluid_grid.json index c084c446e..21ba81d61 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_grid.json index 06a31489b..98a1a6cfe 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_receiver.json index ff292816c..524b6f77d 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_transmitter.json index d71fe4948..adfe359a8 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_pattern_grid.json index 8228301f3..6bb450999 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_relay.json index 15e6dafb2..f6287c8f7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_security_manager.json index ee24cef39..2b94afa0f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_wireless_transmitter.json index ed7b82fc7..732b922c0 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/pink_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:pink_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/pink_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_controller.json index 21bdbac33..7841c23bc 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:purple_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter.json index d31f38638..427149718 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:purple_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter_manager.json index a2cbf3fcc..cf369821b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_grid.json index 83534a0ef..3c43045fd 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_monitor.json index 76afff35d..34a4e1a20 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_creative_controller.json index e56bf1d16..589ee2382 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_detector.json index 2dbfd7258..4ddd7f527 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_disk_manipulator.json index e637538cd..878b00b60 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_fluid_grid.json index cd5eee3b4..b62667823 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_grid.json index 640aeda9f..b4682e83f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_receiver.json index 42ae20dc8..bec3c2667 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_transmitter.json index 4a56d85fe..482dfb63e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_pattern_grid.json index a5b50fbc7..42404be9c 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_relay.json index eca294220..6b816941d 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_security_manager.json index 3c6c46b05..e15d8cbe6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_wireless_transmitter.json index c06736866..dc392f9d6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/purple_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:purple_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/purple_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_controller.json index fdebda487..a0486ebd3 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:red_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter.json index 1893ca9b1..e74a49604 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:red_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter_manager.json index fe4a053ec..f6a8c0bad 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_grid.json index 12a06643f..89def9c61 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_monitor.json index e2af1aafd..987f1cd92 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_creative_controller.json index ae2fceeb4..421a8ed51 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_detector.json index b847cb5fa..56df24da6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_disk_manipulator.json index 9aed089d6..ea4c93245 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_fluid_grid.json index 8bb1728c7..9b274b7b0 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_grid.json index fa8d04996..c65e393fe 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_receiver.json index 2d17f85a7..5310dfc53 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_transmitter.json index 11b172c93..3355b6793 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_pattern_grid.json index ad9002b37..25237dce7 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_relay.json index 8b6e6611a..af0e1bf53 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_security_manager.json index 65fd8e90a..dd4ffddcb 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_wireless_transmitter.json index beca1b969..cb659bbb9 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/red_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:red_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/red_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/relay.json index f4251822b..2c727c13b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/security_manager.json index e27fa0968..af5ebe762 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_controller.json index a68a6a2ab..d1ecda418 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:white_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter.json index ab7bc8591..b47abc1b4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:white_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter_manager.json index 7b58450c7..c72192e74 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_grid.json index 9f4ba48f5..166c3a42b 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_monitor.json index b128fd24f..62924c716 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_creative_controller.json index 203ad656a..e8168fbc1 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_detector.json index 175e46299..44c0b1e6f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_disk_manipulator.json index 9990e3830..1699b26f5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_fluid_grid.json index 8a672655c..7e752efd0 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_grid.json index 29dfcd075..61361a837 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_receiver.json index 46e2d27c0..101a7f9f5 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_transmitter.json index fbda54b1a..34a4aeee6 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_pattern_grid.json index 578412281..c059207d4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_relay.json index b06c6b3e3..d23e95892 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_security_manager.json index c324cb4ab..889a472bf 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_wireless_transmitter.json index 6fff703cd..32a02bb65 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/white_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:white_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/white_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/wireless_transmitter.json index 8a5e3e9b7..968302c6f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_controller.json index 3d9f74a56..ae7adab09 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_controller.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:yellow_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter.json index b970c29f5..32223e98c 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -15,11 +19,8 @@ "name": "refinedstorage:yellow_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter_manager.json index 9254aa06a..d7939988f 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafter_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_crafter_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_crafter_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_grid.json index 8bf0b1d92..a42021818 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_crafting_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_crafting_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_monitor.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_monitor.json index e98848eba..bb3838ce3 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_crafting_monitor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_crafting_monitor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_crafting_monitor" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_creative_controller.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_creative_controller.json index e91165fb7..b280fb198 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_creative_controller.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_creative_controller.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_creative_controller" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_creative_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_detector.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_detector.json index c0fdbd16c..4a969ba1e 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_detector.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_detector.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_disk_manipulator.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_disk_manipulator.json index 0732196d5..7d54ab5f4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_disk_manipulator.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_disk_manipulator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_disk_manipulator" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_fluid_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_fluid_grid.json index cc3c074aa..c5a90ad63 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_fluid_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_fluid_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_fluid_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_grid.json index 70147a7ec..beea41b1d 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_receiver.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_receiver.json index b175bf9f2..1587bc1e1 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_receiver.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_network_receiver" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_network_receiver" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_transmitter.json index 9fd0a5737..62262ec75 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_network_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_network_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_network_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_pattern_grid.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_pattern_grid.json index 6ebbcdef7..d2f5ce5e4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_pattern_grid.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_pattern_grid" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_pattern_grid" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_relay.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_relay.json index 1b597ee4f..ee66221db 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_relay.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_relay.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_relay" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_relay" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_security_manager.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_security_manager.json index 49aa3c3cc..621bd69a4 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_security_manager.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_security_manager.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_security_manager" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_security_manager" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_wireless_transmitter.json index 58d119056..7ba60d977 100644 --- a/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/loot_tables/blocks/yellow_wireless_transmitter.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "refinedstorage:yellow_wireless_transmitter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "refinedstorage:blocks/yellow_wireless_transmitter" } \ No newline at end of file diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_controller.json index 4e16e544d..6280630b2 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter.json index 3695af494..0233e9ada 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter_manager.json index 81ebbad5c..199d76b2b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_grid.json index a05d5b854..7a2c5efce 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_monitor.json index 50814250f..2482618e2 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_detector.json index ecd74caa2..8c0c63bba 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_disk_manipulator.json index b6ea093f7..986a86c65 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_fluid_grid.json index 491230873..99964da1f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_grid.json index f9dab0200..0aa3dce3f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_receiver.json index be457aee4..c8fbb544e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_transmitter.json index db79217ce..f6a9f3a41 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_pattern_grid.json index d525c748f..a754f5804 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_relay.json index 066269131..f90b63015 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_security_manager.json index 8c766c07f..5e206068f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_wireless_transmitter.json index 162c6ea8d..05de618ae 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/black_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_controller.json index 6d0a34bad..ccb39ce76 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter.json index ac89114f7..3b7367a36 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter_manager.json index 40fbf8b81..b0b7b5b68 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_grid.json index 75071c830..1208e8f8f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_monitor.json index a4498e61b..56a4ce085 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_detector.json index 73e10a71d..a1a8bd124 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_disk_manipulator.json index ee8c50d2f..3290d115d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_fluid_grid.json index 7e97e3968..6095373f5 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_grid.json index 7aa842766..e30bae66f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_receiver.json index 5be3800a3..5d11b4c1b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_transmitter.json index 6c693175a..d9655ee6d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_pattern_grid.json index ca3b83550..dd6d8308d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_relay.json index fb7734bdb..0edc79086 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_security_manager.json index 9c40b30cd..17a976c3d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_wireless_transmitter.json index ae47a13f4..7fdc4f012 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/blue_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_controller.json index 4e09a10d4..42a879a9b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter.json index 6530261f4..e0c588b89 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter_manager.json index 863be108a..275867632 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_grid.json index b7dea3993..3f3473394 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_monitor.json index 83d6b6d0f..4954c2c8e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_detector.json index 16b78b85a..d138b43bb 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_disk_manipulator.json index e80fa3265..e6e72372b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_fluid_grid.json index e76c1229f..caca8c074 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_grid.json index 3233650c4..f1b2c85fd 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_receiver.json index cbcf4f01b..28f1fb1d9 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_transmitter.json index 05a7eb9e5..96d6e4ea2 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_pattern_grid.json index f84c0faaf..2bf2b9064 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_relay.json index 78cd1843a..74da7a98e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_security_manager.json index d3748bfa8..5f4d3850b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_wireless_transmitter.json index 30314b8b3..eef1f6d48 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/brown_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/controller.json index c58309737..2cd0cd295 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter.json index 9230f6a6c..50bd6235b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter_manager.json index 295fe0411..bc5ce587b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_grid.json index 4ec72f64d..ee3fdf215 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_monitor.json index e492a8a01..46b80aaae 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_controller.json index 3fd8ef657..5c02a1b6a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter.json index bbbc52196..d3b9da30a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter_manager.json index e92ba5e64..10a5a2e11 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_grid.json index 0f096d9dc..9b8045a3f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_monitor.json index 849eba982..6b4907983 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_detector.json index ad8521790..1699d492b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_disk_manipulator.json index a7f325dee..315200a53 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_fluid_grid.json index b615ad94d..f43f2dbbe 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_grid.json index 7050e187a..befb8906b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_receiver.json index 49149e4cd..f0398bf6f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_transmitter.json index b82370ef2..e72524661 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_pattern_grid.json index 106db1307..e49e61290 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_relay.json index 7f3563acb..646e8aaf0 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_security_manager.json index a19b77262..3f51e4549 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_wireless_transmitter.json index 7b9a93eb0..8a8eae145 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/cyan_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/detector.json index 629985731..f199f0a7d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/disk_manipulator.json index ba29168b0..47abc24f0 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/fluid_grid.json index f69b3ef6f..ec556040c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_controller.json index ad869f7a6..36b81d066 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter.json index a827dea46..23c4469ba 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter_manager.json index 4e60e085d..bfbf33de6 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_grid.json index 425a4b3fa..614211608 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_monitor.json index c321f9f98..b9a1737b4 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_detector.json index 79911bae0..317394b56 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_disk_manipulator.json index a8f3b32c7..89ca28ba0 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_fluid_grid.json index 43f5852ea..1e1f309db 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_grid.json index 9c0fa9125..50c3d809b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_receiver.json index 5ef672cef..061ed02cd 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_transmitter.json index 3874e8a55..f744c18f7 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_pattern_grid.json index 25867e32b..4ec87c27a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_relay.json index 076ba0c39..350f6bbf2 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_security_manager.json index 752f0793b..68fa260dc 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_wireless_transmitter.json index 6c3d217c1..0fb49077a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/gray_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_controller.json index d88a075d9..da1d0f755 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter.json index 4afa9ac76..e221b02a2 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter_manager.json index 604da5c40..1c21652b1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_grid.json index f83195726..e26ba5503 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_monitor.json index d0f36d63c..da0b24022 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_detector.json index 5762a9986..8a860d1de 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_disk_manipulator.json index e9582bc91..e8bc1b969 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_fluid_grid.json index 9bc5aff5c..344ce9369 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_grid.json index 34b0fc10b..eb5bb7eda 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_receiver.json index d7672bee7..b02fcb25d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_transmitter.json index 5c9a14af3..6cb20be6a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_pattern_grid.json index 5af0032cf..afed47d46 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_relay.json index 7ebdfe8fe..46888cb74 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_security_manager.json index ffb03b1fd..ece5bb712 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_wireless_transmitter.json index eb3860f8f..5e145e4ca 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/green_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/grid.json index c258a7b66..f72a6fae8 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_controller.json index a6ed65b97..ee40ee748 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter.json index aa6508e37..58abe1118 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter_manager.json index 7ae6068c8..240ef5349 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_grid.json index 00dba58c7..50e317ba0 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_monitor.json index 0047b9720..0c9108730 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_detector.json index 4ca4e1cee..d4d1112e9 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_disk_manipulator.json index 56e7c1731..723cad737 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_fluid_grid.json index b1eed9d00..6592fc921 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_grid.json index 8ad4ab7ed..a85827696 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_receiver.json index 5afc5413d..3f0fca01b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_transmitter.json index 82215628a..6032cb4c9 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_pattern_grid.json index d960df4e7..aa4ada1ec 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_relay.json index 81ecd6950..f50858e01 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_security_manager.json index baab84155..fc3c911c4 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_wireless_transmitter.json index 7d9a38b78..0ea77a10c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/light_gray_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_controller.json index db5cb5022..9a6022b1c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter.json index ad9f511dd..0f3419853 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter_manager.json index ad3c7df6b..1d2910f84 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_grid.json index e73758bfa..dc34dd4eb 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_monitor.json index 7053c38c2..b1a717db1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_detector.json index 3e33027ad..dcd51d85e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_disk_manipulator.json index bcf8a22a6..cd502053a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_fluid_grid.json index 0bd4d613a..8f76e01c3 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_grid.json index 9f7eac000..88f9536c3 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_receiver.json index f099d7244..05f5b4a10 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_transmitter.json index 55fa920da..33facddfd 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_pattern_grid.json index e95d68b1a..3e6fa008f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_relay.json index ec4ba6afe..e32983eed 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_security_manager.json index 13bff6e82..622734966 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_wireless_transmitter.json index aa80e43c9..95031d53c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/lime_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_controller.json index b959fa4a6..7fbd39833 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter.json index 87789eefb..06a1cc65f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter_manager.json index dad2ac8e0..f06d66d74 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_grid.json index 75348aa82..9fd13f31d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_monitor.json index ee44c4cf8..07c55f371 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_detector.json index c9a072f80..6593b87ec 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_disk_manipulator.json index 041f1199e..820722cec 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_fluid_grid.json index 023436241..ed1f8cedf 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_grid.json index 652100c91..6f10f9398 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_receiver.json index 25819072a..ee6f1acbc 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_transmitter.json index 0a3cf8ebc..5cec7fcdb 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_pattern_grid.json index 993cec72c..36f608391 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_relay.json index f06049a9f..ab08f1dd8 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_security_manager.json index d8851c945..ade7cfe26 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_wireless_transmitter.json index 43e063fe1..fc27df5d6 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/magenta_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_receiver.json index 878536081..2e11d6518 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_transmitter.json index 1cfdc6d00..192b577cc 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_controller.json index 7cd7d3dde..18a911835 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter.json index 4c91aa47e..b8613bf9f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter_manager.json index 1b75810ea..c77cff69b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_grid.json index 5e66b38ad..df7bf95ab 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_monitor.json index 0300c61a2..01c454cc4 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_detector.json index fa921949c..c698d0af3 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_disk_manipulator.json index 0356974d3..a16ec45a0 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_fluid_grid.json index c8765eccb..ea245fe33 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_grid.json index c9b2cfc6a..0f64100d8 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_receiver.json index 80576f058..2207f13ac 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_transmitter.json index f958d7c5d..d1dc93456 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_pattern_grid.json index 0c767d2f6..eb92d5f5a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_relay.json index 8ae20ffcb..a512282f7 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_security_manager.json index 0deb87beb..88e76411f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_wireless_transmitter.json index 45b65bf42..7e4fae886 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/orange_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pattern_grid.json index 61e5b0fd4..eaffc5c35 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_controller.json index a25e331ed..47226e99b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter.json index 40232e8dc..0161ed0ce 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter_manager.json index 710ddbd2c..332ec80aa 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_grid.json index ef2b190a5..d13a2093e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_monitor.json index 080ad0ce1..e13baf55f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_detector.json index ec6dd2465..ec471f7f2 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_disk_manipulator.json index b437980cf..8316f8344 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_fluid_grid.json index a3ee996fb..6459a1376 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_grid.json index beb1d9a3f..a011144f2 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_receiver.json index 0c7556135..1ed04ca27 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_transmitter.json index 74bb8feaa..041c159e5 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_pattern_grid.json index 779d78a20..291bdf3fa 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_relay.json index 092ea769d..18ed53f2b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_security_manager.json index 0ac463fe3..3881fc03a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_wireless_transmitter.json index 5082d1062..ae4673b64 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/pink_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_controller.json index ef6f4d5f6..2d1445d39 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter.json index 707e8dd83..9e1f42b4a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter_manager.json index e165dec42..a1ba720fe 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_grid.json index 8e37b91b0..699a01c4f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_monitor.json index a59e603e6..47b800d73 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_detector.json index 1a89e52a3..e49ba3d8e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_disk_manipulator.json index e72fb38c9..073b7cc0b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_fluid_grid.json index e10b4421b..e5ff4578d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_grid.json index 1763fd14c..c143f37de 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_receiver.json index e207c48e5..0015ac19f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_transmitter.json index 3a98da924..07cea8c57 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_pattern_grid.json index 3a9be0570..122725fab 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_relay.json index 40f233ea3..65a9202a1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_security_manager.json index cb4a3c4bd..18431156c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_wireless_transmitter.json index beab6f9e7..0183f99ac 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/purple_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_controller.json index 86a355e9b..2b21e60d1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter.json index 315fae7bd..258452404 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter_manager.json index 1adc7d5c2..9176f7a43 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_grid.json index 97a20ab4e..cc2da27e4 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_monitor.json index db3bcc0ca..01dc28c13 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_detector.json index 1835ba174..919fe48ae 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_disk_manipulator.json index f63f0b2c2..7f2381419 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_fluid_grid.json index 1adb34156..adeb42288 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_grid.json index a8adfe1ad..101b58f9e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_receiver.json index 598f7838e..87a0b1ff5 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_transmitter.json index 6292c5fa7..9bd272c47 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_pattern_grid.json index 3df7fd717..6d0fedea1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_relay.json index c4a93bdf3..73c35ad49 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_security_manager.json index fbe1eeca7..1ad596a11 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_wireless_transmitter.json index c3432abdd..a1c166d7d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/red_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/relay.json index 63c767d29..f716dee9a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/security_manager.json index 5d0f8acd3..c0c9f6cf4 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_controller.json index 7cd61a19c..5ffc3fe12 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter.json index 66437ac2a..5082e8b67 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter_manager.json index ff29dae89..5f43e58f6 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_grid.json index dbcd34b95..6d1a275bb 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_monitor.json index 0ac5239bf..2f73fd141 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_detector.json index 32b0e4c50..380a475a4 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_disk_manipulator.json index a647ffb1e..ba34bdd05 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_fluid_grid.json index 7bb6c2a41..06d4b8cfc 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_grid.json index 13c4e6459..a3f91045b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_receiver.json index 3c6ecaf59..cc921536b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_transmitter.json index 6c206480c..9f272bbb1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_pattern_grid.json index 0c964f5e4..9820cb9b6 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_relay.json index cc35b3f8c..3a541702e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_security_manager.json index d56d4d201..b98198748 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_wireless_transmitter.json index 95bf13452..b0c08109d 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/white_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/wireless_transmitter.json index e2b74f278..77cdb9043 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_controller.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_controller.json index b15db2733..735f9e552 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_controller.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_controller.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter.json index faddef65b..09c450ae4 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter_manager.json index 8d11b5781..4cfd26aaf 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafter_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_grid.json index 934498985..572c1139c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_monitor.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_monitor.json index 5271870ec..d879f5b62 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_crafting_monitor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_detector.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_detector.json index 95b7e5497..c660cdc89 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_detector.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_detector.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_disk_manipulator.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_disk_manipulator.json index b1c175f9f..9b0bd19ab 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_disk_manipulator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_fluid_grid.json index 4bd826790..fbbf9c923 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_grid.json index 608d59367..e1033ab1b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_receiver.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_receiver.json index 3393d677e..6577d7f47 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_receiver.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_receiver.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_transmitter.json index 4e8f88d06..874ce2c98 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_network_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_pattern_grid.json index 4bc668c3c..18f4b4f46 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_relay.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_relay.json index eb86e5ebf..560095525 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_relay.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_relay.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_security_manager.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_security_manager.json index de2d30d23..721a0310c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_security_manager.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_security_manager.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_wireless_transmitter.json b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_wireless_transmitter.json index 717195ab4..9e445e044 100644 --- a/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/recipes/coloring_recipes/yellow_wireless_transmitter.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "refinedstorage", "ingredients": [ { diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/black_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/black_crafting_grid.json index a57ba2e51..3e5189efb 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/black_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/black_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:black_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/blue_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/blue_crafting_grid.json index d483091a5..072e94129 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/blue_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/blue_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:blue_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/brown_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/brown_crafting_grid.json index de5b9cb5e..751ab5898 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/brown_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/brown_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:brown_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/crafting_grid.json index 095b12718..e4b1541c3 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/cyan_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/cyan_crafting_grid.json index c7963a9d6..07d53b9be 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/cyan_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/cyan_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:cyan_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/gray_crafting_grid.json index a8823b8ba..f198a94da 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/gray_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:gray_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/green_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/green_crafting_grid.json index 8048b76cb..18dfc6757 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/green_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/green_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:green_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/light_gray_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/light_gray_crafting_grid.json index c0040d212..4977bcb83 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/light_gray_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/light_gray_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:light_gray_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/lime_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/lime_crafting_grid.json index bdfdc4fa0..f2594a478 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/lime_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/lime_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:lime_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/magenta_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/magenta_crafting_grid.json index 9febc7e15..daa81257a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/magenta_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/magenta_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:magenta_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/orange_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/orange_crafting_grid.json index 259aecec6..a8bfd3562 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/orange_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/orange_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:orange_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/pink_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/pink_crafting_grid.json index 309c98f88..c90095f21 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/pink_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/pink_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:pink_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/purple_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/purple_crafting_grid.json index c6d121e63..629857941 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/purple_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/purple_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:purple_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/red_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/red_crafting_grid.json index a5d0bda93..19e42990a 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/red_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/red_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:red_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/white_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/white_crafting_grid.json index 44b446837..2fb1bca44 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/white_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/white_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:white_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/yellow_crafting_grid.json b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/yellow_crafting_grid.json index c05c4c8ea..bb11fd8d1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/crafting_grid/yellow_crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/crafting_grid/yellow_crafting_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:yellow_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/black_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/black_fluid_grid.json index 0bc459596..33dd79b9f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/black_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/black_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:black_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/blue_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/blue_fluid_grid.json index 9461d7280..bc4c6f789 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/blue_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/blue_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:blue_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/brown_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/brown_fluid_grid.json index 152932619..03142a6fb 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/brown_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/brown_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:brown_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/cyan_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/cyan_fluid_grid.json index 82ee116fb..92df4affe 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/cyan_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/cyan_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:cyan_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/fluid_grid.json index d2b33a8f1..509e8988b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/gray_fluid_grid.json index b3d2cf8a7..92a5710b1 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/gray_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:gray_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/green_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/green_fluid_grid.json index 4aa4341f1..fd26eabcd 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/green_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/green_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:green_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/light_gray_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/light_gray_fluid_grid.json index dd868d80a..277ba4cb0 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/light_gray_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/light_gray_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:light_gray_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/lime_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/lime_fluid_grid.json index f17bfc66c..8d086bcd5 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/lime_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/lime_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:lime_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/magenta_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/magenta_fluid_grid.json index 62964a471..2b4b87e00 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/magenta_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/magenta_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:magenta_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/orange_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/orange_fluid_grid.json index a2ce4546a..d1cfbc32b 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/orange_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/orange_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:orange_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/pink_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/pink_fluid_grid.json index fbec36738..e95c5418e 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/pink_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/pink_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:pink_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/purple_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/purple_fluid_grid.json index 0100d1291..622b608ab 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/purple_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/purple_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:purple_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/red_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/red_fluid_grid.json index f4aae0c42..7fac83657 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/red_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/red_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:red_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/white_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/white_fluid_grid.json index b604f1b40..3906b6a95 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/white_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/white_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:white_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/yellow_fluid_grid.json b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/yellow_fluid_grid.json index 9d71f58c2..420d70925 100644 --- a/src/generated/resources/data/refinedstorage/recipes/fluid_grid/yellow_fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/fluid_grid/yellow_fluid_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:yellow_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/black_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/black_pattern_grid.json index df579f928..7b52fd723 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/black_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/black_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:black_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/blue_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/blue_pattern_grid.json index 49d432ef0..f70c58d90 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/blue_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/blue_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:blue_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/brown_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/brown_pattern_grid.json index df64ffa25..624a3493c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/brown_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/brown_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:brown_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/cyan_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/cyan_pattern_grid.json index f9cf69c29..97b14c8ff 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/cyan_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/cyan_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:cyan_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/gray_pattern_grid.json index ac6105626..394291e3f 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/gray_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:gray_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/green_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/green_pattern_grid.json index 7098354af..466723025 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/green_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/green_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:green_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/light_gray_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/light_gray_pattern_grid.json index 729b4abd7..80e831838 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/light_gray_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/light_gray_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:light_gray_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/lime_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/lime_pattern_grid.json index dea7cd7e0..abf9c6259 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/lime_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/lime_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:lime_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/magenta_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/magenta_pattern_grid.json index a5b3b8b4b..96617a932 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/magenta_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/magenta_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:magenta_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/orange_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/orange_pattern_grid.json index fa5b9ec16..946ca87b7 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/orange_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/orange_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:orange_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pattern_grid.json index db679bdbb..1ad6a2aae 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pink_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pink_pattern_grid.json index 27bcfc035..f1014f4cc 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pink_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/pink_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:pink_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/purple_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/purple_pattern_grid.json index 62130f060..324f4f668 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/purple_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/purple_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:purple_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/red_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/red_pattern_grid.json index 84b4fcdf4..6d60331ed 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/red_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/red_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:red_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/white_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/white_pattern_grid.json index adfbd69f2..fb6cfbc7c 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/white_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/white_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:white_grid" diff --git a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/yellow_pattern_grid.json b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/yellow_pattern_grid.json index de8a7025e..234e79d50 100644 --- a/src/generated/resources/data/refinedstorage/recipes/pattern_grid/yellow_pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/recipes/pattern_grid/yellow_pattern_grid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "refinedstorage:yellow_grid" diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/controller.json b/src/generated/resources/data/refinedstorage/tags/blocks/controller.json index af9280905..804fbb585 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/controller.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/controller.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_controller", "refinedstorage:orange_controller", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/crafter.json b/src/generated/resources/data/refinedstorage/tags/blocks/crafter.json index efe2272ac..bcc58380b 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/crafter.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/crafter.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafter", "refinedstorage:orange_crafter", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/crafter_manager.json b/src/generated/resources/data/refinedstorage/tags/blocks/crafter_manager.json index e523f3c18..bb4d4ebfe 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/crafter_manager.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafter_manager", "refinedstorage:orange_crafter_manager", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/crafting_grid.json b/src/generated/resources/data/refinedstorage/tags/blocks/crafting_grid.json index 35d358cf1..b783c1200 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/crafting_grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafting_grid", "refinedstorage:orange_crafting_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/crafting_monitor.json b/src/generated/resources/data/refinedstorage/tags/blocks/crafting_monitor.json index 493ca506f..ca99dcb63 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/crafting_monitor.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafting_monitor", "refinedstorage:orange_crafting_monitor", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/creative_controller.json b/src/generated/resources/data/refinedstorage/tags/blocks/creative_controller.json index 2e140cc01..e9dacbb96 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/creative_controller.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/creative_controller.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_creative_controller", "refinedstorage:orange_creative_controller", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/detector.json b/src/generated/resources/data/refinedstorage/tags/blocks/detector.json index 1092c9f26..01c7a610c 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/detector.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/detector.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_detector", "refinedstorage:orange_detector", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/disk_manipulator.json b/src/generated/resources/data/refinedstorage/tags/blocks/disk_manipulator.json index e9e0ddbf2..b3d956634 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/disk_manipulator.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_disk_manipulator", "refinedstorage:orange_disk_manipulator", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/fluid_grid.json b/src/generated/resources/data/refinedstorage/tags/blocks/fluid_grid.json index 4b57e76c8..44bac207f 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/fluid_grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_fluid_grid", "refinedstorage:orange_fluid_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/grid.json b/src/generated/resources/data/refinedstorage/tags/blocks/grid.json index cc5b43744..3c59ac637 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/grid.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_grid", "refinedstorage:orange_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/network_receiver.json b/src/generated/resources/data/refinedstorage/tags/blocks/network_receiver.json index d8edf164d..afe70d8a1 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/network_receiver.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/network_receiver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_network_receiver", "refinedstorage:orange_network_receiver", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/network_transmitter.json b/src/generated/resources/data/refinedstorage/tags/blocks/network_transmitter.json index c2e320ddc..b8645cfaa 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/network_transmitter.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_network_transmitter", "refinedstorage:orange_network_transmitter", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/pattern_grid.json b/src/generated/resources/data/refinedstorage/tags/blocks/pattern_grid.json index bc14c201b..09212798c 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/pattern_grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_pattern_grid", "refinedstorage:orange_pattern_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/relay.json b/src/generated/resources/data/refinedstorage/tags/blocks/relay.json index 736ba7cc2..0616c8e14 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/relay.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/relay.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_relay", "refinedstorage:orange_relay", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/security_manager.json b/src/generated/resources/data/refinedstorage/tags/blocks/security_manager.json index 3d378b1b4..dd466636b 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/security_manager.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/security_manager.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_security_manager", "refinedstorage:orange_security_manager", diff --git a/src/generated/resources/data/refinedstorage/tags/blocks/wireless_transmitter.json b/src/generated/resources/data/refinedstorage/tags/blocks/wireless_transmitter.json index 9158222e5..d2af672e3 100644 --- a/src/generated/resources/data/refinedstorage/tags/blocks/wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/tags/blocks/wireless_transmitter.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_wireless_transmitter", "refinedstorage:orange_wireless_transmitter", diff --git a/src/generated/resources/data/refinedstorage/tags/items/controller.json b/src/generated/resources/data/refinedstorage/tags/items/controller.json index af9280905..804fbb585 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/controller.json +++ b/src/generated/resources/data/refinedstorage/tags/items/controller.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_controller", "refinedstorage:orange_controller", diff --git a/src/generated/resources/data/refinedstorage/tags/items/crafter.json b/src/generated/resources/data/refinedstorage/tags/items/crafter.json index efe2272ac..bcc58380b 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/crafter.json +++ b/src/generated/resources/data/refinedstorage/tags/items/crafter.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafter", "refinedstorage:orange_crafter", diff --git a/src/generated/resources/data/refinedstorage/tags/items/crafter_manager.json b/src/generated/resources/data/refinedstorage/tags/items/crafter_manager.json index e523f3c18..bb4d4ebfe 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/crafter_manager.json +++ b/src/generated/resources/data/refinedstorage/tags/items/crafter_manager.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafter_manager", "refinedstorage:orange_crafter_manager", diff --git a/src/generated/resources/data/refinedstorage/tags/items/crafting_grid.json b/src/generated/resources/data/refinedstorage/tags/items/crafting_grid.json index 35d358cf1..b783c1200 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/crafting_grid.json +++ b/src/generated/resources/data/refinedstorage/tags/items/crafting_grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafting_grid", "refinedstorage:orange_crafting_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/items/crafting_monitor.json b/src/generated/resources/data/refinedstorage/tags/items/crafting_monitor.json index 493ca506f..ca99dcb63 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/crafting_monitor.json +++ b/src/generated/resources/data/refinedstorage/tags/items/crafting_monitor.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_crafting_monitor", "refinedstorage:orange_crafting_monitor", diff --git a/src/generated/resources/data/refinedstorage/tags/items/detector.json b/src/generated/resources/data/refinedstorage/tags/items/detector.json index 1092c9f26..01c7a610c 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/detector.json +++ b/src/generated/resources/data/refinedstorage/tags/items/detector.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_detector", "refinedstorage:orange_detector", diff --git a/src/generated/resources/data/refinedstorage/tags/items/disk_manipulator.json b/src/generated/resources/data/refinedstorage/tags/items/disk_manipulator.json index e9e0ddbf2..b3d956634 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/disk_manipulator.json +++ b/src/generated/resources/data/refinedstorage/tags/items/disk_manipulator.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_disk_manipulator", "refinedstorage:orange_disk_manipulator", diff --git a/src/generated/resources/data/refinedstorage/tags/items/fluid_grid.json b/src/generated/resources/data/refinedstorage/tags/items/fluid_grid.json index 4b57e76c8..44bac207f 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/fluid_grid.json +++ b/src/generated/resources/data/refinedstorage/tags/items/fluid_grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_fluid_grid", "refinedstorage:orange_fluid_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/items/grid.json b/src/generated/resources/data/refinedstorage/tags/items/grid.json index cc5b43744..3c59ac637 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/grid.json +++ b/src/generated/resources/data/refinedstorage/tags/items/grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_grid", "refinedstorage:orange_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/items/network_receiver.json b/src/generated/resources/data/refinedstorage/tags/items/network_receiver.json index d8edf164d..afe70d8a1 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/network_receiver.json +++ b/src/generated/resources/data/refinedstorage/tags/items/network_receiver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_network_receiver", "refinedstorage:orange_network_receiver", diff --git a/src/generated/resources/data/refinedstorage/tags/items/network_transmitter.json b/src/generated/resources/data/refinedstorage/tags/items/network_transmitter.json index c2e320ddc..b8645cfaa 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/network_transmitter.json +++ b/src/generated/resources/data/refinedstorage/tags/items/network_transmitter.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_network_transmitter", "refinedstorage:orange_network_transmitter", diff --git a/src/generated/resources/data/refinedstorage/tags/items/pattern_grid.json b/src/generated/resources/data/refinedstorage/tags/items/pattern_grid.json index bc14c201b..09212798c 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/pattern_grid.json +++ b/src/generated/resources/data/refinedstorage/tags/items/pattern_grid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_pattern_grid", "refinedstorage:orange_pattern_grid", diff --git a/src/generated/resources/data/refinedstorage/tags/items/relay.json b/src/generated/resources/data/refinedstorage/tags/items/relay.json index 736ba7cc2..0616c8e14 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/relay.json +++ b/src/generated/resources/data/refinedstorage/tags/items/relay.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_relay", "refinedstorage:orange_relay", diff --git a/src/generated/resources/data/refinedstorage/tags/items/security_manager.json b/src/generated/resources/data/refinedstorage/tags/items/security_manager.json index 3d378b1b4..dd466636b 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/security_manager.json +++ b/src/generated/resources/data/refinedstorage/tags/items/security_manager.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_security_manager", "refinedstorage:orange_security_manager", diff --git a/src/generated/resources/data/refinedstorage/tags/items/wireless_transmitter.json b/src/generated/resources/data/refinedstorage/tags/items/wireless_transmitter.json index 9158222e5..d2af672e3 100644 --- a/src/generated/resources/data/refinedstorage/tags/items/wireless_transmitter.json +++ b/src/generated/resources/data/refinedstorage/tags/items/wireless_transmitter.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "refinedstorage:white_wireless_transmitter", "refinedstorage:orange_wireless_transmitter", diff --git a/src/main/java/com/refinedmods/refinedstorage/RS.java b/src/main/java/com/refinedmods/refinedstorage/RS.java index 5f2a52697..37c19572b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RS.java +++ b/src/main/java/com/refinedmods/refinedstorage/RS.java @@ -5,13 +5,10 @@ import com.refinedmods.refinedstorage.config.ClientConfig; import com.refinedmods.refinedstorage.config.ServerConfig; import com.refinedmods.refinedstorage.datageneration.DataGenerators; import com.refinedmods.refinedstorage.integration.curios.CuriosIntegration; -import com.refinedmods.refinedstorage.item.group.MainCreativeModeTab; import com.refinedmods.refinedstorage.network.NetworkHandler; import com.refinedmods.refinedstorage.setup.ClientSetup; import com.refinedmods.refinedstorage.setup.CommonSetup; import com.refinedmods.refinedstorage.setup.ServerSetup; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; @@ -26,7 +23,6 @@ public final class RS { public static final String NAME = "Refined Storage"; public static final NetworkHandler NETWORK_HANDLER = new NetworkHandler(); - public static final CreativeModeTab CREATIVE_MODE_TAB = new MainCreativeModeTab(); public static final ServerConfig SERVER_CONFIG = new ServerConfig(); public static final ClientConfig CLIENT_CONFIG = new ClientConfig(); @@ -35,7 +31,6 @@ public final class RS { FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onClientSetup); FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onModelBake); FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onRegisterAdditionalModels); - FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onTextureStitch); FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onRegisterModelGeometry); FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onRegisterKeymappings); FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onRegisterColorBindings); @@ -49,9 +44,9 @@ public final class RS { RSBlocks.register(); RSItems.register(); - RSLootFunctions.register(); FMLJavaModLoadingContext.get().getModEventBus().addListener(CommonSetup::onCommonSetup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(CommonSetup::onRegister); FMLJavaModLoadingContext.get().getModEventBus().addListener(CommonSetup::onRegisterCapabilities); FMLJavaModLoadingContext.get().getModEventBus().register(new DataGenerators()); FMLJavaModLoadingContext.get().getModEventBus().register(new CuriosIntegration()); diff --git a/src/main/java/com/refinedmods/refinedstorage/RSCreativeModeTabItems.java b/src/main/java/com/refinedmods/refinedstorage/RSCreativeModeTabItems.java new file mode 100644 index 000000000..afb713223 --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/RSCreativeModeTabItems.java @@ -0,0 +1,188 @@ +package com.refinedmods.refinedstorage; + +import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.item.*; +import com.refinedmods.refinedstorage.util.ColorMap; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegisterEvent; +import net.minecraftforge.registries.RegistryObject; + +public class RSCreativeModeTabItems { + private RSCreativeModeTabItems() { + } + + public static void register(RegisterEvent.RegisterHelper helper) { + helper.register("general", CreativeModeTab.builder() + .title(Component.translatable("itemGroup.refinedstorage")) + .icon(() -> new ItemStack(RSBlocks.CREATIVE_CONTROLLER.get(ColorMap.DEFAULT_COLOR).get())) + .displayItems((params, output) -> RSCreativeModeTabItems.append(output)) + .build()); + } + + public static void append(CreativeModeTab.Output output) { + add(output, RSItems.CONSTRUCTION_CORE); + add(output, RSItems.DESTRUCTION_CORE); + add(output, RSItems.QUARTZ_ENRICHED_IRON); + add(output, RSItems.PROCESSOR_BINDING); + add(output, RSItems.PROCESSORS.get(ProcessorItem.Type.RAW_BASIC)); + add(output, RSItems.PROCESSORS.get(ProcessorItem.Type.RAW_IMPROVED)); + add(output, RSItems.PROCESSORS.get(ProcessorItem.Type.RAW_ADVANCED)); + add(output, RSItems.PROCESSORS.get(ProcessorItem.Type.BASIC)); + add(output, RSItems.PROCESSORS.get(ProcessorItem.Type.IMPROVED)); + add(output, RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED)); + add(output, RSItems.SILICON); + add(output, RSItems.SECURITY_CARD); + add(output, RSItems.NETWORK_CARD); + + add(output, ItemStorageType.ONE_K); + add(output, ItemStorageType.FOUR_K); + add(output, ItemStorageType.SIXTEEN_K); + add(output, ItemStorageType.SIXTY_FOUR_K); + add(output, ItemStorageType.CREATIVE); + + add(output, FluidStorageType.SIXTY_FOUR_K); + add(output, FluidStorageType.TWO_HUNDRED_FIFTY_SIX_K); + add(output, FluidStorageType.THOUSAND_TWENTY_FOUR_K); + add(output, FluidStorageType.FOUR_THOUSAND_NINETY_SIX_K); + add(output, FluidStorageType.CREATIVE); + + add(output, RSItems.STORAGE_HOUSING); + + add(output, UpgradeItem.Type.NORMAL); + add(output, UpgradeItem.Type.SPEED); + add(output, UpgradeItem.Type.RANGE); + add(output, UpgradeItem.Type.CRAFTING); + add(output, UpgradeItem.Type.STACK); + add(output, UpgradeItem.Type.SILK_TOUCH); + add(output, UpgradeItem.Type.FORTUNE_1); + add(output, UpgradeItem.Type.FORTUNE_2); + add(output, UpgradeItem.Type.FORTUNE_3); + add(output, UpgradeItem.Type.REGULATOR); + + add(output, RSItems.WRENCH); + add(output, RSItems.PATTERN); + add(output, RSItems.FILTER); + + add(output, RSItems.WIRELESS_GRID); + add(output, RSItems.CREATIVE_WIRELESS_GRID); + add(output, RSItems.WIRELESS_FLUID_GRID); + add(output, RSItems.CREATIVE_WIRELESS_FLUID_GRID); + add(output, RSItems.WIRELESS_CRAFTING_MONITOR); + add(output, RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR); + + add(output, RSItems.PORTABLE_GRID); + add(output, RSItems.CREATIVE_PORTABLE_GRID); + add(output, RSItems.QUARTZ_ENRICHED_IRON_BLOCK); + add(output, RSItems.MACHINE_CASING); + add(output, RSItems.CABLE); + add(output, RSItems.DISK_DRIVE); + + addStorageBlock(output, ItemStorageType.ONE_K); + addStorageBlock(output, ItemStorageType.FOUR_K); + addStorageBlock(output, ItemStorageType.SIXTEEN_K); + addStorageBlock(output, ItemStorageType.SIXTY_FOUR_K); + addStorageBlock(output, ItemStorageType.CREATIVE); + + addStorageBlock(output, FluidStorageType.SIXTY_FOUR_K); + addStorageBlock(output, FluidStorageType.TWO_HUNDRED_FIFTY_SIX_K); + addStorageBlock(output, FluidStorageType.THOUSAND_TWENTY_FOUR_K); + addStorageBlock(output, FluidStorageType.FOUR_THOUSAND_NINETY_SIX_K); + addStorageBlock(output, FluidStorageType.CREATIVE); + + add(output, RSItems.EXTERNAL_STORAGE); + add(output, RSItems.IMPORTER); + add(output, RSItems.EXPORTER); + add(output, RSItems.INTERFACE); + add(output, RSItems.FLUID_INTERFACE); + add(output, RSItems.STORAGE_MONITOR); + add(output, RSItems.CONSTRUCTOR); + add(output, RSItems.DESTRUCTOR); + add(output, RSItems.CONTROLLER); + add(output, RSItems.CREATIVE_CONTROLLER); + add(output, RSItems.GRID); + add(output, RSItems.CRAFTING_GRID); + add(output, RSItems.PATTERN_GRID); + add(output, RSItems.FLUID_GRID); + add(output, RSItems.NETWORK_RECEIVER); + add(output, RSItems.NETWORK_TRANSMITTER); + add(output, RSItems.RELAY); + add(output, RSItems.DETECTOR); + add(output, RSItems.SECURITY_MANAGER); + add(output, RSItems.WIRELESS_TRANSMITTER); + add(output, RSItems.DISK_MANIPULATOR); + add(output, RSItems.CRAFTER); + add(output, RSItems.CRAFTER_MANAGER); + add(output, RSItems.CRAFTING_MONITOR); + + addCovers(output); + } + + private static void addCovers(CreativeModeTab.Output output) { + if (!RS.CLIENT_CONFIG.getCover().showAllRecipesInJEI()) { + ItemStack coverExampleStack = new ItemStack(Blocks.STONE_BRICKS); + addCovers(output, coverExampleStack); + return; + } + for (Block block : ForgeRegistries.BLOCKS.getValues()) { + Item item = Item.byBlock(block); + if (item == Items.AIR) { + continue; + } + ItemStack itemStack = new ItemStack(item); + if (CoverManager.isValidCover(itemStack)) { + addCovers(output, itemStack); + } + } + } + + private static void addCovers(CreativeModeTab.Output output, ItemStack coverExampleStack) { + ItemStack coverStack = new ItemStack(RSItems.COVER.get()); + ItemStack hollowCoverStack = new ItemStack(RSItems.HOLLOW_COVER.get()); + CoverItem.setItem(coverStack, coverExampleStack); + CoverItem.setItem(hollowCoverStack, coverExampleStack); + output.accept(coverStack); + output.accept(hollowCoverStack); + } + + private static void add(CreativeModeTab.Output output, ColorMap cm) { + cm.values().forEach(c -> add(output, c)); + } + + private static void add(CreativeModeTab.Output output, ItemStorageType type) { + RegistryObject part = RSItems.ITEM_STORAGE_PARTS.get(type); + if (part != null) { + add(output, part); + } + add(output, RSItems.ITEM_STORAGE_DISKS.get(type)); + } + + private static void addStorageBlock(CreativeModeTab.Output output, ItemStorageType type) { + add(output, RSItems.STORAGE_BLOCKS.get(type)); + } + + private static void addStorageBlock(CreativeModeTab.Output output, FluidStorageType type) { + add(output, RSItems.FLUID_STORAGE_BLOCKS.get(type)); + } + + private static void add(CreativeModeTab.Output output, FluidStorageType type) { + RegistryObject part = RSItems.FLUID_STORAGE_PARTS.get(type); + if (part != null) { + add(output, part); + } + add(output, RSItems.FLUID_STORAGE_DISKS.get(type)); + } + + private static void add(CreativeModeTab.Output output, UpgradeItem.Type type) { + add(output, RSItems.UPGRADE_ITEMS.get(type)); + } + + private static void add(CreativeModeTab.Output output, RegistryObject ro) { + output.accept(ro.get()); + } +} diff --git a/src/main/java/com/refinedmods/refinedstorage/RSItems.java b/src/main/java/com/refinedmods/refinedstorage/RSItems.java index ef5e6b036..f28b162aa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RSItems.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSItems.java @@ -46,6 +46,17 @@ public final class RSItems { public static final RegistryObject MACHINE_CASING; public static final RegistryObject COVER; public static final RegistryObject HOLLOW_COVER; + public static final RegistryObject QUARTZ_ENRICHED_IRON_BLOCK; + public static final RegistryObject CABLE; + public static final RegistryObject DISK_DRIVE; + public static final RegistryObject EXTERNAL_STORAGE; + public static final RegistryObject IMPORTER; + public static final RegistryObject EXPORTER; + public static final RegistryObject INTERFACE; + public static final RegistryObject FLUID_INTERFACE; + public static final RegistryObject STORAGE_MONITOR; + public static final RegistryObject CONSTRUCTOR; + public static final RegistryObject DESTRUCTOR; public static final Map> PROCESSORS = new EnumMap<>(ProcessorItem.Type.class); @@ -122,12 +133,12 @@ public final class RSItems { PORTABLE_GRID = ITEMS.register("portable_grid", () -> new PortableGridBlockItem(PortableGridBlockItem.Type.NORMAL)); CREATIVE_PORTABLE_GRID = ITEMS.register("creative_portable_grid", () -> new PortableGridBlockItem(PortableGridBlockItem.Type.CREATIVE)); - registerBlockItemFor(RSBlocks.QUARTZ_ENRICHED_IRON); + QUARTZ_ENRICHED_IRON_BLOCK = registerBlockItemFor(RSBlocks.QUARTZ_ENRICHED_IRON); MACHINE_CASING = registerBlockItemFor(RSBlocks.MACHINE_CASING); COVER = ITEMS.register("cover", CoverItem::new); HOLLOW_COVER = ITEMS.register("hollow_cover", HollowCoverItem::new); - registerBlockItemFor(RSBlocks.CABLE); - registerBlockItemFor(RSBlocks.DISK_DRIVE); + CABLE = registerBlockItemFor(RSBlocks.CABLE); + DISK_DRIVE = registerBlockItemFor(RSBlocks.DISK_DRIVE); for (ItemStorageType type : ItemStorageType.values()) { STORAGE_BLOCKS.put(type, ITEMS.register(RSBlocks.STORAGE_BLOCKS.get(type).getId().getPath(), () -> new StorageBlockItem(RSBlocks.STORAGE_BLOCKS.get(type).get()))); @@ -137,14 +148,14 @@ public final class RSItems { FLUID_STORAGE_BLOCKS.put(type, ITEMS.register(RSBlocks.FLUID_STORAGE_BLOCKS.get(type).getId().getPath(), () -> new FluidStorageBlockItem(RSBlocks.FLUID_STORAGE_BLOCKS.get(type).get()))); } - registerBlockItemFor(RSBlocks.EXTERNAL_STORAGE); - registerBlockItemFor(RSBlocks.IMPORTER); - registerBlockItemFor(RSBlocks.EXPORTER); - registerBlockItemFor(RSBlocks.INTERFACE); - registerBlockItemFor(RSBlocks.FLUID_INTERFACE); - registerBlockItemFor(RSBlocks.STORAGE_MONITOR); - registerBlockItemFor(RSBlocks.CONSTRUCTOR); - registerBlockItemFor(RSBlocks.DESTRUCTOR); + EXTERNAL_STORAGE = registerBlockItemFor(RSBlocks.EXTERNAL_STORAGE); + IMPORTER = registerBlockItemFor(RSBlocks.IMPORTER); + EXPORTER = registerBlockItemFor(RSBlocks.EXPORTER); + INTERFACE = registerBlockItemFor(RSBlocks.INTERFACE); + FLUID_INTERFACE = registerBlockItemFor(RSBlocks.FLUID_INTERFACE); + STORAGE_MONITOR = registerBlockItemFor(RSBlocks.STORAGE_MONITOR); + CONSTRUCTOR = registerBlockItemFor(RSBlocks.CONSTRUCTOR); + DESTRUCTOR = registerBlockItemFor(RSBlocks.DESTRUCTOR); CONTROLLER.put(ColorMap.DEFAULT_COLOR, ITEMS.register( RSBlocks.CONTROLLER.get(ColorMap.DEFAULT_COLOR).getId().getPath(), @@ -208,7 +219,7 @@ public final class RSItems { } private static RegistryObject registerBlockItemFor(RegistryObject block) { - return ITEMS.register(block.getId().getPath(), () -> new BaseBlockItem(block.get(), new Item.Properties().tab(RS.CREATIVE_MODE_TAB))); + return ITEMS.register(block.getId().getPath(), () -> new BaseBlockItem(block.get(), new Item.Properties())); } public static void register() { diff --git a/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java b/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java index 69e4eeabb..0c8c38d81 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java @@ -5,30 +5,23 @@ import com.refinedmods.refinedstorage.loottable.CrafterLootFunction; import com.refinedmods.refinedstorage.loottable.PortableGridBlockLootFunction; import com.refinedmods.refinedstorage.loottable.StorageBlockLootFunction; import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.RegistryObject; public final class RSLootFunctions { - public static final RegistryObject STORAGE_BLOCK; - public static final RegistryObject PORTABLE_GRID; - public static final RegistryObject CRAFTER; - public static final RegistryObject CONTROLLER; - - private static final DeferredRegister LOOT_ITEM_FUNCTIONS = DeferredRegister.create(Registry.LOOT_FUNCTION_REGISTRY, RS.ID); - - static { - STORAGE_BLOCK = LOOT_ITEM_FUNCTIONS.register("storage_block", () -> new LootItemFunctionType(new StorageBlockLootFunction.Serializer())); - PORTABLE_GRID = LOOT_ITEM_FUNCTIONS.register("portable_grid", () -> new LootItemFunctionType(new PortableGridBlockLootFunction.Serializer())); - CRAFTER = LOOT_ITEM_FUNCTIONS.register("crafter", () -> new LootItemFunctionType(new CrafterLootFunction.Serializer())); - CONTROLLER = LOOT_ITEM_FUNCTIONS.register("controller", () -> new LootItemFunctionType(new ControllerLootFunction.Serializer())); - } + public static LootItemFunctionType STORAGE_BLOCK; + public static LootItemFunctionType PORTABLE_GRID; + public static LootItemFunctionType CRAFTER; + public static LootItemFunctionType CONTROLLER; private RSLootFunctions() { } public static void register() { - LOOT_ITEM_FUNCTIONS.register(FMLJavaModLoadingContext.get().getModEventBus()); + STORAGE_BLOCK = Registry.register(BuiltInRegistries.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "storage_block"), new LootItemFunctionType(new StorageBlockLootFunction.Serializer())); + PORTABLE_GRID = Registry.register(BuiltInRegistries.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "portable_grid"), new LootItemFunctionType(new PortableGridBlockLootFunction.Serializer())); + CRAFTER = Registry.register(BuiltInRegistries.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "crafter"), new LootItemFunctionType(new CrafterLootFunction.Serializer())); + CONTROLLER = Registry.register(BuiltInRegistries.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "controller"), new LootItemFunctionType(new ControllerLootFunction.Serializer())); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/RSRecipeSerializers.java b/src/main/java/com/refinedmods/refinedstorage/RSRecipeSerializers.java index 2a2beb021..3f8cdf4b6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RSRecipeSerializers.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSRecipeSerializers.java @@ -3,12 +3,12 @@ package com.refinedmods.refinedstorage; import com.refinedmods.refinedstorage.recipe.CoverRecipe; import com.refinedmods.refinedstorage.recipe.HollowCoverRecipe; import com.refinedmods.refinedstorage.recipe.UpgradeWithEnchantedBookRecipeSerializer; -import net.minecraft.core.Registry; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; public final class RSRecipeSerializers { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(Registry.RECIPE_SERIALIZER_REGISTRY, RS.ID); + public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, RS.ID); static { REGISTRY.register("upgrade_with_enchanted_book", UpgradeWithEnchantedBookRecipeSerializer::new); diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPattern.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPattern.java index d64e73aaa..0ac124e14 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPattern.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPattern.java @@ -2,6 +2,7 @@ package com.refinedmods.refinedstorage.api.autocrafting; import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; import net.minecraft.core.NonNullList; +import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; @@ -51,10 +52,11 @@ public interface ICraftingPattern { NonNullList getOutputs(); /** - * @param took the items took per slot + * @param took the items took per slot + * @param registryAccess the registry accessor * @return the output based on the items took */ - ItemStack getOutput(NonNullList took); + ItemStack getOutput(NonNullList took, RegistryAccess registryAccess); /** * @return the byproducts diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java index 9f183b560..bf619963c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.render.IElementDrawers; import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -17,13 +17,13 @@ import java.util.List; */ public interface ICraftingMonitorElement { /** - * @param poseStack the pose stack - * @param x position on the x axis to render - * @param y position on the y axis to render - * @param drawers the drawers that this element can use + * @param graphics the graphics + * @param x position on the x axis to render + * @param y position on the y axis to render + * @param drawers the drawers that this element can use */ @OnlyIn(Dist.CLIENT) - void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers); + void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers); /** * Returns the id for the base of this element, used for sorting in the {@link CraftingMonitorElementList} diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java index b51b182d5..d6de2f6c1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.api.autocrafting.preview; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; @@ -12,13 +12,13 @@ import net.minecraftforge.api.distmarker.OnlyIn; */ public interface ICraftingPreviewElement { /** - * @param poseStack the pose stack - * @param x position on the x axis to render - * @param y position on the y axis to render - * @param drawers the drawers this element can use + * @param graphics the graphics + * @param x position on the x axis to render + * @param y position on the y axis to render + * @param drawers the drawers this element can use */ @OnlyIn(Dist.CLIENT) - void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers); + void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers); /** * @return true when this crafting preview elements signifies an error that disables starting a task diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java index bd1c045e6..6b18dfbeb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java @@ -1,9 +1,9 @@ package com.refinedmods.refinedstorage.api.network.grid; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.render.IElementDrawer; import com.refinedmods.refinedstorage.api.util.IFilter; -import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -24,19 +24,19 @@ public interface IGridTab { /** * Draws the tooltip of this tab at the given position. * - * @param poseStack the pose stack - * @param x the x position - * @param y the y position - * @param screen the screen + * @param font the font + * @param graphics the graphics + * @param x the x position + * @param y the y position */ - void drawTooltip(PoseStack poseStack, int x, int y, Screen screen); + void drawTooltip(Font font, GuiGraphics graphics, int x, int y); /** * Draws the icon. * - * @param poseStack the pose stack - * @param x the x position - * @param y the y position + * @param graphics the graphics + * @param x the x position + * @param y the y position */ - void drawIcon(PoseStack poseStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer); + void drawIcon(GuiGraphics graphics, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer); } diff --git a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java index 1311545d2..a42d215d7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.api.render; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; /** * This {@link FunctionalInterface} is used to define a draw/render function. @@ -11,10 +11,10 @@ import com.mojang.blaze3d.vertex.PoseStack; @FunctionalInterface public interface IElementDrawer { /** - * @param poseStack the poses stack - * @param x the x axis - * @param y the y axis - * @param element the element type + * @param graphics the graphics + * @param x the x axis + * @param y the y axis + * @param element the element type */ - void draw(PoseStack poseStack, int x, int y, T element); + void draw(GuiGraphics graphics, int x, int y, T element); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index 8558fe018..271359091 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -6,11 +6,13 @@ import com.refinedmods.refinedstorage.api.util.IComparer; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory; import net.minecraft.core.NonNullList; +import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.inventory.TransientCraftingContainer; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraftforge.fluids.FluidStack; @@ -80,7 +82,7 @@ public class CraftingPattern implements ICraftingPattern { return outputs.getOutputs(); } - public ItemStack getOutput(NonNullList took) { + public ItemStack getOutput(NonNullList took, RegistryAccess registryAccess) { if (processing) { throw new IllegalStateException("Cannot get crafting output from processing pattern"); } @@ -95,7 +97,7 @@ public class CraftingPattern implements ICraftingPattern { craftingContainer.setItem(i, took.get(i)); } - ItemStack result = recipe.assemble(craftingContainer); + ItemStack result = recipe.assemble(craftingContainer, registryAccess); if (result.isEmpty()) { throw new IllegalStateException("Cannot have empty result"); } @@ -265,7 +267,7 @@ public class CraftingPattern implements ICraftingPattern { return result; } - public static class DummyCraftingContainer extends CraftingContainer { + public static class DummyCraftingContainer extends TransientCraftingContainer { public DummyCraftingContainer() { super(new AbstractContainerMenu(null, 0) { @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index 9b3876d73..f09ed03a1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -63,7 +63,7 @@ public class CraftingPatternFactory { byproducts = recipe.getRemainingItems(craftingContainer); - ItemStack output = recipe.assemble(craftingContainer); + ItemStack output = recipe.assemble(craftingContainer, level.registryAccess()); if (!output.isEmpty()) { outputs.add(output); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/InvalidCraftingPattern.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/InvalidCraftingPattern.java index ce1d11e6e..549e4e98b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/InvalidCraftingPattern.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/InvalidCraftingPattern.java @@ -3,6 +3,7 @@ package com.refinedmods.refinedstorage.apiimpl.autocrafting; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; import net.minecraft.core.NonNullList; +import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; @@ -59,7 +60,7 @@ public class InvalidCraftingPattern implements ICraftingPattern { } @Override - public ItemStack getOutput(NonNullList took) { + public ItemStack getOutput(NonNullList took, RegistryAccess registryAccess) { throw new UnsupportedOperationException(EXCEPTION_MESSAGE); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java index 17d5c9855..8554c8ea4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java @@ -1,11 +1,11 @@ package com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import com.refinedmods.refinedstorage.api.render.IElementDrawers; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.render.Styles; import com.refinedmods.refinedstorage.util.PacketBufferUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -36,11 +36,9 @@ public class ErrorCraftingMonitorElement implements ICraftingMonitorElement { } @Override - @SuppressWarnings("unchecked") - public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { - base.draw(poseStack, x, y, drawers); - - drawers.getErrorDrawer().draw(poseStack, x, y, null); + public void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers) { + base.draw(graphics, x, y, drawers); + drawers.getErrorDrawer().draw(graphics, x, y, null); } @Nullable diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java index 6911adf80..e828e461a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java @@ -7,6 +7,7 @@ import com.refinedmods.refinedstorage.api.render.IElementDrawers; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -54,52 +55,54 @@ public class FluidCraftingMonitorElement implements ICraftingMonitorElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { + public void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers) { if (missing > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_MISSING); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_MISSING); } else if (processing > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_PROCESSING); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_PROCESSING); } else if (scheduled > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_SCHEDULED); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_SCHEDULED); } else if (crafting > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_CRAFTING); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_CRAFTING); } - drawers.getFluidDrawer().draw(poseStack, x + 4, y + 6, stack); + drawers.getFluidDrawer().draw(graphics, x + 4, y + 6, stack); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; + PoseStack poseStack = graphics.pose(); + poseStack.pushPose(); poseStack.scale(scale, scale, 1); int yy = y + 7; if (stored > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", API.instance().getQuantityFormatter().formatInBucketForm(stored))); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", API.instance().getQuantityFormatter().formatInBucketForm(stored))); yy += 7; } if (missing > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", API.instance().getQuantityFormatter().formatInBucketForm(missing))); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", API.instance().getQuantityFormatter().formatInBucketForm(missing))); yy += 7; } if (processing > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", API.instance().getQuantityFormatter().formatInBucketForm(processing))); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", API.instance().getQuantityFormatter().formatInBucketForm(processing))); yy += 7; } if (scheduled > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", API.instance().getQuantityFormatter().formatInBucketForm(scheduled))); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", API.instance().getQuantityFormatter().formatInBucketForm(scheduled))); yy += 7; } if (crafting > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", API.instance().getQuantityFormatter().formatInBucketForm(crafting))); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", API.instance().getQuantityFormatter().formatInBucketForm(crafting))); } poseStack.popPose(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java index 305973f9e..0ef98d104 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java @@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.util.RenderUtils; import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -54,52 +55,54 @@ public class ItemCraftingMonitorElement implements ICraftingMonitorElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { + public void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers) { if (missing > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_MISSING); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_MISSING); } else if (processing > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_PROCESSING); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_PROCESSING); } else if (scheduled > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_SCHEDULED); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_SCHEDULED); } else if (crafting > 0) { - drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_CRAFTING); + drawers.getOverlayDrawer().draw(graphics, x, y, COLOR_CRAFTING); } - drawers.getItemDrawer().draw(poseStack, x + 4, y + 6, stack); + drawers.getItemDrawer().draw(graphics, x + 4, y + 6, stack); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; + PoseStack poseStack = graphics.pose(); + poseStack.pushPose(); poseStack.scale(scale, scale, 1); int yy = y + 7; if (stored > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", stored)); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", stored)); yy += 7; } if (missing > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", missing)); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", missing)); yy += 7; } if (processing > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", processing)); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", processing)); yy += 7; } if (scheduled > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", scheduled)); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", scheduled)); yy += 7; } if (crafting > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", crafting)); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", crafting)); } poseStack.popPose(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java index 896836c55..c60d36d88 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java @@ -1,10 +1,10 @@ package com.refinedmods.refinedstorage.apiimpl.autocrafting.preview; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; import com.refinedmods.refinedstorage.api.autocrafting.task.CalculationResultType; import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; @@ -33,7 +33,7 @@ public class ErrorCraftingPreviewElement implements ICraftingPreviewElement { } @Override - public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { + public void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers) { // NO OP } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java index ada261570..318dacdea 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java @@ -7,6 +7,7 @@ import com.refinedmods.refinedstorage.api.render.IElementDrawers; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -57,32 +58,34 @@ public class FluidCraftingPreviewElement implements ICraftingPreviewElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { + public void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers) { if (missing) { - drawers.getOverlayDrawer().draw(poseStack, x, y, 0xFFF2DEDE); + drawers.getOverlayDrawer().draw(graphics, x, y, 0xFFF2DEDE); } x += 5; y += 7; - drawers.getFluidDrawer().draw(poseStack, x, y, getStack()); + drawers.getFluidDrawer().draw(graphics, x, y, getStack()); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; y += 2; + PoseStack poseStack = graphics.pose(); + poseStack.pushPose(); poseStack.scale(scale, scale, 1); if (toCraft > 0) { String format = doesDisableTaskStarting() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, API.instance().getQuantityFormatter().formatInBucketForm(toCraft))); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, API.instance().getQuantityFormatter().formatInBucketForm(toCraft))); y += 7; } if (available > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", API.instance().getQuantityFormatter().formatInBucketForm(available))); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", API.instance().getQuantityFormatter().formatInBucketForm(available))); } poseStack.popPose(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java index f1e6f3ff8..543cef0b3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewE import com.refinedmods.refinedstorage.api.render.IElementDrawers; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -57,32 +58,34 @@ public class ItemCraftingPreviewElement implements ICraftingPreviewElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { + public void draw(GuiGraphics graphics, int x, int y, IElementDrawers drawers) { if (missing) { - drawers.getOverlayDrawer().draw(poseStack, x, y, 0xFFF2DEDE); + drawers.getOverlayDrawer().draw(graphics, x, y, 0xFFF2DEDE); } x += 5; y += 7; - drawers.getItemDrawer().draw(poseStack, x, y, stack); + drawers.getItemDrawer().draw(graphics, x, y, stack); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; y += 2; + PoseStack poseStack = graphics.pose(); + poseStack.pushPose(); poseStack.scale(scale, scale, 1); if (toCraft > 0) { String format = doesDisableTaskStarting() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, toCraft)); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, toCraft)); y += 7; } if (available > 0) { - drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", available)); + drawers.getStringDrawer().draw(graphics, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", available)); } poseStack.popPose(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java index 0e4c52a2e..80be35b41 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java @@ -116,7 +116,7 @@ public class CraftingCalculator { calculateForItems(qty, storageSource, fluidStorageSource, results, fluidResults, itemsToExtract, inputs, node); if (node instanceof CraftingNode) { - ItemStack output = pattern.getOutput(inputs.getRecipe()); + ItemStack output = pattern.getOutput(inputs.getRecipe(), network.getLevel().registryAccess()); results.add(output, output.getCount() * qty); for (ItemStack byproduct : pattern.getByproducts(inputs.getRecipe())) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java index 7687bb58e..35fffd406 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java @@ -50,7 +50,7 @@ public class CraftingNode extends Node { if (IoUtil.extractFromInternalItemStorage(requirements.getSingleItemRequirementSet(true), internalStorage, Action.SIMULATE) != null) { IoUtil.extractFromInternalItemStorage(requirements.getSingleItemRequirementSet(false), internalStorage, Action.PERFORM); - ItemStack output = getPattern().getOutput(recipe); + ItemStack output = getPattern().getOutput(recipe, network.getLevel().registryAccess()); if (!isRoot()) { internalStorage.insert(output, output.getCount(), Action.PERFORM); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java index bf7698162..65b7f62a5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java @@ -139,7 +139,7 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { // @Volatile: This is some logic copied from ResultSlot#checkTakeAchievements. We call this manually for shift clicking because // otherwise it's not being called. // For regular crafting, this is already called in ResultCraftingGridSlot#onTake -> checkTakeAchievements(stack) - crafted.onCraftedBy(player.level, player, amountCrafted); + crafted.onCraftedBy(player.level(), player, amountCrafted); ForgeEventFactory.firePlayerCraftingEvent(player, ItemHandlerHelper.copyStackWithSize(crafted, amountCrafted), grid.getCraftingMatrix()); ForgeHooks.setCraftingPlayer(null); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java index 751d90f57..42ddb20be 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java @@ -70,7 +70,7 @@ public class GridManager implements IGridManager { } IGrid grid = null; - BlockEntity blockEntity = factory.getRelevantBlockEntity(player.level, pos); + BlockEntity blockEntity = factory.getRelevantBlockEntity(player.level(), pos); if (factory.getType() == GridFactoryType.STACK) { grid = factory.createFromStack(player, stack, slot); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java index 578a20d17..f930d21ac 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java @@ -1,11 +1,11 @@ package com.refinedmods.refinedstorage.apiimpl.network.grid; import com.mojang.blaze3d.platform.Lighting; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.IGridTab; import com.refinedmods.refinedstorage.api.render.IElementDrawer; import com.refinedmods.refinedstorage.api.util.IFilter; -import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.ItemStack; @@ -37,20 +37,19 @@ public class GridTab implements IGridTab { } @Override - public void drawTooltip(PoseStack poseStack, int x, int y, Screen screen) { + public void drawTooltip(Font font, GuiGraphics graphics, int x, int y) { if (name != null) { - screen.renderTooltip(poseStack, name, x, y); + graphics.renderTooltip(font, name, x, y); } } @Override - public void drawIcon(PoseStack poseStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { + public void drawIcon(GuiGraphics graphics, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { if (!icon.isEmpty()) { Lighting.setupFor3DItems(); - - itemDrawer.draw(poseStack, x, y, icon); + itemDrawer.draw(graphics, x, y, icon); } else { - fluidDrawer.draw(poseStack, x, y, fluidIcon); + fluidDrawer.draw(graphics, x, y, fluidIcon); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java index 8b26d016d..e36eeb81b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java @@ -27,7 +27,7 @@ public class PortableGridBlockGridFactory implements IGridFactory { @Override @Nullable public IGrid createFromBlock(Player player, BlockPos pos) { - BlockEntity blockEntity = getRelevantBlockEntity(player.level, pos); + BlockEntity blockEntity = getRelevantBlockEntity(player.level(), pos); if (blockEntity instanceof PortableGridBlockEntity) { return (PortableGridBlockEntity) blockEntity; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java index b079e85e7..a1c23f9d8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java @@ -18,7 +18,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidType; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 9a7fbacc6..62ea78d48 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -20,7 +20,6 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java index 9050346b1..6d829eba2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java @@ -11,7 +11,6 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java index 619bd08b6..c5952dfa4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java @@ -16,7 +16,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.network.NetworkHooks; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java index 4589b5674..7ea7d56be 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java @@ -15,7 +15,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; public class WirelessFluidGridNetworkItem implements INetworkItem { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java index 03442d970..b4401401a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -35,10 +35,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.CraftingContainer; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.inventory.ResultContainer; +import net.minecraft.world.inventory.*; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.item.crafting.RecipeType; @@ -114,7 +111,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I }); private final Set craftingListeners = new HashSet<>(); private final List filters = new ArrayList<>(); - private final CraftingContainer matrix = new CraftingContainer(craftingContainer, 3, 3); + private final CraftingContainer matrix = new TransientCraftingContainer(craftingContainer, 3, 3); private final List tabs = new ArrayList<>(); private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new NetworkNodeInventoryListener(this)); private final GridType type; @@ -354,7 +351,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I if (currentRecipe == null) { result.setItem(0, ItemStack.EMPTY); } else { - result.setItem(0, currentRecipe.assemble(matrix)); + result.setItem(0, currentRecipe.assemble(matrix, level.registryAccess())); } craftingListeners.forEach(ICraftingGridListener::onCraftingMatrixChanged); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java index 28085d492..1b21d63c8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java @@ -4,11 +4,11 @@ import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor; import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.blockentity.NetworkReceiverBlockEntity; import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator; import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.item.NetworkCardItem; -import com.refinedmods.refinedstorage.blockentity.NetworkReceiverBlockEntity; import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java index e1683b1fd..cca92b664 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java @@ -5,24 +5,25 @@ import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.render.IElementDrawer; import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.resources.ResourceLocation; public class CraftingMonitorElementDrawers extends ElementDrawers { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/crafting_preview.png"); + private final IElementDrawer overlayDrawer; private final IElementDrawer errorDrawer; public CraftingMonitorElementDrawers(BaseScreen screen, int itemWidth, int itemHeight) { super(screen); - this.overlayDrawer = (poseStack, x, y, color) -> { + this.overlayDrawer = (graphics, x, y, color) -> { RenderSystem.setShaderColor(1, 1, 1, 1); - GuiComponent.fill(poseStack, x, y, x + itemWidth, y + itemHeight, color); + graphics.fill(x, y, x + itemWidth, y + itemHeight, color); }; - this.errorDrawer = (poseStack, x, y, nothing) -> { + this.errorDrawer = (graphics, x, y, nothing) -> { RenderSystem.setShaderColor(1, 1, 1, 1); - screen.bindTexture(RS.ID, "gui/crafting_preview.png"); - screen.blit(poseStack, x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12); + graphics.blit(TEXTURE, x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12); }; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java index 2c4fbbe64..117df7d37 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java @@ -3,13 +3,12 @@ package com.refinedmods.refinedstorage.apiimpl.render; import com.mojang.blaze3d.systems.RenderSystem; import com.refinedmods.refinedstorage.api.render.IElementDrawer; import com.refinedmods.refinedstorage.screen.grid.CraftingPreviewScreen; -import net.minecraft.client.gui.GuiComponent; import net.minecraft.world.inventory.AbstractContainerMenu; public class CraftingPreviewElementDrawers extends ElementDrawers { - private final IElementDrawer overlayDrawer = (poseStack, x, y, color) -> { + private final IElementDrawer overlayDrawer = (graphics, x, y, color) -> { RenderSystem.setShaderColor(1, 1, 1, 1); - GuiComponent.fill(poseStack, x, y, x + 73, y + 29, color); + graphics.fill(x, y, x + 73, y + 29, color); }; public CraftingPreviewElementDrawers(CraftingPreviewScreen screen) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java index 38ee66657..20ebeb4f4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java @@ -13,11 +13,11 @@ public class Comparer implements IComparer { return true; } - if (!ItemStack.isSame(left, right)) { + if (!ItemStack.isSameItem(left, right)) { return false; } - if ((flags & COMPARE_NBT) == COMPARE_NBT && !ItemStack.tagMatches(left, right)) { + if ((flags & COMPARE_NBT) == COMPARE_NBT && !ItemStack.isSameItemSameTags(left, right)) { return false; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSSavedData.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSSavedData.java index 7924228da..cdc6a21c5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSSavedData.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSSavedData.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.apiimpl.util; -import net.minecraft.SharedConstants; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; +import net.minecraft.nbt.NbtUtils; import net.minecraft.world.level.saveddata.SavedData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,7 +27,7 @@ public abstract class RSSavedData extends SavedData { CompoundTag tag = new CompoundTag(); tag.put("data", this.save(new CompoundTag())); - tag.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion()); + NbtUtils.addCurrentDataVersion(tag); try { NbtIo.writeCompressed(tag, tempFile); diff --git a/src/main/java/com/refinedmods/refinedstorage/blockentity/BaseBlockEntity.java b/src/main/java/com/refinedmods/refinedstorage/blockentity/BaseBlockEntity.java index 404fa5ca8..76569a201 100644 --- a/src/main/java/com/refinedmods/refinedstorage/blockentity/BaseBlockEntity.java +++ b/src/main/java/com/refinedmods/refinedstorage/blockentity/BaseBlockEntity.java @@ -54,7 +54,6 @@ public abstract class BaseBlockEntity extends BlockEntity { @Override public void setRemoved() { super.setRemoved(); - // TODO: remove when https://github.com/MinecraftForge/MinecraftForge/pull/8303/files is merged // @Volatile: MC calls setRemoved when a chunk unloads now as well (see ServerLevel#unload -> LevelChunk#clearAllBlockEntities). // Since we don't want to remove network node data in that case, we need to know if it was removed due to unloading. // We can use "unloaded" for that, it's set in #onChunkUnloaded. diff --git a/src/main/java/com/refinedmods/refinedstorage/blockentity/InterfaceBlockEntity.java b/src/main/java/com/refinedmods/refinedstorage/blockentity/InterfaceBlockEntity.java index 8eb1d0f24..c98ad2fdc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/blockentity/InterfaceBlockEntity.java +++ b/src/main/java/com/refinedmods/refinedstorage/blockentity/InterfaceBlockEntity.java @@ -12,7 +12,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; diff --git a/src/main/java/com/refinedmods/refinedstorage/blockentity/NetworkTransmitterBlockEntity.java b/src/main/java/com/refinedmods/refinedstorage/blockentity/NetworkTransmitterBlockEntity.java index df635bab0..97b3e1d86 100644 --- a/src/main/java/com/refinedmods/refinedstorage/blockentity/NetworkTransmitterBlockEntity.java +++ b/src/main/java/com/refinedmods/refinedstorage/blockentity/NetworkTransmitterBlockEntity.java @@ -14,7 +14,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; diff --git a/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/GridBlockEntity.java b/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/GridBlockEntity.java index 78c5a01b2..8e54c3d73 100644 --- a/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/GridBlockEntity.java +++ b/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/GridBlockEntity.java @@ -21,7 +21,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; diff --git a/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/portable/PortableGrid.java b/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/portable/PortableGrid.java index 88be0c268..ef6f32f8f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/portable/PortableGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/blockentity/grid/portable/PortableGrid.java @@ -136,14 +136,14 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer private final BaseItemHandler disk = new BaseItemHandler(1) .addValidator(new StorageDiskItemValidator()) .addListener(((handler, slot, reading) -> { - if (player != null && !player.level.isClientSide) { + if (player != null && !player.level().isClientSide) { ItemStack diskStack = handler.getStackInSlot(slot); if (diskStack.isEmpty()) { storage = null; cache = null; } else { - IStorageDisk diskInSlot = API.instance().getStorageDiskManager((ServerLevel) player.level).getByStack(getDiskInventory().getStackInSlot(0)); + IStorageDisk diskInSlot = API.instance().getStorageDiskManager((ServerLevel) player.level()).getByStack(getDiskInventory().getStackInSlot(0)); if (diskInSlot != null) { StorageType type = ((IStorageDiskProvider) getDiskInventory().getStackInSlot(0).getItem()).getType(); @@ -378,7 +378,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer this.itemStorageTrackerId = UUID.randomUUID(); } - this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) player.level).getOrCreate(itemStorageTrackerId, StorageType.ITEM); + this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) player.level()).getOrCreate(itemStorageTrackerId, StorageType.ITEM); } } @@ -393,7 +393,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer this.fluidStorageTrackerId = UUID.randomUUID(); } - this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) player.level).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); + this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) player.level()).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java index f8975df2f..cd84305e0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java @@ -56,17 +56,17 @@ public class CreateDiskCommand implements Command { itemEntity.makeFakeItem(); } - player.level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2F, ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F); + player.level().playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2F, ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F); player.containerMenu.broadcastChanges(); } else { ItemEntity itemEntity = player.drop(stack, false); if (itemEntity != null) { itemEntity.setNoPickUpDelay(); - itemEntity.setOwner(player.getUUID()); + itemEntity.setThrower(player.getUUID()); } } - context.getSource().sendSuccess(Component.translatable( + context.getSource().sendSuccess(() -> Component.translatable( "commands.refinedstorage.disk.create.success", Component.literal(id.toString()).setStyle(Styles.YELLOW), context.getSource().getDisplayName().copy().setStyle(Styles.YELLOW) diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java index 7f0028939..c96f99a46 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java @@ -21,7 +21,7 @@ public class ListDiskCommand implements Command { API.instance().getStorageDiskManager(context.getSource().getLevel()) .getAll() .keySet() - .forEach(id -> context.getSource().sendSuccess(Component.literal(id.toString()), false)); + .forEach(id -> context.getSource().sendSuccess(() -> Component.literal(id.toString()), false)); return 0; } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java index 9d942ba69..305759524 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java @@ -28,7 +28,7 @@ public class ListDiskForPlayerCommand implements Command { .stream() .filter(entry -> player.getGameProfile().getId().equals(entry.getValue().getOwner())) .map(Map.Entry::getKey) - .forEach(id -> context.getSource().sendSuccess(Component.literal(id.toString()), false)); + .forEach(id -> context.getSource().sendSuccess(() -> Component.literal(id.toString()), false)); return 0; } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java index ba3928c98..faa2ce0bd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java @@ -28,7 +28,7 @@ public class ListNetworkCommand implements Command { } public static void sendInfo(CommandContext context, NetworkInList listItem, boolean detailed) { - context.getSource().sendSuccess( + context.getSource().sendSuccess(() -> Component.translatable( "commands.refinedstorage.network.list.pos", listItem.network.getPosition().getX(), @@ -44,15 +44,15 @@ public class ListNetworkCommand implements Command { .append("]"), false); if (detailed) { - context.getSource().sendSuccess(Component.translatable("commands.refinedstorage.network.list.autocrafting_tasks", + context.getSource().sendSuccess(() -> Component.translatable("commands.refinedstorage.network.list.autocrafting_tasks", Component.literal(listItem.network.getCraftingManager().getTasks().size() + "").setStyle(Styles.YELLOW) ), false); - context.getSource().sendSuccess(Component.translatable("commands.refinedstorage.network.list.nodes", + context.getSource().sendSuccess(() -> Component.translatable("commands.refinedstorage.network.list.nodes", Component.literal(listItem.network.getNodeGraph().all().size() + "").setStyle(Styles.YELLOW) ), false); - context.getSource().sendSuccess(Component.translatable("commands.refinedstorage.network.list.energy_usage", + context.getSource().sendSuccess(() -> Component.translatable("commands.refinedstorage.network.list.energy_usage", Component.literal(listItem.network.getEnergyUsage() + "").setStyle(Styles.YELLOW) ), false); } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java index 540720d3b..3d33ff589 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java @@ -18,12 +18,10 @@ public class CancelAllAutocraftingCommand extends NetworkCommand { } public static void sendCancelMessage(CommandContext context, int count) { - String translationKey = "commands.refinedstorage.network.autocrafting.cancel.multiple"; - if (count == 1) { - translationKey = "commands.refinedstorage.network.autocrafting.cancel.single"; - } - - context.getSource().sendSuccess(Component.translatable(translationKey, Component.literal("" + count).setStyle(Styles.YELLOW)), false); + final String translationKey = count == 1 + ? "commands.refinedstorage.network.autocrafting.cancel.single" + : "commands.refinedstorage.network.autocrafting.cancel.multiple"; + context.getSource().sendSuccess(() -> Component.translatable(translationKey, Component.literal(String.valueOf(count)).setStyle(Styles.YELLOW)), false); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java index 237933f78..9f45cfe43 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java @@ -17,8 +17,8 @@ public class ListAutocraftingCommand extends NetworkCommand { } public static void addInfo(CommandContext context, ICraftingTask task) { - context.getSource().sendSuccess( - Component.literal(getAmount(task.getRequested()) + "x ") + context.getSource().sendSuccess(() -> + Component.literal(getAmount(task.getRequested()) + "x ") .append(getName(task.getRequested()).copy().setStyle(Styles.YELLOW)) .append(" ") .append("(" + task.getCompletionPercentage() + "%)") diff --git a/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java index f1c33ebf1..ead49c1ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java @@ -32,71 +32,77 @@ public class PatternDumpCommand implements Command { ICraftingPattern pattern = PatternItem.fromCache(context.getSource().getLevel(), stack); - context.getSource().sendSuccess(Component.literal("Crafting task factory ID: ").setStyle(Styles.YELLOW).append(Component.literal(pattern.getCraftingTaskFactoryId().toString()).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(() -> Component.literal("Crafting task factory ID: ").setStyle(Styles.YELLOW).append(Component.literal(pattern.getCraftingTaskFactoryId().toString()).setStyle(Styles.WHITE)), false); if (!pattern.isValid()) { context.getSource().sendFailure(Component.literal("Pattern is invalid! Reason: ").append(pattern.getErrorMessage())); } else { - context.getSource().sendSuccess(Component.literal("Processing: ").setStyle(Styles.YELLOW).append(Component.literal(String.valueOf(processing)).setStyle(Styles.WHITE)), false); - context.getSource().sendSuccess(Component.literal("Exact: ").setStyle(Styles.YELLOW).append(Component.literal(String.valueOf(exact)).setStyle(Styles.WHITE)), false); - context.getSource().sendSuccess(Component.literal("Has allowed tag list: ").setStyle(Styles.YELLOW).append(Component.literal(String.valueOf(allowedTagList != null)).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(() -> Component.literal("Processing: ").setStyle(Styles.YELLOW).append(Component.literal(String.valueOf(processing)).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(() -> Component.literal("Exact: ").setStyle(Styles.YELLOW).append(Component.literal(String.valueOf(exact)).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(() -> Component.literal("Has allowed tag list: ").setStyle(Styles.YELLOW).append(Component.literal(String.valueOf(allowedTagList != null)).setStyle(Styles.WHITE)), false); if (pattern.isProcessing()) { for (int i = 0; i < pattern.getInputs().size(); ++i) { + final int ii = i; if (!pattern.getInputs().get(i).isEmpty()) { - context.getSource().sendSuccess(Component.literal("Item inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(() -> Component.literal("Item inputs in slot " + ii + ":").setStyle(Styles.YELLOW), false); for (int j = 0; j < pattern.getInputs().get(i).size(); ++j) { - context.getSource().sendSuccess(Component.literal("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").append(pattern.getInputs().get(i).get(j).getHoverName()), false); + final int jj = j; + context.getSource().sendSuccess(() -> Component.literal("- Possibility #" + jj + ": " + pattern.getInputs().get(ii).get(jj).getCount() + "x ").append(pattern.getInputs().get(ii).get(jj).getHoverName()), false); } } if (allowedTagList != null) { for (ResourceLocation allowed : allowedTagList.getAllowedItemTags().get(i)) { - context.getSource().sendSuccess(Component.literal("- Allowed item tag: " + allowed.toString()), false); + context.getSource().sendSuccess(() -> Component.literal("- Allowed item tag: " + allowed.toString()), false); } } } for (int i = 0; i < pattern.getFluidInputs().size(); ++i) { + final int ii = i; if (!pattern.getFluidInputs().get(i).isEmpty()) { - context.getSource().sendSuccess(Component.literal("Fluid inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(() -> Component.literal("Fluid inputs in slot " + ii + ":").setStyle(Styles.YELLOW), false); for (int j = 0; j < pattern.getFluidInputs().get(i).size(); ++j) { - context.getSource().sendSuccess(Component.literal("- Possibility #" + j + ": " + pattern.getFluidInputs().get(i).get(j).getAmount() + " mB ").append(pattern.getFluidInputs().get(i).get(j).getDisplayName()), false); + final int jj = j; + context.getSource().sendSuccess(() -> Component.literal("- Possibility #" + jj + ": " + pattern.getFluidInputs().get(ii).get(jj).getAmount() + " mB ").append(pattern.getFluidInputs().get(ii).get(jj).getDisplayName()), false); } } if (allowedTagList != null) { for (ResourceLocation allowed : allowedTagList.getAllowedFluidTags().get(i)) { - context.getSource().sendSuccess(Component.literal("- Allowed fluid tag: " + allowed.toString()), false); + context.getSource().sendSuccess(() -> Component.literal("- Allowed fluid tag: " + allowed.toString()), false); } } } - context.getSource().sendSuccess(Component.literal("Outputs").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(() -> Component.literal("Outputs").setStyle(Styles.YELLOW), false); for (ItemStack output : pattern.getOutputs()) { - context.getSource().sendSuccess(Component.literal("- " + output.getCount() + "x ").append(output.getHoverName()), false); + context.getSource().sendSuccess(() -> Component.literal("- " + output.getCount() + "x ").append(output.getHoverName()), false); } - context.getSource().sendSuccess(Component.literal("Fluid outputs").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(() -> Component.literal("Fluid outputs").setStyle(Styles.YELLOW), false); for (FluidStack output : pattern.getFluidOutputs()) { - context.getSource().sendSuccess(Component.literal("- " + output.getAmount() + " mB ").append(output.getDisplayName()), false); + context.getSource().sendSuccess(() -> Component.literal("- " + output.getAmount() + " mB ").append(output.getDisplayName()), false); } } else { for (int i = 0; i < pattern.getInputs().size(); ++i) { + final int ii = i; if (!pattern.getInputs().get(i).isEmpty()) { - context.getSource().sendSuccess(Component.literal("Inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(() -> Component.literal("Inputs in slot " + ii + ":").setStyle(Styles.YELLOW), false); for (int j = 0; j < pattern.getInputs().get(i).size(); ++j) { - context.getSource().sendSuccess(Component.literal("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").append(pattern.getInputs().get(i).get(j).getHoverName()), false); + final int jj = j; + context.getSource().sendSuccess(() -> Component.literal("- Possibility #" + jj + ": " + pattern.getInputs().get(ii).get(jj).getCount() + "x ").append(pattern.getInputs().get(ii).get(jj).getHoverName()), false); } } } - context.getSource().sendSuccess(Component.literal("Outputs").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(() -> Component.literal("Outputs").setStyle(Styles.YELLOW), false); for (ItemStack output : pattern.getOutputs()) { - context.getSource().sendSuccess(Component.literal("- " + output.getCount() + "x ").append(output.getHoverName()), false); + context.getSource().sendSuccess(() -> Component.literal("- " + output.getCount() + "x ").append(output.getHoverName()), false); } boolean anyByproducts = false; @@ -104,12 +110,12 @@ public class PatternDumpCommand implements Command { for (ItemStack byproduct : pattern.getByproducts()) { if (!byproduct.isEmpty()) { if (!anyByproducts) { - context.getSource().sendSuccess(Component.literal("Byproducts").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(() -> Component.literal("Byproducts").setStyle(Styles.YELLOW), false); anyByproducts = true; } - context.getSource().sendSuccess(Component.literal("- " + byproduct.getCount() + "x ").append(byproduct.getHoverName()), false); + context.getSource().sendSuccess(() -> Component.literal("- " + byproduct.getCount() + "x ").append(byproduct.getHoverName()), false); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java index 8d2e0ec6d..6187db945 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java @@ -28,7 +28,7 @@ public class CraftingMonitorContainerMenu extends BaseContainerMenu implements I public void broadcastChanges() { super.broadcastChanges(); - if (!getPlayer().level.isClientSide) { + if (!getPlayer().level().isClientSide) { ICraftingManager manager = craftingMonitor.getCraftingManager(); if (manager != null && !addedListener) { diff --git a/src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java b/src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java index e414a285d..db8cecd11 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java @@ -289,7 +289,7 @@ public class GridContainerMenu extends BaseContainerMenu implements ICraftingGri @Override public void broadcastChanges() { - if (!getPlayer().level.isClientSide) { + if (!getPlayer().level().isClientSide) { // The grid is offline. if (grid.getStorageCache() == null) { // The grid just went offline, there is still a listener. diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/BlockEntityContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/BlockEntityContainerFactory.java index 961826d70..631549484 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/BlockEntityContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/BlockEntityContainerFactory.java @@ -18,7 +18,7 @@ public class BlockEntityContainerFactory implements MenuProvi @Nullable @Override public AbstractContainerMenu createMenu(int windowId, Inventory inventory, Player player) { - T blockEntity = (T) player.level.getBlockEntity(pos); + T blockEntity = (T) player.level().getBlockEntity(pos); return provider.create(blockEntity, windowId, inventory, player); } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java index da97b93b6..d13c67eca 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java @@ -24,7 +24,7 @@ public class CrafterManagerContainerFactory implements IContainerFactory> { - public BlockEntityTagGenerator(DataGenerator dataGenerator, String modId, @Nullable ExistingFileHelper existingFileHelper) { - super(dataGenerator, Registry.BLOCK_ENTITY_TYPE, modId, existingFileHelper); + public BlockEntityTagGenerator(PackOutput output, String modId, CompletableFuture provider, ExistingFileHelper existingFileHelper) { + super(output, Registries.BLOCK_ENTITY_TYPE, provider, modId, existingFileHelper); } @Override - protected void addTags() { - TagAppender> packingTapeBlacklist = tag(TagKey.create(Registry.BLOCK_ENTITY_TYPE_REGISTRY, new ResourceLocation("packingtape:blacklist/problematic"))); - packingTapeBlacklist.add( - RSBlockEntities.CONTROLLER.get(), - RSBlockEntities.CREATIVE_CONTROLLER.get(), - RSBlockEntities.DETECTOR.get(), - RSBlockEntities.DISK_DRIVE.get(), - RSBlockEntities.EXPORTER.get(), - RSBlockEntities.EXTERNAL_STORAGE.get(), - RSBlockEntities.GRID.get(), - RSBlockEntities.CRAFTING_GRID.get(), - RSBlockEntities.PATTERN_GRID.get(), - RSBlockEntities.FLUID_GRID.get(), - RSBlockEntities.IMPORTER.get(), - RSBlockEntities.NETWORK_TRANSMITTER.get(), - RSBlockEntities.NETWORK_RECEIVER.get(), - RSBlockEntities.RELAY.get(), - RSBlockEntities.CABLE.get(), - RSBlockEntities.ONE_K_STORAGE_BLOCK.get(), - RSBlockEntities.FOUR_K_STORAGE_BLOCK.get(), - RSBlockEntities.SIXTEEN_K_STORAGE_BLOCK.get(), - RSBlockEntities.SIXTY_FOUR_K_STORAGE_BLOCK.get(), - RSBlockEntities.CREATIVE_STORAGE_BLOCK.get(), - RSBlockEntities.SIXTY_FOUR_K_FLUID_STORAGE_BLOCK.get(), - RSBlockEntities.TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK.get(), - RSBlockEntities.THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK.get(), - RSBlockEntities.FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK.get(), - RSBlockEntities.CREATIVE_FLUID_STORAGE_BLOCK.get(), - RSBlockEntities.SECURITY_MANAGER.get(), - RSBlockEntities.INTERFACE.get(), - RSBlockEntities.FLUID_INTERFACE.get(), - RSBlockEntities.WIRELESS_TRANSMITTER.get(), - RSBlockEntities.STORAGE_MONITOR.get(), - RSBlockEntities.CONSTRUCTOR.get(), - RSBlockEntities.DESTRUCTOR.get(), - RSBlockEntities.DISK_MANIPULATOR.get(), - RSBlockEntities.PORTABLE_GRID.get(), - RSBlockEntities.CREATIVE_PORTABLE_GRID.get(), - RSBlockEntities.CRAFTER.get(), - RSBlockEntities.CRAFTER_MANAGER.get(), - RSBlockEntities.CRAFTING_MONITOR.get() + protected void addTags(HolderLookup.Provider provider) { + TagAppender> packingTapeBlacklist = tag( + TagKey.create(Registries.BLOCK_ENTITY_TYPE, new ResourceLocation("packingtape:blacklist/problematic")) ); + packingTapeBlacklist.add( + resourceKey(RSBlockEntities.CONTROLLER.get()), + resourceKey(RSBlockEntities.CREATIVE_CONTROLLER.get()), + resourceKey(RSBlockEntities.DETECTOR.get()), + resourceKey(RSBlockEntities.DISK_DRIVE.get()), + resourceKey(RSBlockEntities.EXPORTER.get()), + resourceKey(RSBlockEntities.EXTERNAL_STORAGE.get()), + resourceKey(RSBlockEntities.GRID.get()), + resourceKey(RSBlockEntities.CRAFTING_GRID.get()), + resourceKey(RSBlockEntities.PATTERN_GRID.get()), + resourceKey(RSBlockEntities.FLUID_GRID.get()), + resourceKey(RSBlockEntities.IMPORTER.get()), + resourceKey(RSBlockEntities.NETWORK_TRANSMITTER.get()), + resourceKey(RSBlockEntities.NETWORK_RECEIVER.get()), + resourceKey(RSBlockEntities.RELAY.get()), + resourceKey(RSBlockEntities.CABLE.get()), + resourceKey(RSBlockEntities.ONE_K_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.FOUR_K_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.SIXTEEN_K_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.SIXTY_FOUR_K_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.CREATIVE_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.SIXTY_FOUR_K_FLUID_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.CREATIVE_FLUID_STORAGE_BLOCK.get()), + resourceKey(RSBlockEntities.SECURITY_MANAGER.get()), + resourceKey(RSBlockEntities.INTERFACE.get()), + resourceKey(RSBlockEntities.FLUID_INTERFACE.get()), + resourceKey(RSBlockEntities.WIRELESS_TRANSMITTER.get()), + resourceKey(RSBlockEntities.STORAGE_MONITOR.get()), + resourceKey(RSBlockEntities.CONSTRUCTOR.get()), + resourceKey(RSBlockEntities.DESTRUCTOR.get()), + resourceKey(RSBlockEntities.DISK_MANIPULATOR.get()), + resourceKey(RSBlockEntities.PORTABLE_GRID.get()), + resourceKey(RSBlockEntities.CREATIVE_PORTABLE_GRID.get()), + resourceKey(RSBlockEntities.CRAFTER.get()), + resourceKey(RSBlockEntities.CRAFTER_MANAGER.get()), + resourceKey(RSBlockEntities.CRAFTING_MONITOR.get()) + ); + } + + private ResourceKey> resourceKey(BlockEntityType type) { + return ForgeRegistries.BLOCK_ENTITY_TYPES.getResourceKey(type).get(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java index e533e6b8d..2c30ca820 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java @@ -7,6 +7,7 @@ import com.refinedmods.refinedstorage.block.DetectorBlock; import com.refinedmods.refinedstorage.block.NetworkNodeBlock; import com.refinedmods.refinedstorage.util.ColorMap; import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.BlockStateProvider; @@ -18,8 +19,8 @@ public class BlockModelGenerator extends BlockStateProvider { private final BlockModels models; - public BlockModelGenerator(DataGenerator generator, String id, ExistingFileHelper existingFileHelper) { - super(generator, id, existingFileHelper); + public BlockModelGenerator(PackOutput output, String id, ExistingFileHelper existingFileHelper) { + super(output, id, existingFileHelper); models = new BlockModels(this); } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java index 567872714..66c4432e7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java @@ -1,42 +1,51 @@ package com.refinedmods.refinedstorage.datageneration; import com.refinedmods.refinedstorage.RSBlocks; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.BlockTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable; +import java.util.concurrent.CompletableFuture; public class BlockTagGenerator extends BlockTagsProvider { - public BlockTagGenerator(DataGenerator dataGenerator, String modId, @Nullable ExistingFileHelper existingFileHelper) { - super(dataGenerator, modId, existingFileHelper); + public BlockTagGenerator(PackOutput output, CompletableFuture lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, modId, existingFileHelper); } @Override - protected void addTags() { + protected void addTags(HolderLookup.Provider provider) { TagAppender noRelocationTag = tag(BlockTags.create(new ResourceLocation("forge:relocation_not_supported"))); + RSBlocks.COLORED_BLOCK_TAGS.forEach((tag, map) -> { map.values().forEach(block -> tag(tag).add(block.get())); noRelocationTag.addTags(tag); }); - RSBlocks.STORAGE_BLOCKS.forEach((tag, block) -> noRelocationTag.add(block.get())); - RSBlocks.FLUID_STORAGE_BLOCKS.forEach((tag, block) -> noRelocationTag.add(block.get())); + RSBlocks.STORAGE_BLOCKS.forEach((tag, block) -> noRelocationTag.add(resourceKey(block.get()))); + RSBlocks.FLUID_STORAGE_BLOCKS.forEach((tag, block) -> noRelocationTag.add(resourceKey(block.get()))); noRelocationTag.add( - RSBlocks.IMPORTER.get(), - RSBlocks.EXPORTER.get(), - RSBlocks.EXTERNAL_STORAGE.get(), - RSBlocks.DISK_DRIVE.get(), - RSBlocks.INTERFACE.get(), - RSBlocks.FLUID_INTERFACE.get(), - RSBlocks.STORAGE_MONITOR.get(), - RSBlocks.CONSTRUCTOR.get(), - RSBlocks.DESTRUCTOR.get(), - RSBlocks.PORTABLE_GRID.get(), - RSBlocks.CREATIVE_PORTABLE_GRID.get() + resourceKey(RSBlocks.IMPORTER.get()), + resourceKey(RSBlocks.EXPORTER.get()), + resourceKey(RSBlocks.EXTERNAL_STORAGE.get()), + resourceKey(RSBlocks.DISK_DRIVE.get()), + resourceKey(RSBlocks.INTERFACE.get()), + resourceKey(RSBlocks.FLUID_INTERFACE.get()), + resourceKey(RSBlocks.STORAGE_MONITOR.get()), + resourceKey(RSBlocks.CONSTRUCTOR.get()), + resourceKey(RSBlocks.DESTRUCTOR.get()), + resourceKey(RSBlocks.PORTABLE_GRID.get()), + resourceKey(RSBlocks.CREATIVE_PORTABLE_GRID.get()) ); } + + private ResourceKey resourceKey(Block block) { + return ForgeRegistries.BLOCKS.getResourceKey(block).get(); + } } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/DataGenerators.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/DataGenerators.java index eaab861a1..e1dcb9278 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/DataGenerators.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/DataGenerators.java @@ -1,30 +1,47 @@ package com.refinedmods.refinedstorage.datageneration; import com.refinedmods.refinedstorage.RS; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.minecraftforge.common.data.BlockTagsProvider; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import java.util.List; +import java.util.Set; + public class DataGenerators { @SubscribeEvent public void runDataGeneration(GatherDataEvent event) { - event.getGenerator().addProvider(event.includeClient(), new BlockModelGenerator(event.getGenerator(), RS.ID, event.getExistingFileHelper())); - event.getGenerator().addProvider(event.includeServer(), new RecipeGenerator(event.getGenerator())); + event.getGenerator().addProvider(event.includeClient(), new BlockModelGenerator(event.getGenerator().getPackOutput(), RS.ID, event.getExistingFileHelper())); + event.getGenerator().addProvider(event.includeServer(), new RecipeGenerator(event.getGenerator().getPackOutput())); BlockTagGenerator blockTagGenerator = new BlockTagGenerator( - event.getGenerator(), + event.getGenerator().getPackOutput(), + event.getLookupProvider(), RS.ID, - event.getExistingFileHelper()); - event.getGenerator().addProvider(event.includeServer(), blockTagGenerator); - event.getGenerator().addProvider(event.includeServer(), new ItemTagGenerator( - event.getGenerator(), - blockTagGenerator, - RS.ID, - event.getExistingFileHelper()) + event.getExistingFileHelper() ); - event.getGenerator().addProvider(event.includeServer(), new BlockEntityTagGenerator( - event.getGenerator(), + final BlockTagsProvider blockTagsProvider = event.getGenerator().addProvider(event.includeServer(), blockTagGenerator); + event.getGenerator().addProvider(event.includeServer(), new ItemTagGenerator( + event.getGenerator().getPackOutput(), + event.getLookupProvider(), + blockTagsProvider.contentsGetter(), RS.ID, event.getExistingFileHelper() )); - event.getGenerator().addProvider(event.includeServer(), new LootTableGenerator(event.getGenerator())); + event.getGenerator().addProvider(event.includeServer(), new BlockEntityTagGenerator( + event.getGenerator().getPackOutput(), + RS.ID, + event.getLookupProvider(), + event.getExistingFileHelper() + )); + event.getGenerator().addProvider(event.includeServer(), new LootTableProvider( + event.getGenerator().getPackOutput(), + Set.of(), + List.of(new LootTableProvider.SubProviderEntry( + LootTableGenerator::new, + LootContextParamSets.BLOCK + )) + )); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/ItemTagGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/ItemTagGenerator.java index 3eaae3bc1..7e42499c9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/ItemTagGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/ItemTagGenerator.java @@ -1,20 +1,22 @@ package com.refinedmods.refinedstorage.datageneration; import com.refinedmods.refinedstorage.RSItems; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.world.level.block.Block; import net.minecraftforge.common.data.ExistingFileHelper; -import javax.annotation.Nullable; +import java.util.concurrent.CompletableFuture; public class ItemTagGenerator extends ItemTagsProvider { - public ItemTagGenerator(DataGenerator dataGenerator, BlockTagsProvider blockTagProvider, String modId, @Nullable ExistingFileHelper existingFileHelper) { - super(dataGenerator, blockTagProvider, modId, existingFileHelper); + public ItemTagGenerator(PackOutput output, CompletableFuture lookup, CompletableFuture> p_275322_, String modId, ExistingFileHelper existingFileHelper) { + super(output, lookup, p_275322_, modId, existingFileHelper); } @Override - protected void addTags() { + protected void addTags(HolderLookup.Provider provider) { RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.values().forEach(item -> tag(tag).add(item.get()))); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java index d0dd75bdf..dd81944fe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java @@ -1,86 +1,58 @@ package com.refinedmods.refinedstorage.datageneration; -import com.google.common.collect.ImmutableList; -import com.mojang.datafixers.util.Pair; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.loottable.ControllerLootFunction; import com.refinedmods.refinedstorage.loottable.CrafterLootFunction; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.loot.BlockLoot; -import net.minecraft.data.loot.LootTableProvider; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.functions.LootItemFunction; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraftforge.registries.RegistryObject; -import java.util.List; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.Collections; import java.util.stream.Collectors; -public class LootTableGenerator extends LootTableProvider { - public LootTableGenerator(DataGenerator dataGeneratorIn) { - super(dataGeneratorIn); +public class LootTableGenerator extends BlockLootSubProvider { + public LootTableGenerator() { + super(Collections.emptySet(), FeatureFlags.REGISTRY.allFlags()); } @Override - protected List>>, LootContextParamSet>> getTables() { - return ImmutableList.of(Pair.of(RSBlockLootTables::new, LootContextParamSets.BLOCK)); + protected void generate() { + RSBlocks.CONTROLLER.values().forEach(block -> genBlockItemLootTableWithFunction(block.get(), ControllerLootFunction.builder())); + RSBlocks.CREATIVE_CONTROLLER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.CRAFTER.values().forEach(block -> genBlockItemLootTableWithFunction(block.get(), CrafterLootFunction.builder())); + RSBlocks.GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.CRAFTING_GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.FLUID_GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.PATTERN_GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.SECURITY_MANAGER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.WIRELESS_TRANSMITTER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.RELAY.values().forEach(block -> dropSelf(block.get())); + RSBlocks.NETWORK_TRANSMITTER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.NETWORK_RECEIVER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.DISK_MANIPULATOR.values().forEach(block -> dropSelf(block.get())); + RSBlocks.CRAFTING_MONITOR.values().forEach(block -> dropSelf(block.get())); + RSBlocks.CRAFTER_MANAGER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.DETECTOR.values().forEach(block -> dropSelf(block.get())); } @Override - protected void validate(Map map, ValidationContext validationtracker) { - //NO OP + protected Iterable getKnownBlocks() { + return RSBlocks.COLORED_BLOCKS.stream().map(RegistryObject::get).collect(Collectors.toList()); } - @Override - public String getName() { - return "Refined Storage Loot Tables"; - } - - private static class RSBlockLootTables extends BlockLoot { - @Override - protected void addTables() { - RSBlocks.CONTROLLER.values().forEach(block -> genBlockItemLootTableWithFunction(block.get(), ControllerLootFunction.builder())); - RSBlocks.CREATIVE_CONTROLLER.values().forEach(block -> dropSelf(block.get())); - RSBlocks.CRAFTER.values().forEach(block -> genBlockItemLootTableWithFunction(block.get(), CrafterLootFunction.builder())); - RSBlocks.GRID.values().forEach(block -> dropSelf(block.get())); - RSBlocks.CRAFTING_GRID.values().forEach(block -> dropSelf(block.get())); - RSBlocks.FLUID_GRID.values().forEach(block -> dropSelf(block.get())); - RSBlocks.PATTERN_GRID.values().forEach(block -> dropSelf(block.get())); - RSBlocks.SECURITY_MANAGER.values().forEach(block -> dropSelf(block.get())); - RSBlocks.WIRELESS_TRANSMITTER.values().forEach(block -> dropSelf(block.get())); - RSBlocks.RELAY.values().forEach(block -> dropSelf(block.get())); - RSBlocks.NETWORK_TRANSMITTER.values().forEach(block -> dropSelf(block.get())); - RSBlocks.NETWORK_RECEIVER.values().forEach(block -> dropSelf(block.get())); - RSBlocks.DISK_MANIPULATOR.values().forEach(block -> dropSelf(block.get())); - RSBlocks.CRAFTING_MONITOR.values().forEach(block -> dropSelf(block.get())); - RSBlocks.CRAFTER_MANAGER.values().forEach(block -> dropSelf(block.get())); - RSBlocks.DETECTOR.values().forEach(block -> dropSelf(block.get())); - } - - @Override - protected Iterable getKnownBlocks() { - return RSBlocks.COLORED_BLOCKS.stream().map(RegistryObject::get).collect(Collectors.toList()); - } - - private void genBlockItemLootTableWithFunction(Block block, LootItemFunction.Builder builder) { - add(block, LootTable.lootTable().withPool( - LootPool.lootPool() - .setRolls(ConstantValue.exactly(1)) - .add(LootItem.lootTableItem(block) - .apply(builder)) - .when(ExplosionCondition.survivesExplosion()))); - } + private void genBlockItemLootTableWithFunction(Block block, LootItemFunction.Builder builder) { + add(block, LootTable.lootTable().withPool( + LootPool.lootPool() + .setRolls(ConstantValue.exactly(1)) + .add(LootItem.lootTableItem(block) + .apply(builder)) + .when(ExplosionCondition.survivesExplosion()))); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java index 87c1761a2..0594a4cd4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java @@ -5,8 +5,9 @@ import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.item.ProcessorItem; import com.refinedmods.refinedstorage.util.ColorMap; import net.minecraft.advancements.critereon.InventoryChangeTrigger; -import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.resources.ResourceLocation; @@ -18,14 +19,14 @@ import java.util.function.Consumer; public class RecipeGenerator extends RecipeProvider { private static final String GRID_ID = RS.ID + ":grid"; - public RecipeGenerator(DataGenerator generator) { - super(generator); + public RecipeGenerator(PackOutput output) { + super(output); } @Override - protected void buildCraftingRecipes(Consumer recipeAcceptor) { + protected void buildRecipes(Consumer recipeAcceptor) { // Tag + Color -> Colored Block - RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, item.get()) .requires(tag) .requires(color.getTag()) .group(RS.ID) @@ -34,7 +35,7 @@ public class RecipeGenerator extends RecipeProvider { )); // Crafting Grid - RSItems.CRAFTING_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + RSItems.CRAFTING_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, item.get()) .requires(RSItems.GRID.get(color).get()) .requires(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) .requires(ItemTags.create(new ResourceLocation(RS.ID, "crafting_tables"))) @@ -43,7 +44,7 @@ public class RecipeGenerator extends RecipeProvider { ); // Fluid Grid - RSItems.FLUID_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + RSItems.FLUID_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, item.get()) .requires(RSItems.GRID.get(color).get()) .requires(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) .requires(Items.BUCKET) @@ -52,7 +53,7 @@ public class RecipeGenerator extends RecipeProvider { ); // Pattern Grid - RSItems.PATTERN_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + RSItems.PATTERN_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, item.get()) .requires(RSItems.GRID.get(color).get()) .requires(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) .requires(RSItems.PATTERN.get()) diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java index 41c24d927..4afcdf18e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java @@ -9,9 +9,7 @@ import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.ingredient.ICraftingGridHelper; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; -import net.minecraft.core.NonNullList; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -37,15 +35,12 @@ public class CoverCraftingCategoryExtension implements ICraftingCategoryExtensio if (item == null || item == Items.AIR) { continue; } - NonNullList subBlocks = NonNullList.create(); - block.fillItemCategory(CreativeModeTab.TAB_SEARCH, subBlocks); - for (ItemStack subBlock : subBlocks) { - if (CoverManager.isValidCover(subBlock)) { - input.add(subBlock); - ItemStack stack = new ItemStack(RSItems.COVER.get()); - CoverItem.setItem(stack, subBlock); - output.add(stack); - } + ItemStack itemStack = new ItemStack(item); + if (CoverManager.isValidCover(itemStack)) { + input.add(itemStack); + ItemStack coverStack = new ItemStack(RSItems.COVER.get()); + CoverItem.setItem(coverStack, itemStack); + output.add(coverStack); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java index 42dc23fe5..59f02dd91 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java @@ -9,18 +9,19 @@ import com.refinedmods.refinedstorage.network.SetFluidFilterSlotMessage; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.util.StackUtils; import mezz.jei.api.gui.handlers.IGhostIngredientHandler; +import mezz.jei.api.ingredients.ITypedIngredient; import net.minecraft.client.renderer.Rect2i; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.fluids.FluidType; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidType; import java.util.ArrayList; import java.util.List; public class GhostIngredientHandler implements IGhostIngredientHandler { @Override - public List> getTargets(BaseScreen gui, I ingredient, boolean doStart) { + public List> getTargetsTyped(BaseScreen gui, ITypedIngredient ingredient, boolean doStart) { List> targets = new ArrayList<>(); for (Slot slot : gui.getMenu().slots) { @@ -30,7 +31,7 @@ public class GhostIngredientHandler implements IGhostIngredientHandler() { @Override public Rect2i getArea() { @@ -45,7 +46,7 @@ public class GhostIngredientHandler implements IGhostIngredientHandler() { + targets.add(new Target<>() { @Override public Rect2i getArea() { return bounds; diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java index 18afe0d1f..e3737191c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java @@ -7,16 +7,23 @@ import com.refinedmods.refinedstorage.screen.grid.GridScreen; import com.refinedmods.refinedstorage.screen.widget.sidebutton.SideButton; import com.refinedmods.refinedstorage.util.RenderUtils; import mezz.jei.api.gui.handlers.IGuiContainerHandler; +import mezz.jei.api.runtime.IClickableIngredient; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.renderer.Rect2i; import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Optional; public class GuiContainerHandler implements IGuiContainerHandler> { + private final JeiHelper jeiHelper; + + public GuiContainerHandler(JeiHelper jeiHelper) { + this.jeiHelper = jeiHelper; + } + @Override public List getGuiExtraAreas(AbstractContainerScreen screen) { if (screen instanceof BaseScreen) { @@ -24,7 +31,7 @@ public class GuiContainerHandler implements IGuiContainerHandler rectangles = new ArrayList<>(); for (SideButton sideButton : sideButtons) { - rectangles.add(new Rect2i(sideButton.x, sideButton.y, sideButton.getWidth(), sideButton.getHeight())); + rectangles.add(new Rect2i(sideButton.getX(), sideButton.getY(), sideButton.getWidth(), sideButton.getHeight())); } return rectangles; @@ -33,9 +40,8 @@ public class GuiContainerHandler implements IGuiContainerHandler> getClickableIngredientUnderMouse(AbstractContainerScreen screen, double mouseX, double mouseY) { mouseX -= screen.getGuiLeft(); mouseY -= screen.getGuiTop(); @@ -44,8 +50,10 @@ public class GuiContainerHandler implements IGuiContainerHandler= 0 && grid.getSlotNumber() < grid.getView().getStacks().size(); - - return inRange ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null; + Rect2i area = new Rect2i(grid.getSlotNumberX(), grid.getSlotNumberY(), 18, 18); + return inRange + ? jeiHelper.makeClickableIngredient(grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient(), area) + : Optional.empty(); } } @@ -54,11 +62,12 @@ public class GuiContainerHandler implements IGuiContainerHandler subBlocks = NonNullList.create(); - block.fillItemCategory(CreativeModeTab.TAB_SEARCH, subBlocks); - for (ItemStack subBlock : subBlocks) { - if (CoverManager.isValidCover(subBlock)) { - ItemStack fullCover = new ItemStack(RSItems.COVER.get()); - CoverItem.setItem(fullCover, subBlock); - input.add(fullCover); - ItemStack hollowCover = new ItemStack(RSItems.HOLLOW_COVER.get()); - CoverItem.setItem(hollowCover, subBlock); - output.add(hollowCover); - } + ItemStack itemStack = new ItemStack(item); + if (CoverManager.isValidCover(itemStack)) { + ItemStack fullCover = new ItemStack(RSItems.COVER.get()); + CoverItem.setItem(fullCover, itemStack); + input.add(fullCover); + ItemStack hollowCover = new ItemStack(RSItems.HOLLOW_COVER.get()); + CoverItem.setItem(hollowCover, itemStack); + output.add(hollowCover); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiHelper.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiHelper.java new file mode 100644 index 000000000..0d190feac --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiHelper.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.integration.jei; + +import mezz.jei.api.ingredients.ITypedIngredient; +import mezz.jei.api.runtime.IClickableIngredient; +import mezz.jei.api.runtime.IIngredientManager; +import net.minecraft.client.renderer.Rect2i; + +import java.util.Optional; + +public class JeiHelper { + private final IIngredientManager ingredientManager; + + public JeiHelper(IIngredientManager ingredientManager) { + this.ingredientManager = ingredientManager; + } + + public Optional> makeClickableIngredient(Object ingredient, Rect2i area) { + return ingredientManager.createTypedIngredient(ingredient).map(ti -> new ClickableIngredient<>(ti, area)); + } + + private record ClickableIngredient(ITypedIngredient ingredient, + Rect2i area) implements IClickableIngredient { + @Override + public ITypedIngredient getTypedIngredient() { + return ingredient; + } + + @Override + public Rect2i getArea() { + return area; + } + } +} diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java index dd76578cb..404e932ce 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java @@ -36,7 +36,8 @@ public class RSJeiPlugin implements IModPlugin { @Override public void registerGuiHandlers(IGuiHandlerRegistration registration) { - registration.addGenericGuiContainerHandler(BaseScreen.class, new GuiContainerHandler()); + JeiHelper jeiHelper = new JeiHelper(registration.getJeiHelpers().getIngredientManager()); + registration.addGenericGuiContainerHandler(BaseScreen.class, new GuiContainerHandler(jeiHelper)); registration.addGhostIngredientHandler(BaseScreen.class, new GhostIngredientHandler()); } @@ -52,7 +53,7 @@ public class RSJeiPlugin implements IModPlugin { @Override public void registerVanillaCategoryExtensions(IVanillaCategoryExtensionRegistration registration) { - registration.getCraftingCategory().addCategoryExtension(CoverRecipe.class, (cover) -> new CoverCraftingCategoryExtension()); - registration.getCraftingCategory().addCategoryExtension(HollowCoverRecipe.class, (cover) -> new HollowCoverCraftingCategoryExtension()); + registration.getCraftingCategory().addCategoryExtension(CoverRecipe.class, cover -> new CoverCraftingCategoryExtension()); + registration.getCraftingCategory().addCategoryExtension(HollowCoverRecipe.class, cover -> new HollowCoverCraftingCategoryExtension()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java index b0e58f7c4..11e79ee8b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java @@ -1,11 +1,10 @@ package com.refinedmods.refinedstorage.integration.jei; -import com.mojang.blaze3d.vertex.PoseStack; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.transfer.IRecipeTransferError; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import java.awt.*; @@ -39,15 +38,13 @@ public class RecipeTransferCraftingGridError implements IRecipeTransferError { } @Override - public void showError(PoseStack poseStack, int mouseX, int mouseY, IRecipeSlotsView recipeSlotsView, int recipeX, int recipeY) { - poseStack.translate(recipeX, recipeY, 0); - List message = drawIngredientHighlights(poseStack, recipeX, recipeY); - - Screen currentScreen = Minecraft.getInstance().screen; - currentScreen.renderComponentTooltip(poseStack, message, mouseX, mouseY); + public void showError(GuiGraphics graphics, int mouseX, int mouseY, IRecipeSlotsView recipeSlotsView, int recipeX, int recipeY) { + graphics.pose().translate(recipeX, recipeY, 0); + List message = drawIngredientHighlights(graphics, recipeX, recipeY); + graphics.renderComponentTooltip(Minecraft.getInstance().font, message, mouseX, mouseY); } - protected List drawIngredientHighlights(PoseStack stack, int recipeX, int recipeY) { + protected List drawIngredientHighlights(GuiGraphics graphics, int recipeX, int recipeY) { List message = new ArrayList<>(); message.add(Component.translatable("jei.tooltip.transfer")); @@ -57,10 +54,10 @@ public class RecipeTransferCraftingGridError implements IRecipeTransferError { for (Ingredient ingredient : ingredientList.ingredients) { if (!ingredient.isAvailable()) { if (ingredient.isCraftable()) { - ingredient.getSlotView().drawHighlight(stack, AUTOCRAFTING_HIGHLIGHT_COLOR.getRGB()); + ingredient.getSlotView().drawHighlight(graphics, AUTOCRAFTING_HIGHLIGHT_COLOR.getRGB()); craftMessage = true; } else { - ingredient.getSlotView().drawHighlight(stack, MISSING_HIGHLIGHT_COLOR.getRGB()); + ingredient.getSlotView().drawHighlight(graphics, MISSING_HIGHLIGHT_COLOR.getRGB()); missingMessage = true; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java index 9aac904ea..53415f8f0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.integration.jei; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import java.util.ArrayList; @@ -13,7 +13,7 @@ public class RecipeTransferPatternGridError extends RecipeTransferCraftingGridEr } @Override - protected List drawIngredientHighlights(PoseStack stack, int recipeX, int recipeY) { + protected List drawIngredientHighlights(GuiGraphics graphics, int recipeX, int recipeY) { List message = new ArrayList<>(); message.add(Component.translatable("jei.tooltip.transfer")); @@ -21,7 +21,7 @@ public class RecipeTransferPatternGridError extends RecipeTransferCraftingGridEr for (Ingredient ingredient : ingredientList.ingredients) { if (ingredient.isCraftable()) { - ingredient.getSlotView().drawHighlight(stack, AUTOCRAFTING_HIGHLIGHT_COLOR.getRGB()); + ingredient.getSlotView().drawHighlight(graphics, AUTOCRAFTING_HIGHLIGHT_COLOR.getRGB()); craftMessage = true; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java b/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java index 6105217a6..2e1f92070 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java @@ -1,11 +1,10 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import net.minecraft.world.item.Item; public class CoreItem extends Item { public CoreItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } public enum Type { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java index b4c12a533..b6ae4f406 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java @@ -1,12 +1,10 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.network.node.ICoverable; import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.network.node.cover.Cover; -import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverType; import com.refinedmods.refinedstorage.block.CableBlock; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; @@ -14,30 +12,26 @@ import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionResult; -import net.minecraft.world.item.*; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; public class CoverItem extends Item { - public static final ItemStack HIDDEN_COVER_ALTERNATIVE = new ItemStack(Blocks.STONE_BRICKS); - private static final String NBT_ITEM = "Item"; public CoverItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } public static void setItem(ItemStack cover, ItemStack item) { @@ -68,42 +62,6 @@ public class CoverItem extends Item { } } - @Override - public void fillItemCategory(CreativeModeTab group, NonNullList items) { - if (this.allowedIn(group)) { - if (!RS.CLIENT_CONFIG.getCover().showAllRecipesInJEI()) { - ItemStack stack = new ItemStack(this); - - setItem(stack, HIDDEN_COVER_ALTERNATIVE); - - items.add(stack); - - return; - } - for (Block block : ForgeRegistries.BLOCKS.getValues()) { - Item item = Item.byBlock(block); - - if (item == Items.AIR) { - continue; - } - - NonNullList subBlocks = NonNullList.create(); - - block.fillItemCategory(CreativeModeTab.TAB_SEARCH, subBlocks); - - for (ItemStack subBlock : subBlocks) { - if (CoverManager.isValidCover(subBlock)) { - ItemStack stack = new ItemStack(this); - - setItem(stack, subBlock); - - items.add(stack); - } - } - } - } - } - @Override public InteractionResult useOn(UseOnContext context) { BlockPos pos = context.getClickedPos(); @@ -151,7 +109,6 @@ public class CoverItem extends Item { return InteractionResult.PASS; } - private boolean canPlaceOn(Level level, BlockPos pos, Direction facing) { return level.getBlockEntity(pos) instanceof NetworkNodeBlockEntity && ((NetworkNodeBlockEntity) level.getBlockEntity(pos)).getNode() instanceof ICoverable @@ -161,5 +118,4 @@ public class CoverItem extends Item { protected Cover createCover(ItemStack stack) { return new Cover(stack, CoverType.NORMAL); } - } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java index ff44294d2..c7a4f7f95 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java @@ -41,7 +41,7 @@ public class FilterItem extends Item { private static final String NBT_TYPE = "Type"; public FilterItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } public static int getCompare(ItemStack stack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java index b92716ead..6c1193b02 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java @@ -33,7 +33,7 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { private final FluidStorageType type; public FluidStorageDiskItem(FluidStorageType type) { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java index 51871b5e0..af02a2d23 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java @@ -7,7 +7,7 @@ import net.minecraft.world.item.Item; public class FluidStoragePartItem extends Item { public FluidStoragePartItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } public static FluidStoragePartItem getByType(FluidStorageType type) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java index 81a866bfd..de854c4da 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java @@ -1,13 +1,11 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.block.NetworkReceiverBlock; import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; - import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionResult; @@ -28,7 +26,7 @@ public class NetworkCardItem extends Item { private static final String NBT_DIMENSION = "Dimension"; public NetworkCardItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } @Nullable @@ -54,8 +52,7 @@ public class NetworkCardItem extends Item { if (name == null) { return null; } - - return ResourceKey.create(Registry.DIMENSION_REGISTRY, name); + return ResourceKey.create(Registries.DIMENSION, name); } return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java index 4cf0db5a2..0fb3b83d2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.render.Styles; import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -46,8 +46,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv if (name == null) { return null; } - - return ResourceKey.create(Registry.DIMENSION_REGISTRY, name); + return ResourceKey.create(Registries.DIMENSION, name); } return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java index 3de9b27bd..56d63e731 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; @@ -53,7 +52,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { private static final int VERSION = 1; public PatternItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } public static ICraftingPattern fromCache(Level level, ItemStack stack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java index b2bccf930..83715dadc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java @@ -1,10 +1,9 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import net.minecraft.world.item.Item; public class ProcessorBindingItem extends Item { public ProcessorBindingItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java index 21d755280..aa615a2aa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java @@ -1,11 +1,10 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import net.minecraft.world.item.Item; public class ProcessorItem extends Item { public ProcessorItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } public enum Type { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java b/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java index 651ed842f..f5f57570b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java @@ -1,10 +1,9 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import net.minecraft.world.item.Item; public class QuartzEnrichedIronItem extends Item { public QuartzEnrichedIronItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java index db4507b09..f5101e081 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.nbt.CompoundTag; @@ -23,7 +22,7 @@ public class SecurityCardItem extends Item { private static final String NBT_PERMISSION = "Permission_%d"; public SecurityCardItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } @Nullable diff --git a/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java b/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java index 7a6cd5da6..61736e81e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java @@ -1,10 +1,9 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import net.minecraft.world.item.Item; public class SiliconItem extends Item { public SiliconItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java index c00ec4d50..ee438893a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.api.storage.StorageType; import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; @@ -33,7 +32,7 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { private final ItemStorageType type; public StorageDiskItem(ItemStorageType type) { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java index 1550f0f79..df9ee1f4c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java @@ -1,10 +1,9 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import net.minecraft.world.item.Item; public class StorageHousingItem extends Item { public StorageHousingItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java index 54b03627f..6d040e318 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java @@ -1,13 +1,12 @@ package com.refinedmods.refinedstorage.item; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; import net.minecraft.world.item.Item; public class StoragePartItem extends Item { public StoragePartItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); } public static StoragePartItem getByType(ItemStorageType type) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java index ca9786466..3b680fad1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java @@ -15,7 +15,7 @@ public class UpgradeItem extends Item { private final Type type; public UpgradeItem(Type type) { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(new Item.Properties()); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java index d4fb89b97..278584f0c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java @@ -20,7 +20,7 @@ public class WirelessCraftingMonitorItem extends NetworkItem { private final Type type; public WirelessCraftingMonitorItem(Type type) { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessCraftingMonitor().getCapacity()); + super(new Item.Properties().stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessCraftingMonitor().getCapacity()); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java index 399af9f8d..27bf23e64 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java @@ -17,7 +17,7 @@ public class WirelessFluidGridItem extends NetworkItem { private final Type type; public WirelessFluidGridItem(Type type) { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessFluidGrid().getCapacity()); + super(new Item.Properties().stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessFluidGrid().getCapacity()); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java index e7804d81b..41683de2e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java @@ -17,7 +17,7 @@ public class WirelessGridItem extends NetworkItem { private final Type type; public WirelessGridItem(Type type) { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessGrid().getCapacity()); + super(new Item.Properties().stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessGrid().getCapacity()); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java index 7caf14d65..b52397a91 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java @@ -18,7 +18,7 @@ import net.minecraftforge.items.ItemHandlerHelper; public class WrenchItem extends Item { public WrenchItem() { - super(new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java index 04eb9f122..3b3d4223c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java @@ -5,7 +5,6 @@ import com.refinedmods.refinedstorage.api.network.NetworkType; import com.refinedmods.refinedstorage.block.ControllerBlock; import com.refinedmods.refinedstorage.util.ColorMap; import net.minecraft.network.chat.Component; - import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -14,7 +13,7 @@ public class ControllerBlockItem extends EnergyBlockItem { private final Component displayName; public ControllerBlockItem(ControllerBlock block, DyeColor color, Component displayName) { - super(block, new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1), block.getType() == NetworkType.CREATIVE, () -> RS.SERVER_CONFIG.getController().getCapacity()); + super(block, new Item.Properties().stacksTo(1), block.getType() == NetworkType.CREATIVE, () -> RS.SERVER_CONFIG.getController().getCapacity()); if (color != ColorMap.DEFAULT_COLOR) { this.displayName = Component.translatable("color.minecraft." + color.getName()) diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java index 6b075f4d9..ef7ba1b07 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.item.blockitem; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; @@ -33,7 +32,7 @@ public class FluidStorageBlockItem extends BaseBlockItem { private final FluidStorageType type; public FluidStorageBlockItem(FluidStorageBlock block) { - super(block, new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(block, new Item.Properties()); this.type = block.getType(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java index 60dc0afac..5de6244b5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java @@ -8,7 +8,6 @@ import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.item.WirelessGridItem; import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.network.chat.Component; - import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -29,7 +28,7 @@ public class PortableGridBlockItem extends EnergyBlockItem { public PortableGridBlockItem(Type type) { super( type == Type.CREATIVE ? RSBlocks.CREATIVE_PORTABLE_GRID.get() : RSBlocks.PORTABLE_GRID.get(), - new Item.Properties().tab(RS.CREATIVE_MODE_TAB).stacksTo(1), + new Item.Properties().stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getPortableGrid().getCapacity() ); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java index cb56bbec9..cbe155d4a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.item.blockitem; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; @@ -30,7 +29,7 @@ public class StorageBlockItem extends BaseBlockItem { private final ItemStorageType type; public StorageBlockItem(StorageBlock block) { - super(block, new Item.Properties().tab(RS.CREATIVE_MODE_TAB)); + super(block, new Item.Properties()); this.type = block.getType(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/group/MainCreativeModeTab.java b/src/main/java/com/refinedmods/refinedstorage/item/group/MainCreativeModeTab.java deleted file mode 100644 index 744ce510f..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/item/group/MainCreativeModeTab.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage.item.group; - -import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.util.ColorMap; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; - -public class MainCreativeModeTab extends CreativeModeTab { - public MainCreativeModeTab() { - super(RS.ID); - } - - @Override - public ItemStack makeIcon() { - return new ItemStack(RSBlocks.CREATIVE_CONTROLLER.get(ColorMap.DEFAULT_COLOR).get()); - } -} diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java index e1a2b1487..1a4e08208 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java @@ -38,7 +38,7 @@ public class ControllerLootFunction extends LootItemConditionalFunction { @Override public LootItemFunctionType getType() { - return RSLootFunctions.CONTROLLER.get(); + return RSLootFunctions.CONTROLLER; } public static class Serializer extends LootItemConditionalFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java index 117e316bb..f3b52bafa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java @@ -40,7 +40,7 @@ public class CrafterLootFunction extends LootItemConditionalFunction { @Override public LootItemFunctionType getType() { - return RSLootFunctions.CRAFTER.get(); + return RSLootFunctions.CRAFTER; } public static class Serializer extends LootItemConditionalFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java index b16062938..7d9d1a56f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java @@ -30,7 +30,7 @@ public class PortableGridBlockLootFunction extends LootItemConditionalFunction { @Override public LootItemFunctionType getType() { - return RSLootFunctions.PORTABLE_GRID.get(); + return RSLootFunctions.PORTABLE_GRID; } public static class Serializer extends LootItemConditionalFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java index cd2582423..adb5425b6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java @@ -51,7 +51,7 @@ public class StorageBlockLootFunction extends LootItemConditionalFunction { @Override public LootItemFunctionType getType() { - return RSLootFunctions.STORAGE_BLOCK.get(); + return RSLootFunctions.STORAGE_BLOCK; } public static class Serializer extends LootItemConditionalFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java index f4e92010e..8789caa73 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java @@ -26,7 +26,7 @@ public class StorageDiskSizeRequestMessage { public static void handle(StorageDiskSizeRequestMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { - IStorageDisk disk = API.instance().getStorageDiskManager(ctx.get().getSender().getLevel()).get(message.id); + IStorageDisk disk = API.instance().getStorageDiskManager(ctx.get().getSender().serverLevel()).get(message.id); if (disk != null) { RS.NETWORK_HANDLER.sendTo(ctx.get().getSender(), new StorageDiskSizeResponseMessage(message.id, disk.getStored(), disk.getCapacity())); diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java index ecab874ee..7da3b22bb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java @@ -5,23 +5,24 @@ import com.google.common.collect.Lists; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.refinedmods.refinedstorage.item.CoverItem; +import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.CustomRecipe; import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.SimpleRecipeSerializer; +import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer; import net.minecraft.world.level.Level; import net.minecraftforge.common.Tags; import java.util.List; public class CoverRecipe extends CustomRecipe { + public static RecipeSerializer SERIALIZER = new SimpleCraftingRecipeSerializer<>(CoverRecipe::new); - public static RecipeSerializer SERIALIZER = new SimpleRecipeSerializer<>(CoverRecipe::new); - - public CoverRecipe(ResourceLocation idIn) { - super(idIn); + public CoverRecipe(ResourceLocation id, CraftingBookCategory category) { + super(id, category); } public static boolean stackMatches(ItemStack first) { @@ -76,7 +77,7 @@ public class CoverRecipe extends CustomRecipe { } @Override - public ItemStack assemble(CraftingContainer inv) { + public ItemStack assemble(CraftingContainer inv, RegistryAccess registryAccess) { List list = Lists.newArrayList(); int ingots = 0; for (int i = 0; i < inv.getContainerSize(); ++i) { diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java index 94d987bf7..7378cf809 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java @@ -4,21 +4,23 @@ package com.refinedmods.refinedstorage.recipe; import com.google.common.collect.Lists; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.item.CoverItem; +import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.CustomRecipe; import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.SimpleRecipeSerializer; +import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer; import net.minecraft.world.level.Level; import java.util.List; public class HollowCoverRecipe extends CustomRecipe { - public static RecipeSerializer SERIALIZER = new SimpleRecipeSerializer<>(HollowCoverRecipe::new); + public static RecipeSerializer SERIALIZER = new SimpleCraftingRecipeSerializer<>(HollowCoverRecipe::new); - public HollowCoverRecipe(ResourceLocation id) { - super(id); + public HollowCoverRecipe(ResourceLocation id, CraftingBookCategory category) { + super(id, category); } public static boolean stackMatches(ItemStack first) { @@ -60,7 +62,7 @@ public class HollowCoverRecipe extends CustomRecipe { } @Override - public ItemStack assemble(CraftingContainer inv) { + public ItemStack assemble(CraftingContainer inv, RegistryAccess registryAccess) { List list = Lists.newArrayList(); for (int i = 0; i < inv.getContainerSize(); ++i) { ItemStack itemstack = inv.getItem(i); diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java index aa4e6599c..fa92ba5d7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java @@ -9,6 +9,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.EnchantedBookItem; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.item.enchantment.Enchantment; @@ -22,7 +23,7 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { private final ItemStack result; public UpgradeWithEnchantedBookRecipe(ResourceLocation recipeId, Enchantment enchantment, int enchantmentLevel, ItemStack result) { - super(recipeId, "", 3, 3, NonNullList.of(Ingredient.EMPTY, + super(recipeId, "", CraftingBookCategory.MISC, 3, 3, NonNullList.of(Ingredient.EMPTY, Ingredient.of(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), Ingredient.of(EnchantedBookItem.createForEnchantment(new EnchantmentInstance(enchantment, enchantmentLevel))), Ingredient.of(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), diff --git a/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java index 199a21f8a..023cc11cd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java @@ -2,16 +2,17 @@ package com.refinedmods.refinedstorage.render; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; -import com.mojang.math.Matrix4f; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.level.material.Fluid; import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; -import net.minecraftforge.fluids.FluidType; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidType; +import org.joml.Matrix4f; import javax.annotation.Nullable; @@ -73,13 +74,10 @@ public class FluidRenderer { tessellator.end(); } - public void render(PoseStack poseStack, final int xPosition, final int yPosition, @Nullable FluidStack fluidStack) { + public void render(GuiGraphics graphics, final int xPosition, final int yPosition, @Nullable FluidStack fluidStack) { RenderSystem.enableBlend(); - - drawFluid(poseStack, xPosition, yPosition, fluidStack); - + drawFluid(graphics.pose(), xPosition, yPosition, fluidStack); RenderSystem.setShaderColor(1, 1, 1, 1); - RenderSystem.disableBlend(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java index 05b6fa9fb..0e89fc512 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java @@ -7,8 +7,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.extensions.common.IClientItemExtensions; @@ -20,13 +20,13 @@ public class PatternItemBlockEntityRenderer extends BlockEntityWithoutLevelRende } @Override - public void renderByItem(ItemStack stack, ItemTransforms.TransformType transformType, PoseStack poseStack, MultiBufferSource renderTypeBuffer, int combinedLight, int combinedOverlay) { + public void renderByItem(ItemStack stack, ItemDisplayContext context, PoseStack poseStack, MultiBufferSource renderTypeBuffer, int combinedLight, int combinedOverlay) { ICraftingPattern pattern = PatternItem.fromCache(Minecraft.getInstance().level, stack); ItemStack outputStack = pattern.getOutputs().get(0); IClientItemExtensions.of(outputStack.getItem()).getCustomRenderer() - .renderByItem(outputStack, transformType, poseStack, renderTypeBuffer, combinedLight, combinedOverlay); + .renderByItem(outputStack, context, poseStack, renderTypeBuffer, combinedLight, combinedOverlay); } public static PatternItemBlockEntityRenderer getInstance() { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java index 54f57422f..46b4e429e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java @@ -3,18 +3,16 @@ package com.refinedmods.refinedstorage.render.blockentity; import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.math.Matrix3f; -import com.mojang.math.Vector3f; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.block.StorageMonitorBlock; import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity; import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -22,12 +20,14 @@ import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; import net.minecraftforge.common.util.TransformationHelper; import net.minecraftforge.fluids.FluidStack; +import org.joml.Vector3f; public class StorageMonitorBlockEntityRenderer implements BlockEntityRenderer { @Override @@ -87,7 +87,7 @@ public class StorageMonitorBlockEntityRenderer implements BlockEntityRenderer> 16 & 0xFF; final int colorGreen = fluidColor >> 8 & 0xFF; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/AbstractUnbakedGeometry.java b/src/main/java/com/refinedmods/refinedstorage/render/model/AbstractUnbakedGeometry.java deleted file mode 100644 index 92ae8202a..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/AbstractUnbakedGeometry.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage.render.model; - -import com.mojang.datafixers.util.Pair; -import net.minecraft.client.resources.model.Material; -import net.minecraft.client.resources.model.UnbakedModel; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.client.model.geometry.IGeometryBakingContext; -import net.minecraftforge.client.model.geometry.IUnbakedGeometry; - -import java.util.Collection; -import java.util.Set; -import java.util.function.Function; - -public abstract class AbstractUnbakedGeometry> implements IUnbakedGeometry { - protected abstract Set getModels(); - - @Override - public Collection getMaterials(final IGeometryBakingContext context, - final Function modelGetter, - final Set> missingTextureErrors) { - return getModels() - .stream() - .map(modelGetter) - .flatMap(unbakedModel -> unbakedModel.getMaterials(modelGetter, missingTextureErrors).stream()) - .toList(); - } -} diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java index 4f6dd55fc..51f880446 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java @@ -1,10 +1,10 @@ package com.refinedmods.refinedstorage.render.model; -import com.mojang.math.Vector3f; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.Direction; import net.minecraftforge.client.model.pipeline.QuadBakingVertexConsumer; +import org.joml.Vector3f; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveUnbakedGeometry.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveUnbakedGeometry.java index 978b59adb..e17391888 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveUnbakedGeometry.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveUnbakedGeometry.java @@ -1,28 +1,24 @@ package com.refinedmods.refinedstorage.render.model; import com.mojang.math.Transformation; -import com.mojang.math.Vector3f; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.render.model.baked.DiskDriveBakedModel; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.Material; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelState; +import net.minecraft.client.resources.model.*; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.client.model.geometry.IGeometryBakingContext; +import net.minecraftforge.client.model.geometry.IUnbakedGeometry; +import org.joml.Vector3f; import java.util.Objects; -import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; -import static com.refinedmods.refinedstorage.util.RenderUtils.getQuaternion; - -public class DiskDriveUnbakedGeometry extends AbstractUnbakedGeometry { +public class DiskDriveUnbakedGeometry implements IUnbakedGeometry { private static final ResourceLocation BASE_MODEL = new ResourceLocation(RS.ID, "block/disk_drive_base"); private static final ResourceLocation DISK_MODEL = new ResourceLocation(RS.ID, "block/disks/disk"); private static final ResourceLocation DISK_DISCONNECTED_MODEL = new ResourceLocation(RS.ID, "block/disks/disk_disconnected"); @@ -30,53 +26,52 @@ public class DiskDriveUnbakedGeometry extends AbstractUnbakedGeometry getModels() { - return Set.of( - BASE_MODEL, - DISK_MODEL, - DISK_DISCONNECTED_MODEL, - DISK_FULL_MODEL, - DISK_NEAR_CAPACITY_MODEL - ); + public void resolveParents(final Function modelGetter, + final IGeometryBakingContext context) { + modelGetter.apply(BASE_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_DISCONNECTED_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_FULL_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_NEAR_CAPACITY_MODEL).resolveParents(modelGetter); } @Override public BakedModel bake(final IGeometryBakingContext context, - final ModelBakery bakery, + final ModelBaker baker, final Function spriteGetter, final ModelState modelState, final ItemOverrides overrides, final ResourceLocation modelLocation) { return new DiskDriveBakedModel( - Objects.requireNonNull(bakery.bake(BASE_MODEL, modelState, spriteGetter)), - getBaseModelBakery(modelState, bakery, spriteGetter), - getDiskModelBakery(DISK_MODEL, modelState, bakery, spriteGetter), - getDiskModelBakery(DISK_NEAR_CAPACITY_MODEL, modelState, bakery, spriteGetter), - getDiskModelBakery(DISK_FULL_MODEL, modelState, bakery, spriteGetter), - getDiskModelBakery(DISK_DISCONNECTED_MODEL, modelState, bakery, spriteGetter) + Objects.requireNonNull(baker.bake(BASE_MODEL, modelState, spriteGetter)), + getBaseModelBaker(modelState, baker, spriteGetter), + getDiskModelBaker(DISK_MODEL, modelState, baker, spriteGetter), + getDiskModelBaker(DISK_NEAR_CAPACITY_MODEL, modelState, baker, spriteGetter), + getDiskModelBaker(DISK_FULL_MODEL, modelState, baker, spriteGetter), + getDiskModelBaker(DISK_DISCONNECTED_MODEL, modelState, baker, spriteGetter) ); } - private Function getBaseModelBakery(final ModelState state, - final ModelBakery bakery, - final Function sg) { + private Function getBaseModelBaker(final ModelState state, + final ModelBaker baker, + final Function sg) { return direction -> { - final Transformation rotation = new Transformation(null, getQuaternion(direction), null, null); + final Transformation rotation = new Transformation(null, RenderUtils.getQuaternion(direction), null, null); final ModelState wrappedState = new SimpleModelState(rotation, state.isUvLocked()); - return bakery.bake(BASE_MODEL, wrappedState, sg); + return baker.bake(BASE_MODEL, wrappedState, sg); }; } - private BiFunction getDiskModelBakery(final ResourceLocation id, - final ModelState state, - final ModelBakery bakery, - final Function - sg) { + private BiFunction getDiskModelBaker(final ResourceLocation id, + final ModelState state, + final ModelBaker baker, + final Function + sg) { return (direction, trans) -> { final Transformation translation = new Transformation(trans, null, null, null); - final Transformation rotation = new Transformation(null, getQuaternion(direction), null, null); + final Transformation rotation = new Transformation(null, RenderUtils.getQuaternion(direction), null, null); final ModelState wrappedState = new SimpleModelState(rotation.compose(translation), state.isUvLocked()); - return bakery.bake(id, wrappedState, sg); + return baker.bake(id, wrappedState, sg); }; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorUnbakedGeometry.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorUnbakedGeometry.java index 7f4c493ae..fac5c0d28 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorUnbakedGeometry.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorUnbakedGeometry.java @@ -1,28 +1,28 @@ package com.refinedmods.refinedstorage.render.model; import com.mojang.math.Transformation; -import com.mojang.math.Vector3f; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.render.model.baked.DiskManipulatorBakedModel; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.Material; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelState; +import net.minecraft.client.resources.model.*; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; import net.minecraftforge.client.RenderTypeGroup; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.client.model.geometry.IGeometryBakingContext; +import net.minecraftforge.client.model.geometry.IUnbakedGeometry; +import org.joml.Vector3f; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import java.util.function.BiFunction; import java.util.function.Function; -public class DiskManipulatorUnbakedGeometry extends AbstractUnbakedGeometry { +public class DiskManipulatorUnbakedGeometry implements IUnbakedGeometry { private static final ResourceLocation BASE_MODEL_DISCONNECTED = new ResourceLocation(RS.ID, "block/disk_manipulator/disconnected"); private final Map BASE_MODEL_CONNECTED = new HashMap<>(); @@ -31,28 +31,26 @@ public class DiskManipulatorUnbakedGeometry extends AbstractUnbakedGeometry getModels() { - Set set = new HashSet<>(Set.of( - BASE_MODEL_DISCONNECTED, - DISK_MODEL, - DISK_DISCONNECTED_MODEL, - DISK_FULL_MODEL, - DISK_NEAR_CAPACITY_MODEL - )); - set.addAll(BASE_MODEL_CONNECTED.values()); - return set; - } - public DiskManipulatorUnbakedGeometry() { for (DyeColor value : DyeColor.values()) { BASE_MODEL_CONNECTED.put(value, new ResourceLocation(RS.ID, "block/disk_manipulator/" + value.getName())); } } + @Override + public void resolveParents(final Function modelGetter, + final IGeometryBakingContext context) { + modelGetter.apply(BASE_MODEL_DISCONNECTED).resolveParents(modelGetter); + modelGetter.apply(DISK_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_DISCONNECTED_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_FULL_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_NEAR_CAPACITY_MODEL).resolveParents(modelGetter); + BASE_MODEL_CONNECTED.values().forEach(m -> modelGetter.apply(m).resolveParents(modelGetter)); + } + @Override public BakedModel bake(final IGeometryBakingContext context, - final ModelBakery bakery, + final ModelBaker baker, final Function spriteGetter, final ModelState modelState, final ItemOverrides overrides, @@ -61,50 +59,47 @@ public class DiskManipulatorUnbakedGeometry extends AbstractUnbakedGeometry getBaseModelBakery(final ModelState state, - final ModelBakery bakery, - final Function sg) { + private Function getBaseModelBaker(final ModelState state, + final ModelBaker baker, + final Function sg) { return direction -> { - var dir = RenderUtils.getQuaternion(direction); - final Transformation rotation = new Transformation(null, dir, null, null); + final Transformation rotation = new Transformation(null, RenderUtils.getQuaternion(direction), null, null); final ModelState wrappedState = new SimpleModelState(rotation, state.isUvLocked()); - return bakery.bake(BASE_MODEL_DISCONNECTED, wrappedState, sg); + return baker.bake(BASE_MODEL_DISCONNECTED, wrappedState, sg); }; } - private BiFunction getBaseModelBakeryConnected(final ModelState state, - final ModelBakery bakery, - final Function sg) { + private BiFunction getBaseModelBakerConnected(final ModelState state, + final ModelBaker baker, + final Function sg) { return (direction, color) -> { - var dir = RenderUtils.getQuaternion(direction); - final Transformation rotation = new Transformation(null, dir, null, null); + final Transformation rotation = new Transformation(null, RenderUtils.getQuaternion(direction), null, null); final ModelState wrappedState = new SimpleModelState(rotation, state.isUvLocked()); - return bakery.bake(BASE_MODEL_CONNECTED.get(color), wrappedState, sg); + return baker.bake(BASE_MODEL_CONNECTED.get(color), wrappedState, sg); }; } - private BiFunction getDiskModelBakery(final ResourceLocation id, - final ModelState state, - final ModelBakery bakery, - final Function - sg) { + private BiFunction getDiskModelBaker(final ResourceLocation id, + final ModelState state, + final ModelBaker baker, + final Function + sg) { return (direction, trans) -> { - var dir = RenderUtils.getQuaternion(direction); final Transformation translation = new Transformation(trans, null, null, null); - final Transformation rotation = new Transformation(null, dir, null, null); + final Transformation rotation = new Transformation(null, RenderUtils.getQuaternion(direction), null, null); final ModelState wrappedState = new SimpleModelState(rotation.compose(translation), state.isUvLocked()); - return bakery.bake(id, wrappedState, sg); + return baker.bake(id, wrappedState, sg); }; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridUnbakedGeometry.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridUnbakedGeometry.java index 21541bafd..3eb17004d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridUnbakedGeometry.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridUnbakedGeometry.java @@ -6,21 +6,18 @@ import com.refinedmods.refinedstorage.render.model.baked.PortableGridBakedModel; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.Material; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelState; +import net.minecraft.client.resources.model.*; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.RenderTypeGroup; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.client.model.geometry.IGeometryBakingContext; +import net.minecraftforge.client.model.geometry.IUnbakedGeometry; import java.util.Objects; -import java.util.Set; import java.util.function.Function; -public class PortableGridUnbakedGeometry extends AbstractUnbakedGeometry { +public class PortableGridUnbakedGeometry implements IUnbakedGeometry { private static final ResourceLocation BASE_CONNECTED_MODEL = new ResourceLocation(RS.ID, "block/portable_grid_connected"); private static final ResourceLocation BASE_DISCONNECTED_MODEL = new ResourceLocation(RS.ID, "block/portable_grid_disconnected"); private static final ResourceLocation DISK_MODEL = new ResourceLocation(RS.ID, "block/disks/portable_grid_disk"); @@ -29,20 +26,19 @@ public class PortableGridUnbakedGeometry extends AbstractUnbakedGeometry getModels() { - return Set.of( - BASE_CONNECTED_MODEL, - BASE_DISCONNECTED_MODEL, - DISK_MODEL, - DISK_DISCONNECTED_MODEL, - DISK_FULL_MODEL, - DISK_NEAR_CAPACITY_MODEL - ); + public void resolveParents(final Function modelGetter, + final IGeometryBakingContext context) { + modelGetter.apply(BASE_CONNECTED_MODEL).resolveParents(modelGetter); + modelGetter.apply(BASE_DISCONNECTED_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_DISCONNECTED_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_FULL_MODEL).resolveParents(modelGetter); + modelGetter.apply(DISK_NEAR_CAPACITY_MODEL).resolveParents(modelGetter); } @Override public BakedModel bake(final IGeometryBakingContext context, - final ModelBakery bakery, + final ModelBaker baker, final Function spriteGetter, final ModelState modelState, final ItemOverrides overrides, @@ -52,25 +48,25 @@ public class PortableGridUnbakedGeometry extends AbstractUnbakedGeometry getModelBakery(final ResourceLocation id, - final ModelState state, - final ModelBakery bakery, - final Function sg) { + private Function getModelBaker(final ResourceLocation id, + final ModelState state, + final ModelBaker baker, + final Function sg) { return direction -> { final Transformation rotation = new Transformation(null, RenderUtils.getQuaternion(direction), null, null); final ModelState wrappedState = new SimpleModelState(rotation, state.isUvLocked()); - return bakery.bake(id, wrappedState, sg); + return baker.bake(id, wrappedState, sg); }; } } \ No newline at end of file diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java index 15cb03354..01e4b979b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.render.model.baked; -import com.mojang.math.Vector3f; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.apiimpl.network.node.cover.Cover; @@ -22,13 +21,13 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.data.ModelData; +import org.joml.Vector3f; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Random; public class CableCoverBakedModel extends BakedModelWrapper { @@ -91,37 +90,45 @@ public class CableCoverBakedModel extends BakedModelWrapper { private static void addNormalCover(List quads, BlockState state, Direction coverSide, boolean hasUp, boolean hasDown, boolean hasEast, boolean hasWest, boolean handle, RandomSource random) { AABB bounds = ConstantsCable.getCoverBounds(coverSide); - Vector3f from = new Vector3f((float) bounds.minX * 16, (float) bounds.minY * 16, (float) bounds.minZ * 16); - Vector3f to = new Vector3f((float) bounds.maxX * 16, (float) bounds.maxY * 16, (float) bounds.maxZ * 16); + float fromX = (float) bounds.minX * 16; + float fromY = (float) bounds.minY * 16; + float fromZ = (float) bounds.minZ * 16; + + float toX = (float) bounds.maxX * 16; + float toY = (float) bounds.maxY * 16; + float toZ = (float) bounds.maxZ * 16; if (coverSide == Direction.NORTH) { if (hasWest) { - from.setX(2); + fromX = 2; } if (hasEast) { - to.setX(14); + toX = 14; } } else if (coverSide == Direction.SOUTH) { if (hasWest) { - from.setX(2); + fromX = 2; } if (hasEast) { - to.setX(14); + toX = 14; } } if (coverSide.getAxis() != Direction.Axis.Y) { if (hasDown) { - from.setY(2); + fromY = 2; } if (hasUp) { - to.setY(14); + toY = 14; } } + Vector3f from = new Vector3f(fromX, fromY, fromZ); + Vector3f to = new Vector3f(toX, toY, toZ); + HashMap spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side quads.addAll(new CubeBuilder().from(from.x(), from.y(), from.z()).to(to.x(), to.y(), to.z()).addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))).bake()); @@ -142,50 +149,55 @@ public class CableCoverBakedModel extends BakedModelWrapper { private static void addHollowCover(List quads, BlockState state, Direction coverSide, boolean hasUp, boolean hasDown, boolean hasEast, boolean hasWest, int size, RandomSource random) { AABB bounds = ConstantsCable.getCoverBounds(coverSide); - Vector3f from = new Vector3f((float) bounds.minX * 16, (float) bounds.minY * 16, (float) bounds.minZ * 16); - Vector3f to = new Vector3f((float) bounds.maxX * 16, (float) bounds.maxY * 16, (float) bounds.maxZ * 16); + float fromX = (float) bounds.minX * 16; + float fromY = (float) bounds.minY * 16; + float fromZ = (float) bounds.minZ * 16; + + float toX = (float) bounds.maxX * 16; + float toY = (float) bounds.maxY * 16; + float toZ = (float) bounds.maxZ * 16; if (coverSide.getAxis() != Direction.Axis.Y) { if (hasDown) { - from.setY(2); + fromY = 2; } if (hasUp) { - to.setY(14); + toY = 14; } } // Right if (coverSide == Direction.NORTH) { if (hasWest) { - from.setX(2); + fromX = 2; } else { - from.setX(0); + fromX = 0; } - to.setX(size); + toX = size; } else if (coverSide == Direction.SOUTH) { if (hasEast) { - to.setX(14); + toX = 14; } else { - to.setX(16); + toX = 16; } - from.setX(16 - size); + fromX = 16 - size; } else if (coverSide == Direction.EAST) { - from.setZ(0); - to.setZ(size); + fromZ = 0; + toZ = size; } else if (coverSide == Direction.WEST) { - from.setZ(16 - size); - to.setZ(16); + fromZ = 16 - size; + toZ = 16; } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { - from.setZ(16 - size); - to.setZ(16); + fromZ = 16 - size; + toZ = 16; } HashMap spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side quads.addAll(new CubeBuilder() - .from(from.x(), from.y(), from.z()) - .to(to.x(), to.y(), to.z()) + .from(fromX, fromY, fromZ) + .to(toX, toY, toZ) .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); @@ -193,154 +205,154 @@ public class CableCoverBakedModel extends BakedModelWrapper { // Left if (coverSide == Direction.NORTH) { if (hasEast) { - to.setX(14); + toX = 14; } else { - to.setX(16); + toX = 16; } - from.setX(16 - size); + fromX = 16 - size; } else if (coverSide == Direction.SOUTH) { if (hasWest) { - from.setX(2); + fromX = 2; } else { - from.setX(0); + fromX = 0; } - to.setX(size); + toX = size; } else if (coverSide == Direction.EAST) { - from.setZ(16 - size); - to.setZ(16); + fromZ = 16 - size; + toZ = 16; } else if (coverSide == Direction.WEST) { - from.setZ(0); - to.setZ(size); + fromZ = 0; + toZ = size; } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { - from.setZ(0); - to.setZ(size); + fromZ = 0; + toZ = size; } quads.addAll(new CubeBuilder() - .from(from.x(), from.y(), from.z()) - .to(to.x(), to.y(), to.z()) + .from(fromX, fromY, fromZ) + .to(toX, toY, toZ) .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); // Bottom if (coverSide == Direction.NORTH) { - from.setX(size); - to.setX(16 - size); + fromX = size; + toX = 16 - size; if (hasDown) { - from.setY(2); + fromY = 2; } else { - from.setY(0); + fromY = 0; } - to.setY(size); + toY = size; } else if (coverSide == Direction.SOUTH) { - from.setX(size); - to.setX(16 - size); + fromX = size; + toX = 16 - size; if (hasDown) { - from.setY(2); + fromY = 2; } else { - from.setY(0); + fromY = 0; } - to.setY(size); + toY = size; } else if (coverSide == Direction.EAST) { - from.setZ(size); - to.setZ(16 - size); + fromZ = size; + toZ = 16 - size; if (hasDown) { - from.setY(2); + fromY = 2; } else { - from.setY(0); + fromY = 0; } - to.setY(size); + toY = size; } else if (coverSide == Direction.WEST) { - from.setZ(size); - to.setZ(16 - size); + fromZ = size; + toZ = 16 - size; if (hasDown) { - from.setY(2); + fromY = 2; } else { - from.setY(0); + fromY = 0; } - to.setY(size); + toY = size; } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { - from.setZ(size); - to.setZ(16 - size); + fromZ = size; + toZ = 16 - size; - from.setX(0); - to.setX(size); + fromX = 0; + toX = size; } quads.addAll(new CubeBuilder() - .from(from.x(), from.y(), from.z()) - .to(to.x(), to.y(), to.z()) + .from(fromX, fromY, fromZ) + .to(toX, toY, toZ) .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); // Up if (coverSide == Direction.NORTH) { - from.setX(size); - to.setX(16 - size); + fromX = size; + toX = 16 - size; if (hasUp) { - to.setY(14); + toY = 14; } else { - to.setY(16); + toY = 16; } - from.setY(16 - size); + fromY = 16 - size; } else if (coverSide == Direction.SOUTH) { - from.setX(size); - to.setX(16 - size); + fromX = size; + toX = 16 - size; if (hasUp) { - to.setY(14); + toY = 14; } else { - to.setY(16); + toY = 16; } - from.setY(16 - size); + fromY = 16 - size; } else if (coverSide == Direction.EAST) { - from.setZ(size); - to.setZ(16 - size); + fromZ = size; + toZ = 16 - size; if (hasUp) { - to.setY(14); + toY = 14; } else { - to.setY(16); + toY = 16; } - from.setY(16 - size); + fromY = 16 - size; } else if (coverSide == Direction.WEST) { - from.setZ(size); - to.setZ(16 - size); + fromZ = size; + toZ = 16 - size; if (hasUp) { - to.setY(14); + toY = 14; } else { - to.setY(16); + toY = 16; } - from.setY(16 - size); + fromY = 16 - size; } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { - from.setZ(size); - to.setZ(16 - size); + fromZ = size; + toZ = 16 - size; - from.setX(16 - size); - to.setX(16); + fromX = 16 - size; + toX = 16; } quads.addAll(new CubeBuilder() - .from(from.x(), from.y(), from.z()) - .to(to.x(), to.y(), to.z()) + .from(fromX, fromY, fromZ) + .to(toX, toY, toZ) .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskDriveBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskDriveBakedModel.java index 3b4bd7e30..78e0a1efa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskDriveBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskDriveBakedModel.java @@ -3,7 +3,6 @@ package com.refinedmods.refinedstorage.render.model.baked; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.mojang.math.Vector3f; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity; @@ -15,6 +14,7 @@ import net.minecraft.util.RandomSource; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.data.ModelData; +import org.joml.Vector3f; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskManipulatorBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskManipulatorBakedModel.java index 43506f629..41926c6e0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskManipulatorBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/DiskManipulatorBakedModel.java @@ -3,7 +3,6 @@ package com.refinedmods.refinedstorage.render.model.baked; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.mojang.math.Vector3f; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; import com.refinedmods.refinedstorage.block.DiskManipulatorBlock; @@ -21,6 +20,7 @@ import net.minecraftforge.client.ChunkRenderTypeSet; import net.minecraftforge.client.RenderTypeGroup; import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.data.ModelData; +import org.joml.Vector3f; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -46,7 +46,7 @@ public class DiskManipulatorBakedModel extends BakedModelWrapper { public List load(CacheKey key) { Direction facing = key.state.getValue(RSBlocks.DISK_MANIPULATOR.get(ColorMap.DEFAULT_COLOR).get().getDirection().getProperty()); boolean connected = key.state.getValue(NetworkNodeBlock.CONNECTED); - List quads = new ArrayList<>(); + List quads; if (connected) { quads = new ArrayList<>(baseConnectedModelBakery.apply(facing, key.color).getQuads(key.state, key.side, key.random)); } else { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/PatternBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/PatternBakedModel.java index 544c769da..c7960d728 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/PatternBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/PatternBakedModel.java @@ -39,7 +39,7 @@ public class PatternBakedModel extends BakedModelWrapper { @Override public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { if (entity != null) { - ICraftingPattern pattern = PatternItem.fromCache(entity.level, stack); + ICraftingPattern pattern = PatternItem.fromCache(entity.level(), stack); if (canDisplayOutput(stack, pattern)) { ItemStack outputToRender = pattern.getOutputs().get(0); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java index 47c634fef..5d1e2095e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java @@ -1,17 +1,20 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.render.RenderSettings; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.glfw.GLFW; public abstract class AmountSpecifyingScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/amount_specifying.png"); + private final BaseScreen parent; protected EditBox amountField; @@ -26,7 +29,9 @@ public abstract class AmountSpecifyingScreen ex protected abstract Component getOkButtonText(); - protected abstract String getTexture(); + protected ResourceLocation getTexture() { + return TEXTURE; + } protected abstract int[] getIncrements(); @@ -61,7 +66,7 @@ public abstract class AmountSpecifyingScreen ex amountField.setValue(String.valueOf(getDefaultAmount())); amountField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); amountField.setCanLoseFocus(false); - amountField.changeFocus(true); + amountField.setFocused(true); amountField.setResponder(text -> { int amount = 0; try { @@ -164,17 +169,14 @@ public abstract class AmountSpecifyingScreen ex } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, getTexture()); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); - - amountField.renderButton(poseStack, 0, 0, 0); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(getTexture(), x, y, 0, 0, imageWidth, imageHeight); + amountField.render(graphics, 0, 0, 0); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); } protected void onOkButtonPressed(boolean shiftDown) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index 2b24dcfa8..467e82840 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -2,7 +2,6 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; @@ -15,9 +14,10 @@ import com.refinedmods.refinedstorage.screen.widget.sidebutton.SideButton; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Checkbox; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -39,11 +39,10 @@ import java.util.function.Consumer; import java.util.stream.Collectors; public abstract class BaseScreen extends AbstractContainerScreen { - public static final int Z_LEVEL_ITEMS = 100; - public static final int Z_LEVEL_QTY = 300; + public static final ResourceLocation ICONS_TEXTURE = new ResourceLocation(RS.ID, "textures/icons.png"); - private static final Map TEXTURE_CACHE = new HashMap<>(); - private static final Map> ACTIONS = new HashMap<>(); + private static final int Z_LEVEL_QTY = 300; + private static final Map, Queue>> ACTIONS = new HashMap<>(); private static final Component ALTERNATIVES_TEXT = Component.translatable("gui.refinedstorage.alternatives"); protected final Inventory inventory; @@ -78,8 +77,8 @@ public abstract class BaseScreen extends Abstra runActions(AbstractContainerScreen.class); } - private void runActions(Class clazz) { - Queue queue = ACTIONS.get(clazz); + private void runActions(Class clazz) { + Queue> queue = ACTIONS.get(clazz); if (queue != null && !queue.isEmpty()) { Consumer callback; @@ -91,8 +90,6 @@ public abstract class BaseScreen extends Abstra @Override public void init() { - minecraft.keyboardHandler.setSendRepeatsToGui(true); - onPreInit(); super.init(); @@ -108,13 +105,6 @@ public abstract class BaseScreen extends Abstra runActions(); } - @Override - public void removed() { - super.removed(); - - minecraft.keyboardHandler.setSendRepeatsToGui(false); - } - @Override protected void containerTick() { super.containerTick(); @@ -123,19 +113,19 @@ public abstract class BaseScreen extends Abstra } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - renderBackground(poseStack); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + renderBackground(graphics); - super.render(poseStack, mouseX, mouseY, partialTicks); + super.render(graphics, mouseX, mouseY, partialTicks); - renderTooltip(poseStack, mouseX, mouseY); + renderTooltip(graphics, mouseX, mouseY); } @Override - protected void renderBg(PoseStack poseStack, float renderPartialTicks, int mouseX, int mouseY) { + protected void renderBg(GuiGraphics graphics, float renderPartialTicks, int mouseX, int mouseY) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - renderBackground(poseStack, leftPos, topPos, mouseX, mouseY); + renderBackground(graphics, leftPos, topPos, mouseX, mouseY); for (int i = 0; i < this.menu.slots.size(); ++i) { Slot slot = menu.slots.get(i); @@ -144,10 +134,10 @@ public abstract class BaseScreen extends Abstra FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty()) { - FluidRenderer.INSTANCE.render(poseStack, leftPos + slot.x, topPos + slot.y, stack); + FluidRenderer.INSTANCE.render(graphics, leftPos + slot.x, topPos + slot.y, stack); if (((FluidFilterSlot) slot).isSizeAllowed()) { - renderQuantity(poseStack, leftPos + slot.x, topPos + slot.y, API.instance().getQuantityFormatter().formatInBucketForm(stack.getAmount()), RenderSettings.INSTANCE.getSecondaryColor()); + renderQuantity(graphics, leftPos + slot.x, topPos + slot.y, API.instance().getQuantityFormatter().formatInBucketForm(stack.getAmount()), RenderSettings.INSTANCE.getSecondaryColor()); GL11.glDisable(GL11.GL_LIGHTING); } @@ -157,17 +147,17 @@ public abstract class BaseScreen extends Abstra } @Override - protected void renderLabels(PoseStack poseStack, int mouseX, int mouseY) { + protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); mouseX -= leftPos; mouseY -= topPos; - renderForeground(poseStack, mouseX, mouseY); + renderForeground(graphics, mouseX, mouseY); - for (Widget button : this.renderables) { - if (button instanceof SideButton sideButton) { - sideButton.renderTooltip(poseStack, mouseX, mouseY); + for (Renderable renderable : this.renderables) { + if (renderable instanceof SideButton sideButton) { + sideButton.renderTooltip(graphics, mouseX, mouseY); } } @@ -178,7 +168,7 @@ public abstract class BaseScreen extends Abstra FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty() && RenderUtils.inBounds(slot.x, slot.y, 17, 17, mouseX, mouseY)) { - renderTooltip(poseStack, mouseX, mouseY, stack.getDisplayName().getString()); + renderTooltip(graphics, mouseX, mouseY, stack.getDisplayName().getString()); } } } @@ -260,93 +250,76 @@ public abstract class BaseScreen extends Abstra } public Button addButton(int x, int y, int w, int h, Component text, boolean enabled, boolean visible, Button.OnPress onPress) { - Button button = new Button(x, y, w, h, text, onPress); - + Button button = Button.builder(text, onPress).pos(x, y).size(w, h).build(); button.active = enabled; button.visible = visible; - - this.addRenderableWidget(button); - + addRenderableWidget(button); return button; } public void addSideButton(SideButton button) { - button.x = leftPos - button.getWidth() - 2; - button.y = topPos + sideButtonY; - + button.setX(leftPos - button.getWidth() - 2); + button.setY(topPos + sideButtonY); sideButtonY += button.getHeight() + 2; - sideButtons.add(button); - this.addRenderableWidget(button); + addRenderableWidget(button); } public List getSideButtons() { return sideButtons; } - public void bindTexture(String namespace, String filenameInTexturesFolder) { - RenderSystem.setShaderTexture(0, TEXTURE_CACHE.computeIfAbsent(namespace + ":" + filenameInTexturesFolder, newId -> new ResourceLocation(namespace, "textures/" + filenameInTexturesFolder))); + public void renderItem(GuiGraphics graphics, int x, int y, ItemStack stack) { + renderItem(graphics, x, y, stack, false, null, 0); } - public void renderItem(PoseStack poseStack, int x, int y, ItemStack stack) { - renderItem(poseStack, x, y, stack, false, null, 0); - } - - public void renderItem(PoseStack poseStack, int x, int y, ItemStack stack, boolean overlay, @Nullable String text, int textColor) { + public void renderItem(GuiGraphics graphics, int x, int y, ItemStack stack, boolean overlay, @Nullable String text, int textColor) { try { - setBlitOffset(Z_LEVEL_ITEMS); - itemRenderer.blitOffset = Z_LEVEL_ITEMS; - - itemRenderer.renderGuiItem(stack, x, y); - + graphics.renderItem(stack, x, y); if (overlay) { - itemRenderer.renderGuiItemDecorations(font, stack, x, y, ""); + graphics.renderItemDecorations(font, stack, x, y, ""); } - - setBlitOffset(0); - itemRenderer.blitOffset = 0; - if (text != null) { - renderQuantity(poseStack, x, y, text, textColor); + renderQuantity(graphics, x, y, text, textColor); } } catch (Throwable t) { logger.warn("Couldn't render stack: {}", ForgeRegistries.ITEMS.getKey(stack.getItem())); } } - public void renderQuantity(PoseStack poseStack, int x, int y, String qty, int color) { + public void renderQuantity(GuiGraphics graphics, int x, int y, String qty, int color) { boolean large = minecraft.isEnforceUnicode() || RS.CLIENT_CONFIG.getGrid().getLargeFont(); - poseStack.pushPose(); - poseStack.translate(x, y, Z_LEVEL_QTY); + graphics.pose().pushPose(); + graphics.pose().translate(x, y, Z_LEVEL_QTY); if (!large) { - poseStack.scale(0.5F, 0.5F, 1); + graphics.pose().scale(0.5F, 0.5F, 1); } - font.drawShadow(poseStack, qty, (large ? 16 : 30) - font.width(qty), large ? 8 : 22, color); + graphics.drawString(font, qty, (large ? 16 : 30) - font.width(qty), large ? 8 : 22, color); - poseStack.popPose(); + graphics.pose().popPose(); } - public void renderString(PoseStack poseStack, int x, int y, String message) { - renderString(poseStack, x, y, message, RenderSettings.INSTANCE.getPrimaryColor()); + public void renderString(GuiGraphics graphics, int x, int y, String message) { + renderString(graphics, x, y, message, RenderSettings.INSTANCE.getPrimaryColor()); } - public void renderString(PoseStack poseStack, int x, int y, String message, int color) { - font.draw(poseStack, message, x, y, color); + public void renderString(GuiGraphics graphics, int x, int y, String message, int color) { + graphics.drawString(font, message, x, y, color, false); } - public void renderTooltip(PoseStack poseStack, int x, int y, String lines) { - renderTooltip(poseStack, ItemStack.EMPTY, x, y, lines); + public void renderTooltip(GuiGraphics graphics, int x, int y, String lines) { + renderTooltip(graphics, ItemStack.EMPTY, x, y, lines); } - public void renderTooltip(PoseStack poseStack, @Nonnull ItemStack stack, int x, int y, String lines) { - renderTooltip(poseStack, stack, x, y, Arrays.stream(lines.split("\n")).map(Component::literal).collect(Collectors.toList())); + public void renderTooltip(GuiGraphics graphics, @Nonnull ItemStack stack, int x, int y, String lines) { + renderTooltip(graphics, stack, x, y, Arrays.stream(lines.split("\n")).map(Component::literal).collect(Collectors.toList())); } - public void renderTooltip(PoseStack poseStack, @Nonnull ItemStack stack, int x, int y, List lines) { - renderComponentTooltip(poseStack, lines, x, y, stack); + public void renderTooltip(GuiGraphics graphics, @Nonnull ItemStack stack, int x, int y, List lines) { + graphics.renderComponentTooltip(font, lines, x, y, stack); } protected void onPreInit() { @@ -357,7 +330,7 @@ public abstract class BaseScreen extends Abstra public abstract void tick(int x, int y); - public abstract void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY); + public abstract void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY); - public abstract void renderForeground(PoseStack poseStack, int mouseX, int mouseY); + public abstract void renderForeground(GuiGraphics graphics, int mouseX, int mouseY); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java index 30166d06f..0c4868f54 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java @@ -1,19 +1,22 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity; +import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.container.ConstructorContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ConstructorDropSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity; -import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class ConstructorScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/constructor.png"); + public ConstructorScreen(ConstructorContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 211, 137, inventory, title); } @@ -34,15 +37,13 @@ public class ConstructorScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/constructor.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java index 922a6d3e2..db7807503 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java @@ -4,19 +4,23 @@ import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.apiimpl.network.Network; +import com.refinedmods.refinedstorage.blockentity.ClientNode; +import com.refinedmods.refinedstorage.blockentity.ControllerBlockEntity; import com.refinedmods.refinedstorage.container.ControllerContainerMenu; import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.refinedmods.refinedstorage.blockentity.ClientNode; -import com.refinedmods.refinedstorage.blockentity.ControllerBlockEntity; import com.refinedmods.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import java.util.List; public class ControllerScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/controller.png"); + private static final int VISIBLE_ROWS = 2; private static final int ENERGY_BAR_X = 8; @@ -44,16 +48,14 @@ public class ControllerScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/controller.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); int energyBarHeightNew = Network.getEnergyScaled(ControllerBlockEntity.ENERGY_STORED.getValue(), ControllerBlockEntity.ENERGY_CAPACITY.getValue(), ENERGY_BAR_HEIGHT); - blit(poseStack, x + ENERGY_BAR_X, y + ENERGY_BAR_Y + ENERGY_BAR_HEIGHT - energyBarHeightNew, 178, ENERGY_BAR_HEIGHT - energyBarHeightNew, ENERGY_BAR_WIDTH, energyBarHeightNew); + graphics.blit(TEXTURE, x + ENERGY_BAR_X, y + ENERGY_BAR_Y + ENERGY_BAR_HEIGHT - energyBarHeightNew, 178, ENERGY_BAR_HEIGHT - energyBarHeightNew, ENERGY_BAR_WIDTH, energyBarHeightNew); - scrollbar.render(poseStack); + scrollbar.render(graphics); } @Override @@ -79,9 +81,9 @@ public class ControllerScreen extends BaseScreen { } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 87, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 87, I18n.get("container.inventory")); int x = 33; int y = 26; @@ -98,20 +100,21 @@ public class ControllerScreen extends BaseScreen { if (slot < nodes.size()) { ClientNode node = nodes.get(slot); - renderItem(poseStack, x, y + 5, node.getStack()); + renderItem(graphics, x, y + 5, node.getStack()); float scale = minecraft.isEnforceUnicode() ? 1F : 0.5F; + final PoseStack poseStack = graphics.pose(); poseStack.pushPose(); poseStack.scale(scale, scale, 1); renderString( - poseStack, + graphics, RenderUtils.getOffsetOnScale(x + 1, scale), RenderUtils.getOffsetOnScale(y - 2, scale), trimNameIfNeeded(!minecraft.isEnforceUnicode(), node.getStack().getHoverName().getString()) ); - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 21, scale), RenderUtils.getOffsetOnScale(y + 10, scale), node.getAmount() + "x"); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 21, scale), RenderUtils.getOffsetOnScale(y + 10, scale), node.getAmount() + "x"); poseStack.popPose(); @@ -131,11 +134,11 @@ public class ControllerScreen extends BaseScreen { } if (hoveringNode != null) { - renderTooltip(poseStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage_minimal", hoveringNode.getEnergyUsage())); + renderTooltip(graphics, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage_minimal", hoveringNode.getEnergyUsage())); } if (RenderUtils.inBounds(ENERGY_BAR_X, ENERGY_BAR_Y, ENERGY_BAR_WIDTH, ENERGY_BAR_HEIGHT, mouseX, mouseY)) { - renderTooltip(poseStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage", ControllerBlockEntity.ENERGY_USAGE.getValue()) + "\n" + I18n.get("misc.refinedstorage.energy_stored", ControllerBlockEntity.ENERGY_STORED.getValue(), ControllerBlockEntity.ENERGY_CAPACITY.getValue())); + renderTooltip(graphics, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage", ControllerBlockEntity.ENERGY_USAGE.getValue()) + "\n" + I18n.get("misc.refinedstorage.energy_stored", ControllerBlockEntity.ENERGY_STORED.getValue(), ControllerBlockEntity.ENERGY_CAPACITY.getValue())); } } @@ -144,7 +147,7 @@ public class ControllerScreen extends BaseScreen { } private String trimNameIfNeeded(boolean scaled, String name) { - int max = scaled ? 20 : 13; + int max = scaled ? 19 : 12; if (name.length() > max) { name = name.substring(0, max) + "..."; } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index d3743a186..89abb8e6f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -16,8 +16,10 @@ import com.refinedmods.refinedstorage.blockentity.CrafterManagerBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.Slot; import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak; @@ -26,6 +28,8 @@ import java.util.Map; @MouseTweaksDisableWheelTweak public class CrafterManagerScreen extends BaseScreen implements IScreenInfoProvider { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/crafter_manager.png"); + private final CrafterManagerNetworkNode crafterManager; private ScrollbarWidget scrollbar; @@ -65,8 +69,8 @@ public class CrafterManagerScreen extends BaseScreen heading : menu.getHeadings().entrySet()) { int y = heading.getValue(); if (y >= getTopHeight() - 1 && y < getTopHeight() + getVisibleRows() * 18 - 1) { RenderSystem.setShaderColor(1, 1, 1, 1); - bindTexture(RS.ID, "gui/crafter_manager.png"); - - blit(poseStack, 7, y, 0, 174, 18 * 9, 18); - - renderString(poseStack, 7 + 4, y + 6, RenderUtils.shorten(I18n.get(heading.getKey()), 25)); + graphics.blit(TEXTURE, 7, y, 0, 174, 18 * 9, 18); + renderString(graphics, 7 + 4, y + 6, RenderUtils.shorten(I18n.get(heading.getKey()), 25)); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java index 0b32e2b4c..e30a0f897 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java @@ -1,14 +1,17 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.container.CrafterContainerMenu; import com.refinedmods.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class CrafterScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/crafter.png"); + public CrafterScreen(CrafterContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 211, 137, inventory, title); } @@ -24,15 +27,13 @@ public class CrafterScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/crafter.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, RenderUtils.shorten(title.getString(), 26)); - renderString(poseStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, RenderUtils.shorten(title.getString(), 26)); + renderString(graphics, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java index d76e5fc83..197f0baf8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java @@ -2,7 +2,6 @@ package com.refinedmods.refinedstorage.screen; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.Lighting; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; @@ -13,17 +12,19 @@ import com.refinedmods.refinedstorage.api.util.IFilter; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.render.CraftingMonitorElementDrawers; import com.refinedmods.refinedstorage.apiimpl.render.ElementDrawers; +import com.refinedmods.refinedstorage.blockentity.craftingmonitor.ICraftingMonitor; import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorCancelMessage; import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; import com.refinedmods.refinedstorage.screen.widget.TabListWidget; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.refinedmods.refinedstorage.blockentity.craftingmonitor.ICraftingMonitor; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -35,6 +36,8 @@ import java.util.Optional; import java.util.UUID; public class CraftingMonitorScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/crafting_preview.png"); + private static final int ROWS = 5; private static final int ITEM_WIDTH = 73; private static final int ITEM_HEIGHT = 29; @@ -176,23 +179,21 @@ public class CraftingMonitorScreen extends BaseScreen lines = Lists.newArrayList(requested.getItem() != null ? requested.getItem().getHoverName() : requested.getFluid().getDisplayName()); int totalSecs = (int) (System.currentTimeMillis() - executionStarted) / 1000; @@ -300,7 +301,7 @@ public class CraftingMonitorScreen extends BaseScreen itemDrawer, IElementDrawer fluidDrawer) { + public void drawIcon(GuiGraphics graphics, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { if (requested.getItem() != null) { Lighting.setupFor3DItems(); - - itemDrawer.draw(poseStack, x, y, requested.getItem()); + itemDrawer.draw(graphics, x, y, requested.getItem()); } else { - fluidDrawer.draw(poseStack, x, y, requested.getFluid()); + fluidDrawer.draw(graphics, x, y, requested.getFluid()); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java index 673e13c7a..f47e5a8cb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java @@ -1,16 +1,19 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.DestructorContainerMenu; -import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; +import com.refinedmods.refinedstorage.container.DestructorContainerMenu; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class DestructorScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/destructor.png"); + public DestructorScreen(DestructorContainerMenu containerMenu, Inventory playerInventory, Component title) { super(containerMenu, 211, 137, playerInventory, title); } @@ -34,15 +37,13 @@ public class DestructorScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/destructor.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java index c32428816..157cf38ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java @@ -1,21 +1,24 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity; +import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.container.DetectorContainerMenu; import com.refinedmods.refinedstorage.render.RenderSettings; import com.refinedmods.refinedstorage.screen.widget.sidebutton.DetectorModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity; -import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import org.lwjgl.glfw.GLFW; public class DetectorScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/detector.png"); + private EditBox amountField; public DetectorScreen(DetectorContainerMenu containerMenu, Inventory inventory, Component title) { @@ -35,7 +38,7 @@ public class DetectorScreen extends BaseScreen { amountField.setBordered(false); amountField.setVisible(true); amountField.setCanLoseFocus(true); - amountField.setFocus(false); + amountField.setFocused(false); amountField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); amountField.setResponder(value -> { try { @@ -60,16 +63,14 @@ public class DetectorScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/detector.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 43, I18n.get("container.inventory")); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java index b69bcd9ca..97cfff255 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java @@ -1,11 +1,13 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.container.DiskDriveContainerMenu; +import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; +import com.refinedmods.refinedstorage.container.DiskDriveContainerMenu; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class DiskDriveScreen extends StorageScreen { @@ -14,7 +16,7 @@ public class DiskDriveScreen extends StorageScreen { containerMenu, inventory, title, - "gui/disk_drive.png", + new ResourceLocation(RS.ID, "textures/gui/disk_drive.png"), new StorageScreenSynchronizationParameters( DiskDriveBlockEntity.TYPE, NetworkNodeBlockEntity.REDSTONE_MODE, @@ -29,9 +31,8 @@ public class DiskDriveScreen extends StorageScreen { } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 79, 42, I18n.get("gui.refinedstorage.disk_drive.disks")); - - super.renderForeground(poseStack, mouseX, mouseY); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 79, 42, I18n.get("gui.refinedstorage.disk_drive.disks")); + super.renderForeground(graphics, mouseX, mouseY); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java index 1ccf51a94..bcde7cb9b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java @@ -1,16 +1,19 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.DiskManipulatorContainerMenu; -import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainerMenu; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class DiskManipulatorScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/disk_manipulator.png"); + public DiskManipulatorScreen(DiskManipulatorContainerMenu containerMenu, Inventory playerInventory, Component title) { super(containerMenu, 211, 211, playerInventory, title); } @@ -30,17 +33,15 @@ public class DiskManipulatorScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/exporter.png"); + private boolean hasRegulatorMode; public ExporterScreen(ExporterContainerMenu containerMenu, Inventory playerInventory, Component title) { @@ -46,15 +49,13 @@ public class ExporterScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/exporter.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java index a1cf0dfa1..e84ee0b63 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java @@ -1,9 +1,11 @@ package com.refinedmods.refinedstorage.screen; -import com.refinedmods.refinedstorage.container.ExternalStorageContainerMenu; +import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.blockentity.ExternalStorageBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; +import com.refinedmods.refinedstorage.container.ExternalStorageContainerMenu; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class ExternalStorageScreen extends StorageScreen { @@ -12,7 +14,7 @@ public class ExternalStorageScreen extends StorageScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/filter.png"); + private final ItemStack stack; private final String name; private int compare; @@ -71,7 +74,7 @@ public class FilterScreen extends BaseScreen { nameField.setBordered(false); nameField.setVisible(true); nameField.setCanLoseFocus(true); - nameField.setFocus(false); + nameField.setFocused(false); nameField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); nameField.setResponder(content -> sendUpdate()); @@ -87,7 +90,7 @@ public class FilterScreen extends BaseScreen { modeButton.setWidth(font.width(text.getString()) + 12); modeButton.setMessage(text); - modFilterCheckBox.x = modeButton.x + modeButton.getWidth() + 4; + modFilterCheckBox.setX(modeButton.getX() + modeButton.getWidth() + 4); } @Override @@ -111,16 +114,14 @@ public class FilterScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/filter.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 137, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 137, I18n.get("container.inventory")); } public int getType() { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java index 0a2125bfd..8ede68c49 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.network.SetFluidFilterSlotMessage; import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; - +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; @@ -15,6 +15,9 @@ import javax.annotation.Nullable; import java.util.function.UnaryOperator; public class FluidAmountScreen extends AmountSpecifyingScreen { + private static final ResourceLocation TEXTURE_WIDE = new ResourceLocation(RS.ID, "textures/gui/amount_specifying_wide.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/amount_specifying.png"); + private final int containerSlot; private final FluidStack stack; private final int maxAmount; @@ -40,7 +43,7 @@ public class FluidAmountScreen extends AmountSpecifyingScreen minecraft.setScreen(alternativesScreenFactory.apply(this))); + addButton(x + 114, cancelButton.getY() + 24, getOkCancelButtonWidth(), 20, Component.translatable("gui.refinedstorage.alternatives"), true, true, btn -> minecraft.setScreen(alternativesScreenFactory.apply(this))); } } @@ -74,8 +77,8 @@ public class FluidAmountScreen extends AmountSpecifyingScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/fluid_interface.png"); private static final FluidRenderer TANK_RENDERER = new FluidRenderer(FluidInterfaceNetworkNode.TANK_CAPACITY, 12, 47, 1); public FluidInterfaceScreen(FluidInterfaceContainerMenu containerMenu, Inventory inventory, Component title) { @@ -33,33 +35,31 @@ public class FluidInterfaceScreen extends BaseScreen { @@ -12,7 +14,7 @@ public class FluidStorageBlockScreen extends StorageScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/importer.png"); + public ImporterScreen(ImporterContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 211, 137, inventory, title); } @@ -35,15 +38,13 @@ public class ImporterScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/importer.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java index 6fa7de728..331397127 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java @@ -1,17 +1,20 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.container.InterfaceContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity; -import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class InterfaceScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/interface.png"); + public InterfaceScreen(InterfaceContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 211, 217, inventory, title); } @@ -29,16 +32,14 @@ public class InterfaceScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/interface.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, I18n.get("gui.refinedstorage.interface.import")); - renderString(poseStack, 7, 42, I18n.get("gui.refinedstorage.interface.export")); - renderString(poseStack, 7, 122, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, I18n.get("gui.refinedstorage.interface.import")); + renderString(graphics, 7, 42, I18n.get("gui.refinedstorage.interface.export")); + renderString(graphics, 7, 122, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java index 8991b8d70..728bd92df 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.container.AmountContainerMenu; import com.refinedmods.refinedstorage.network.SetFilterSlotMessage; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; - +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; @@ -15,6 +15,9 @@ import javax.annotation.Nullable; import java.util.function.UnaryOperator; public class ItemAmountScreen extends AmountSpecifyingScreen { + private static final ResourceLocation TEXTURE_WIDE = new ResourceLocation(RS.ID, "textures/gui/amount_specifying_wide.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/amount_specifying.png"); + private final int containerSlot; private final ItemStack stack; private final int maxAmount; @@ -40,7 +43,7 @@ public class ItemAmountScreen extends AmountSpecifyingScreen minecraft.setScreen(alternativesScreenFactory.apply(this))); + addButton(x + 114, cancelButton.getY() + 24, getOkCancelButtonWidth(), 20, Component.translatable("gui.refinedstorage.alternatives"), true, true, btn -> minecraft.setScreen(alternativesScreenFactory.apply(this))); } } @@ -74,8 +77,8 @@ public class ItemAmountScreen extends AmountSpecifyingScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/network_transmitter.png"); + public NetworkTransmitterScreen(NetworkTransmitterContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 176, 137, inventory, title); } @@ -29,15 +31,13 @@ public class NetworkTransmitterScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/priority.png"); + private final BlockEntitySynchronizationParameter priority; public PriorityScreen(BaseScreen parent, BlockEntitySynchronizationParameter priority, Inventory inventory) { @@ -40,8 +43,8 @@ public class PriorityScreen extends AmountSpecifyingScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/relay.png"); + public RelayScreen(RelayContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 176, 131, inventory, title); } @@ -25,15 +28,13 @@ public class RelayScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/relay.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, 39, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, 39, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java index d531246e8..b6d7ae563 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java @@ -1,23 +1,25 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; +import com.refinedmods.refinedstorage.blockentity.SecurityManagerBlockEntity; import com.refinedmods.refinedstorage.container.SecurityManagerContainerMenu; import com.refinedmods.refinedstorage.item.SecurityCardItem; import com.refinedmods.refinedstorage.network.SecurityManagerUpdateMessage; import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; -import com.refinedmods.refinedstorage.blockentity.SecurityManagerBlockEntity; import com.refinedmods.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; - +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; public class SecurityManagerScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/security_manager.png"); + private final SecurityManagerBlockEntity securityManager; private final CheckboxWidget[] permissions = new CheckboxWidget[Permission.values().length]; @@ -34,11 +36,11 @@ public class SecurityManagerScreen extends BaseScreen handle(0)); - permissions[1] = addCheckBox(permissions[0].x, permissions[0].y + padding, Component.translatable("gui.refinedstorage.security_manager.permission.1"), false, btn -> handle(1)); - permissions[2] = addCheckBox(permissions[1].x, permissions[1].y + padding, Component.translatable("gui.refinedstorage.security_manager.permission.2"), false, btn -> handle(2)); - permissions[3] = addCheckBox(permissions[0].x + 90, permissions[0].y, Component.translatable("gui.refinedstorage.security_manager.permission.3"), false, btn -> handle(3)); - permissions[4] = addCheckBox(permissions[3].x, permissions[3].y + padding, Component.translatable("gui.refinedstorage.security_manager.permission.4"), false, btn -> handle(4)); - permissions[5] = addCheckBox(permissions[4].x, permissions[4].y + padding, Component.translatable("gui.refinedstorage.security_manager.permission.5"), false, btn -> handle(5)); + permissions[1] = addCheckBox(permissions[0].getX(), permissions[0].getY() + padding, Component.translatable("gui.refinedstorage.security_manager.permission.1"), false, btn -> handle(1)); + permissions[2] = addCheckBox(permissions[1].getX(), permissions[1].getY() + padding, Component.translatable("gui.refinedstorage.security_manager.permission.2"), false, btn -> handle(2)); + permissions[3] = addCheckBox(permissions[0].getX() + 90, permissions[0].getY(), Component.translatable("gui.refinedstorage.security_manager.permission.3"), false, btn -> handle(3)); + permissions[4] = addCheckBox(permissions[3].getX(), permissions[3].getY() + padding, Component.translatable("gui.refinedstorage.security_manager.permission.4"), false, btn -> handle(4)); + permissions[5] = addCheckBox(permissions[4].getX(), permissions[4].getY() + padding, Component.translatable("gui.refinedstorage.security_manager.permission.5"), false, btn -> handle(5)); } private void handle(int i) { @@ -55,24 +57,20 @@ public class SecurityManagerScreen extends BaseScreen getHeight - if (RenderUtils.inBounds(permission.x - leftPos, permission.y - topPos, permission.getWidth(), permission.getHeight(), mouseX, mouseY)) { - renderTooltip(poseStack, mouseX, mouseY, I18n.get("gui.refinedstorage.security_manager.permission." + i + ".tooltip")); + if (RenderUtils.inBounds(permission.getX() - leftPos, permission.getY() - topPos, permission.getWidth(), permission.getHeight(), mouseX, mouseY)) { + renderTooltip(graphics, mouseX, mouseY, I18n.get("gui.refinedstorage.security_manager.permission." + i + ".tooltip")); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java index a0f7118c2..88c551433 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java @@ -1,9 +1,11 @@ package com.refinedmods.refinedstorage.screen; -import com.refinedmods.refinedstorage.container.StorageContainerMenu; +import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.blockentity.StorageBlockEntity; +import com.refinedmods.refinedstorage.container.StorageContainerMenu; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class StorageBlockScreen extends StorageScreen { @@ -12,7 +14,7 @@ public class StorageBlockScreen extends StorageScreen { containerMenu, inventory, title, - "gui/storage.png", + new ResourceLocation(RS.ID, "textures/gui/storage.png"), new StorageScreenSynchronizationParameters( null, NetworkNodeBlockEntity.REDSTONE_MODE, diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java index 480032e9a..a41009820 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java @@ -1,16 +1,19 @@ package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity; import com.refinedmods.refinedstorage.container.StorageMonitorContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class StorageMonitorScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/storage_monitor.png"); + public StorageMonitorScreen(StorageMonitorContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 211, 137, inventory, title); } @@ -27,15 +30,13 @@ public class StorageMonitorScreen extends BaseScreen extends BaseScreen storedSupplier; private final Supplier capacitySupplier; @@ -28,7 +27,7 @@ public class StorageScreen extends BaseScreen storedSupplier, Supplier capacitySupplier) { @@ -81,25 +80,23 @@ public class StorageScreen extends BaseScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/wireless_transmitter.png"); + public WirelessTransmitterScreen(WirelessTransmitterContainerMenu containerMenu, Inventory inventory, Component title) { super(containerMenu, 211, 137, inventory, title); } @@ -26,16 +29,14 @@ public class WirelessTransmitterScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/alternatives.png"); + private static final int VISIBLE_ROWS = 5; private final Screen parent; @@ -163,17 +165,14 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/alternatives.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); - - scrollbar.render(poseStack); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); + scrollbar.render(graphics); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); int x = 8; int y = 20; @@ -183,7 +182,7 @@ public class AlternativesScreen extends BaseScreen { if (visible) { lines.get(i).layoutDependantControls(true, leftPos + x + 3, topPos + y + 3); - lines.get(i).render(poseStack, x, y); + lines.get(i).render(graphics, x, y); y += 18; } else { @@ -198,7 +197,7 @@ public class AlternativesScreen extends BaseScreen { boolean visible = i >= scrollbar.getOffset() && i < scrollbar.getOffset() + VISIBLE_ROWS; if (visible) { - lines.get(i).renderTooltip(poseStack, x, y, mouseX, mouseY); + lines.get(i).renderTooltip(graphics, x, y, mouseX, mouseY); y += 18; } @@ -273,10 +272,10 @@ public class AlternativesScreen extends BaseScreen { } private interface Line { - default void render(PoseStack poseStack, int x, int y) { + default void render(GuiGraphics graphics, int x, int y) { } - default void renderTooltip(PoseStack poseStack, int x, int y, int mx, int my) { + default void renderTooltip(GuiGraphics graphics, int x, int y, int mx, int my) { } default void layoutDependantControls(boolean visible, int x, int y) { @@ -291,10 +290,10 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack poseStack, int x, int y) { + public void render(GuiGraphics graphics, int x, int y) { RenderSystem.setShaderColor(1, 1, 1, 1); - renderItem(poseStack, x + 3, y + 2, item); - renderString(poseStack, x + 4 + 19, y + 7, item.getHoverName().getString()); + renderItem(graphics, x + 3, y + 2, item); + renderString(graphics, x + 4 + 19, y + 7, item.getHoverName().getString()); } } @@ -306,9 +305,9 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack poseStack, int x, int y) { - FluidRenderer.INSTANCE.render(poseStack, x + 3, y + 2, fluid); - renderString(poseStack, x + 4 + 19, y + 7, fluid.getDisplayName().getString()); + public void render(GuiGraphics graphics, int x, int y) { + FluidRenderer.INSTANCE.render(graphics, x + 3, y + 2, fluid); + renderString(graphics, x + 4 + 19, y + 7, fluid.getDisplayName().getString()); } } @@ -329,8 +328,8 @@ public class AlternativesScreen extends BaseScreen { @Override public void layoutDependantControls(boolean visible, int x, int y) { widget.visible = visible; - widget.x = x; - widget.y = y; + widget.setX(x); + widget.setY(y); } } @@ -342,19 +341,19 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack poseStack, int x, int y) { + public void render(GuiGraphics graphics, int x, int y) { for (ItemStack itemInList : items) { - renderItem(poseStack, x + 3, y, itemInList); + renderItem(graphics, x + 3, y, itemInList); x += 17; } } @Override - public void renderTooltip(PoseStack poseStack, int x, int y, int mx, int my) { + public void renderTooltip(GuiGraphics graphics, int x, int y, int mx, int my) { for (ItemStack itemInList : items) { if (RenderUtils.inBounds(x + 3, y, 16, 16, mx, my)) { - AlternativesScreen.this.renderTooltip(poseStack, itemInList, mx, my, RenderUtils.getTooltipFromItem(itemInList)); + AlternativesScreen.this.renderTooltip(graphics, itemInList, mx, my, RenderUtils.getTooltipFromItem(itemInList)); } x += 17; @@ -370,19 +369,19 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack poseStack, int x, int y) { + public void render(GuiGraphics graphics, int x, int y) { for (FluidStack fluidInList : fluids) { - FluidRenderer.INSTANCE.render(poseStack, x + 3, y, fluidInList); + FluidRenderer.INSTANCE.render(graphics, x + 3, y, fluidInList); x += 17; } } @Override - public void renderTooltip(PoseStack poseStack, int x, int y, int mx, int my) { + public void renderTooltip(GuiGraphics graphics, int x, int y, int mx, int my) { for (FluidStack fluidInList : fluids) { if (RenderUtils.inBounds(x + 3, y, 16, 16, mx, my)) { - AlternativesScreen.this.renderTooltip(poseStack, mx, my, fluidInList.getDisplayName().getString()); + AlternativesScreen.this.renderTooltip(graphics, mx, my, fluidInList.getDisplayName().getString()); } x += 17; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java index f10acaf66..ba99452d3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java @@ -17,10 +17,12 @@ import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -36,6 +38,8 @@ import java.util.List; import java.util.UUID; public class CraftingPreviewScreen extends BaseScreen { + private static final ResourceLocation TEXTURE = new ResourceLocation(RS.ID, "textures/gui/crafting_preview.png"); + private static final int VISIBLE_ROWS = 5; private final List elements; @@ -97,21 +101,19 @@ public class CraftingPreviewScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - bindTexture(RS.ID, "gui/crafting_preview.png"); - - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); if (getError() != null) { - fill(poseStack, x + 7, y + 20, x + 228, y + 169, 0xFFDBDBDB); + graphics.fill(x + 7, y + 20, x + 228, y + 169, 0xFFDBDBDB); } - scrollbar.render(poseStack); + scrollbar.render(graphics); } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); int x = 7; int y = 15; @@ -120,13 +122,13 @@ public class CraftingPreviewScreen extends BaseScreen { ErrorCraftingPreviewElement error = getError(); if (error != null) { - renderError(poseStack, x, y, scale, error); + renderError(graphics, x, y, scale, error); } else { - renderPreview(poseStack, mouseX, mouseY, x, y); + renderPreview(graphics, mouseX, mouseY, x, y); } } - private void renderPreview(PoseStack poseStack, int mouseX, int mouseY, int x, int y) { + private void renderPreview(GuiGraphics graphics, int mouseX, int mouseY, int x, int y) { int slot = scrollbar != null ? (scrollbar.getOffset() * 3) : 0; Lighting.setupFor3DItems(); @@ -137,7 +139,7 @@ public class CraftingPreviewScreen extends BaseScreen { for (int i = 0; i < 3 * 5; ++i) { if (slot < elements.size()) { - renderElement(poseStack, mouseX, mouseY, x, y, elements.get(slot)); + renderElement(graphics, mouseX, mouseY, x, y, elements.get(slot)); } if ((i + 1) % 3 == 0) { @@ -151,8 +153,8 @@ public class CraftingPreviewScreen extends BaseScreen { } } - private void renderElement(PoseStack poseStack, int mouseX, int mouseY, int x, int y, ICraftingPreviewElement element) { - element.draw(poseStack, x, y + 5, drawers); + private void renderElement(GuiGraphics graphics, int mouseX, int mouseY, int x, int y, ICraftingPreviewElement element) { + element.draw(graphics, x, y + 5, drawers); if (RenderUtils.inBounds(x + 5, y + 7, 16, 16, mouseX, mouseY)) { this.hoveringStack = element instanceof ItemCraftingPreviewElement ? ((ItemCraftingPreviewElement) element).getStack() : null; @@ -163,18 +165,19 @@ public class CraftingPreviewScreen extends BaseScreen { } } - private void renderError(PoseStack poseStack, int x, int y, float scale, ErrorCraftingPreviewElement errorElement) { + private void renderError(GuiGraphics graphics, int x, int y, float scale, ErrorCraftingPreviewElement errorElement) { + final PoseStack poseStack = graphics.pose(); poseStack.pushPose(); poseStack.scale(scale, scale, 1); - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 11, scale), I18n.get("gui.refinedstorage.crafting_preview.error")); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 11, scale), I18n.get("gui.refinedstorage.crafting_preview.error")); switch (errorElement.getType()) { case RECURSIVE: - renderRecursiveError(poseStack, x, y, scale, errorElement.getRecursedPattern()); + renderRecursiveError(graphics, x, y, scale, errorElement.getRecursedPattern()); break; case TOO_COMPLEX: - renderTooComplexError(poseStack, x, y, scale); + renderTooComplexError(graphics, x, y, scale); break; default: break; @@ -183,29 +186,29 @@ public class CraftingPreviewScreen extends BaseScreen { poseStack.popPose(); } - private void renderTooComplexError(PoseStack poseStack, int x, int y, float scale) { - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.0")); - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.1")); + private void renderTooComplexError(GuiGraphics graphics, int x, int y, float scale) { + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.0")); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.1")); } - private void renderRecursiveError(PoseStack poseStack, int x, int y, float scale, ItemStack recursedPattern) { - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.0")); - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.1")); - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 41, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.2")); - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 51, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.3")); + private void renderRecursiveError(GuiGraphics graphics, int x, int y, float scale, ItemStack recursedPattern) { + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.0")); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.1")); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 41, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.2")); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 51, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.3")); - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 61, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.4")); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 61, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.4")); ICraftingPattern pattern = PatternItem.fromCache(parent.getMinecraft().level, recursedPattern); int yy = 83; for (ItemStack output : pattern.getOutputs()) { if (output != null) { - renderString(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy + 6, scale), output.getHoverName().getString()); + renderString(graphics, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy + 6, scale), output.getHoverName().getString()); Lighting.setupFor3DItems(); RenderSystem.enableDepthTest(); - renderItem(poseStack, x + 5, yy, output); + renderItem(graphics, x + 5, yy, output); yy += 17; } @@ -213,12 +216,12 @@ public class CraftingPreviewScreen extends BaseScreen { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - super.render(poseStack, mouseX, mouseY, partialTicks); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + super.render(graphics, mouseX, mouseY, partialTicks); if (hoveringStack != null) { renderTooltip( - poseStack, + graphics, hoveringStack, mouseX, mouseY, @@ -228,7 +231,7 @@ public class CraftingPreviewScreen extends BaseScreen { ) ); } else if (hoveringFluid != null) { - renderTooltip(poseStack, mouseX, mouseY, hoveringFluid.getDisplayName().getString()); + renderTooltip(graphics, mouseX, mouseY, hoveringFluid.getDisplayName().getString()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java index 278722719..9c2e16e1c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java @@ -8,7 +8,6 @@ import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.grid.stack.FluidGridStack; import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import net.minecraft.network.chat.Component; - import net.minecraft.world.entity.player.Player; import net.minecraftforge.fluids.FluidType; @@ -26,11 +25,6 @@ public class CraftingSettingsScreen extends AmountSpecifyingScreen implements IScreenInfoProvider { + private static final ResourceLocation PORTABLE_GRID_TEXTURE = new ResourceLocation(RS.ID, "textures/gui/portable_grid.png"); + private static final ResourceLocation CRAFTING_GRID_TEXTURE = new ResourceLocation(RS.ID, "textures/gui/crafting_grid.png"); + private static final ResourceLocation PATTERN_GRID_TEXTURE = new ResourceLocation(RS.ID, "textures/gui/pattern_grid.png"); + private static final ResourceLocation PATTERN_GRID_PROCESSING_TEXTURE = new ResourceLocation(RS.ID, "textures/gui/pattern_grid_processing.png"); + private static final ResourceLocation GRID_TEXTURE = new ResourceLocation(RS.ID, "textures/gui/grid.png"); + private static String searchQuery = ""; private final IGrid grid; private final TabListWidget tabs; @@ -62,6 +69,8 @@ public class GridScreen extends BaseScreen implements IScreen private boolean wasConnected; private boolean doSort; private int slotNumber; + private int slotNumberX; + private int slotNumberY; private int patternScrollOffset; private int patternScrollOffsetMax; private boolean updatePatternOffset; @@ -141,8 +150,8 @@ public class GridScreen extends BaseScreen implements IScreen searchField.setMode(grid.getSearchBoxMode()); searchField.setValue(searchQuery); } else { - searchField.x = sx; - searchField.y = sy; + searchField.setX(sx); + searchField.setY(sy); } addRenderableWidget(searchField); @@ -183,7 +192,7 @@ public class GridScreen extends BaseScreen implements IScreen if (!processingPattern.selected()) { exactPattern = addCheckBox( - processingPattern.x + processingPattern.getWidth() + 5, + processingPattern.getX() + processingPattern.getWidth() + 5, y + getTopHeight() + (getVisibleRows() * 18) + 60, Component.translatable("misc.refinedstorage.exact"), GridBlockEntity.EXACT_PATTERN.getValue(), @@ -193,7 +202,7 @@ public class GridScreen extends BaseScreen implements IScreen } else { patternScrollbar.setEnabled(true); - fluidCheckBox = addCheckBox(processingPattern.x + processingPattern.getWidth() + 5, y + getTopHeight() + (getVisibleRows() * 18) + 60, Component.translatable("misc.refinedstorage.fluidmode"), ((GridNetworkNode) grid).getType() == IType.FLUIDS, button -> { + fluidCheckBox = addCheckBox(processingPattern.getX() + processingPattern.getWidth() + 5, y + getTopHeight() + (getVisibleRows() * 18) + 60, Component.translatable("misc.refinedstorage.fluidmode"), ((GridNetworkNode) grid).getType() == IType.FLUIDS, button -> { BlockEntitySynchronizationManager.setParameter(GridBlockEntity.PROCESSING_TYPE, GridBlockEntity.PROCESSING_TYPE.getValue() == IType.ITEMS ? IType.FLUIDS : IType.ITEMS); }); } @@ -314,6 +323,14 @@ public class GridScreen extends BaseScreen implements IScreen return slotNumber; } + public int getSlotNumberX() { + return slotNumberX; + } + + public int getSlotNumberY() { + return slotNumberY; + } + private boolean isOverClear(double mouseX, double mouseY) { int y = getTopHeight() + (getVisibleRows() * 18) + 4; @@ -336,25 +353,26 @@ public class GridScreen extends BaseScreen implements IScreen } @Override - public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { - tabs.drawBackground(poseStack, x, y - tabs.getHeight()); + public void renderBackground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { + tabs.drawBackground(graphics, x, y - tabs.getHeight()); + ResourceLocation texture; if (grid instanceof IPortableGrid) { - bindTexture(RS.ID, "gui/portable_grid.png"); + texture = PORTABLE_GRID_TEXTURE; } else if (grid.getGridType() == GridType.CRAFTING) { - bindTexture(RS.ID, "gui/crafting_grid.png"); + texture = CRAFTING_GRID_TEXTURE; } else if (grid.getGridType() == GridType.PATTERN) { - bindTexture(RS.ID, "gui/pattern_grid" + (((GridNetworkNode) grid).isProcessingPattern() ? "_processing" : "") + ".png"); + texture = ((GridNetworkNode) grid).isProcessingPattern() ? PATTERN_GRID_PROCESSING_TEXTURE : PATTERN_GRID_TEXTURE; } else { - bindTexture(RS.ID, "gui/grid.png"); + texture = GRID_TEXTURE; } int yy = y; - blit(poseStack, x, yy, 0, 0, imageWidth - 34, getTopHeight()); + graphics.blit(texture, x, yy, 0, 0, imageWidth - 34, getTopHeight()); // Filters and/or portable grid disk - blit(poseStack, x + imageWidth - 34 + 4, y, 197, 0, 30, grid instanceof IPortableGrid ? 114 : 82); + graphics.blit(texture, x + imageWidth - 34 + 4, y, 197, 0, 30, grid instanceof IPortableGrid ? 114 : 82); int rows = getVisibleRows(); @@ -370,12 +388,12 @@ public class GridScreen extends BaseScreen implements IScreen } } - blit(poseStack, x, yy, 0, yTextureStart, imageWidth - 34, 18); + graphics.blit(texture, x, yy, 0, yTextureStart, imageWidth - 34, 18); } yy += 18; - blit(poseStack, x, yy, 0, getTopHeight() + (18 * 3), imageWidth - 34, getBottomHeight()); + graphics.blit(texture, x, yy, 0, getTopHeight() + (18 * 3), imageWidth - 34, getBottomHeight()); if (grid.getGridType() == GridType.PATTERN) { int ty = 0; @@ -388,40 +406,42 @@ public class GridScreen extends BaseScreen implements IScreen ty = 2; } - blit(poseStack, x + 172, y + getTopHeight() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16); + graphics.blit(texture, x + 172, y + getTopHeight() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16); if (processingPattern.selected()) { updatePatternScrollbar(); - patternScrollbar.render(poseStack); + patternScrollbar.render(graphics); } } - tabs.drawForeground(poseStack, x, y - tabs.getHeight(), mouseX, mouseY, true); + tabs.drawForeground(graphics, x, y - tabs.getHeight(), mouseX, mouseY, true); - searchField.render(poseStack, 0, 0, 0); + searchField.render(graphics, 0, 0, 0); - scrollbar.render(poseStack); + scrollbar.render(graphics); } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - super.render(poseStack, mouseX, mouseY, partialTicks); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + super.render(graphics, mouseX, mouseY, partialTicks); // Drawn in here for bug #1844 (https://github.com/refinedmods/refinedstorage/issues/1844) // Item tooltips can't be rendered in the foreground layer due to the X offset translation. if (isOverSlotWithStack()) { - drawGridTooltip(poseStack, view.getStacks().get(slotNumber), mouseX, mouseY); + drawGridTooltip(graphics, view.getStacks().get(slotNumber), mouseX, mouseY); } } @Override - public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 7, getYPlayerInventory() - 12, I18n.get("container.inventory")); + public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY) { + renderString(graphics, 7, 7, title.getString()); + renderString(graphics, 7, getYPlayerInventory() - 12, I18n.get("container.inventory")); int x = 8; int y = 19; this.slotNumber = -1; + this.slotNumberX = -1; + this.slotNumberY = -1; int slot = scrollbar != null ? (scrollbar.getOffset() * 9) : 0; @@ -430,21 +450,24 @@ public class GridScreen extends BaseScreen implements IScreen for (int i = 0; i < 9 * getVisibleRows(); ++i) { if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isGridActive()) { this.slotNumber = slot; + this.slotNumberX = x; + this.slotNumberY = y; } if (slot < view.getStacks().size()) { - view.getStacks().get(slot).draw(poseStack, this, x, y); + view.getStacks().get(slot).draw(graphics, this, x, y); } if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isGridActive()) { int color = grid.isGridActive() ? -2130706433 : 0xFF5B5B5B; - poseStack.pushPose(); + graphics.pose().pushPose(); + graphics.pose().translate(0, 0, 300); RenderSystem.disableDepthTest(); RenderSystem.colorMask(true, true, true, false); - fillGradient(poseStack, x, y, x + 16, y + 16, color, color); + graphics.fillGradient(x, y, x + 16, y + 16, color, color); RenderSystem.colorMask(true, true, true, true); - poseStack.popPose(); + graphics.pose().popPose(); } slot++; @@ -458,17 +481,17 @@ public class GridScreen extends BaseScreen implements IScreen } if (isOverClear(mouseX, mouseY)) { - renderTooltip(poseStack, mouseX, mouseY, I18n.get("misc.refinedstorage.clear")); + renderTooltip(graphics, mouseX, mouseY, I18n.get("misc.refinedstorage.clear")); } if (isOverCreatePattern(mouseX, mouseY)) { - renderTooltip(poseStack, mouseX, mouseY, I18n.get("gui.refinedstorage.grid.pattern_create")); + renderTooltip(graphics, mouseX, mouseY, I18n.get("gui.refinedstorage.grid.pattern_create")); } - tabs.drawTooltip(poseStack, font, mouseX, mouseY); + tabs.drawTooltip(graphics, font, mouseX, mouseY); } - private void drawGridTooltip(PoseStack poseStack, IGridStack gridStack, int mouseX, int mouseY) { + private void drawGridTooltip(GuiGraphics graphics, IGridStack gridStack, int mouseX, int mouseY) { List textLines = gridStack.getTooltip(true); ItemStack stackContext = gridStack instanceof ItemGridStack ? ((ItemGridStack) gridStack).getStack() : ItemStack.EMPTY; @@ -487,7 +510,7 @@ public class GridScreen extends BaseScreen implements IScreen } } - renderTooltip(poseStack, stackContext, mouseX, mouseY, textLines); + renderTooltip(graphics, stackContext, mouseX, mouseY, textLines); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java index 4cc615b67..d0e46afe0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen.grid.sorting; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; -import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -23,8 +23,8 @@ public class IdGridSorter implements IGridSorter { leftId = Item.getId(((ItemStack) left.getIngredient()).getItem()); rightId = Item.getId(((ItemStack) right.getIngredient()).getItem()); } else if (left.getIngredient() instanceof FluidStack && right.getIngredient() instanceof FluidStack) { - leftId = Registry.FLUID.getId(((FluidStack) left.getIngredient()).getFluid()); - rightId = Registry.FLUID.getId(((FluidStack) right.getIngredient()).getFluid()); + leftId = BuiltInRegistries.FLUID.getId(((FluidStack) left.getIngredient()).getFluid()); + rightId = BuiltInRegistries.FLUID.getId(((FluidStack) right.getIngredient()).getFluid()); } if (leftId != rightId) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java index b7009622f..9e89f0301 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java @@ -1,12 +1,12 @@ package com.refinedmods.refinedstorage.screen.grid.stack; import com.google.common.collect.Lists; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.render.FluidRenderer; import com.refinedmods.refinedstorage.render.RenderSettings; import com.refinedmods.refinedstorage.screen.BaseScreen; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -184,8 +184,8 @@ public class FluidGridStack implements IGridStack { } @Override - public void draw(PoseStack poseStack, BaseScreen screen, int x, int y) { - FluidRenderer.INSTANCE.render(poseStack, x, y, stack); + public void draw(GuiGraphics graphics, BaseScreen screen, int x, int y) { + FluidRenderer.INSTANCE.render(graphics, x, y, stack); String text; int color = RenderSettings.INSTANCE.getSecondaryColor(); @@ -199,7 +199,7 @@ public class FluidGridStack implements IGridStack { text = API.instance().getQuantityFormatter().formatInBucketFormWithOnlyTrailingDigitsIfZero(getQuantity()); } - screen.renderQuantity(poseStack, x, y, text, color); + screen.renderQuantity(graphics, x, y, text, color); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java index ff00882c1..35605cf3b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.screen.grid.stack; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; import com.refinedmods.refinedstorage.screen.BaseScreen; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import javax.annotation.Nullable; @@ -34,7 +34,7 @@ public interface IGridStack { String getFormattedFullQuantity(); - void draw(PoseStack poseStack, BaseScreen screen, int x, int y); + void draw(GuiGraphics graphics, BaseScreen screen, int x, int y); Object getIngredient(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java index 119ad34d8..234a14d2d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java @@ -1,11 +1,11 @@ package com.refinedmods.refinedstorage.screen.grid.stack; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.render.RenderSettings; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -196,7 +196,7 @@ public class ItemGridStack implements IGridStack { } @Override - public void draw(PoseStack poseStack, BaseScreen screen, int x, int y) { + public void draw(GuiGraphics graphics, BaseScreen screen, int x, int y) { String text = null; int color = RenderSettings.INSTANCE.getSecondaryColor(); @@ -209,7 +209,7 @@ public class ItemGridStack implements IGridStack { text = API.instance().getQuantityFormatter().formatWithUnits(getQuantity()); } - screen.renderItem(poseStack, x, y, stack, true, text, color); + screen.renderItem(graphics, x, y, stack, true, text, color); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java index cc93164a5..d99ae61e0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java @@ -2,9 +2,9 @@ package com.refinedmods.refinedstorage.screen.widget; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Checkbox; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -47,11 +47,11 @@ public class CheckboxWidget extends Checkbox { } @Override - public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { Minecraft minecraft = Minecraft.getInstance(); RenderSystem.setShaderTexture(0, TEXTURE); RenderSystem.enableDepthTest(); - Font fontRenderer = minecraft.font; + Font font = minecraft.font; RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); @@ -63,9 +63,7 @@ public class CheckboxWidget extends Checkbox { int width = 10; int height = 10; - blit(poseStack, this.x, this.y, textureX, textureY, width, height, 32, 32); - - this.renderBg(poseStack, minecraft, mouseX, mouseY); + graphics.blit(TEXTURE, this.getX(), this.getY(), textureX, textureY, width, height, 32, 32); int color = 14737632; @@ -75,10 +73,6 @@ public class CheckboxWidget extends Checkbox { color = packedFGColor; } - if (shadow) { - drawString(poseStack, fontRenderer, this.getMessage(), this.x + 13, this.y + (this.height - 8) / 2, color); - } else { - fontRenderer.draw(poseStack, this.getMessage().getString(), (float) this.x + 13, this.y + (this.height - 8) / 2F, color); - } + graphics.drawString(font, this.getMessage(), this.getX() + 13, this.getY() + (this.height - 8) / 2, color, shadow); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java index 23aafc79c..39fd95ef1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java @@ -1,12 +1,11 @@ package com.refinedmods.refinedstorage.screen.widget; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.integration.jei.GridRecipeTransferHandler; import com.refinedmods.refinedstorage.integration.jei.JeiIntegration; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.GuiEventListener; import java.util.LinkedList; @@ -26,6 +25,7 @@ public class ScrollbarWidget implements GuiEventListener { private int maxOffset; private boolean clicked = false; private boolean small = false; + private boolean focused = false; public ScrollbarWidget(BaseScreen screen, int x, int y, int width, int height) { this.screen = screen; @@ -60,14 +60,12 @@ public class ScrollbarWidget implements GuiEventListener { this.enabled = enabled; } - public void render(PoseStack poseStack) { + public void render(GuiGraphics graphics) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - - screen.bindTexture(RS.ID, "icons.png"); if (small) { - screen.blit(poseStack, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 218 : 225, 0, 7, SCROLLER_HEIGHT); + graphics.blit(BaseScreen.ICONS_TEXTURE, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 218 : 225, 0, 7, SCROLLER_HEIGHT); } else { - screen.blit(poseStack, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, SCROLLER_HEIGHT); + graphics.blit(BaseScreen.ICONS_TEXTURE, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, SCROLLER_HEIGHT); } } @@ -128,6 +126,16 @@ public class ScrollbarWidget implements GuiEventListener { return false; } + @Override + public void setFocused(boolean focused) { + this.focused = focused; + } + + @Override + public boolean isFocused() { + return focused; + } + public void setMaxOffset(int maxOffset) { this.maxOffset = maxOffset; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java index f574b5020..eb109dddd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.screen.widget; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RSKeyBindings; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.integration.jei.JeiIntegration; @@ -8,6 +7,7 @@ import com.refinedmods.refinedstorage.integration.jei.RSJeiPlugin; import com.refinedmods.refinedstorage.render.RenderSettings; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; import org.lwjgl.glfw.GLFW; @@ -51,7 +51,7 @@ public class SearchWidget extends EditBox { boolean result = super.mouseClicked(mouseX, mouseY, mouseButton); - boolean clickedWidget = mouseX >= this.x && mouseX < this.x + this.width && mouseY >= this.y && mouseY < this.y + this.height; + boolean clickedWidget = mouseX >= this.getX() && mouseX < this.getX() + this.width && mouseY >= this.getY() && mouseY < this.getY() + this.height; if (clickedWidget && mouseButton == 1) { setValue(""); @@ -173,10 +173,10 @@ public class SearchWidget extends EditBox { } @Override - public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { if (canSyncFromJEINow() && RSJeiPlugin.getRuntime().getIngredientListOverlay().hasKeyboardFocus()) { setTextFromJEI(); } - super.renderButton(poseStack, mouseX, mouseY, partialTicks); + super.renderWidget(graphics, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java index cd196ee93..90805d36c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java @@ -1,12 +1,11 @@ package com.refinedmods.refinedstorage.screen.widget; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.network.grid.IGridTab; import com.refinedmods.refinedstorage.apiimpl.render.ElementDrawers; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -48,14 +47,14 @@ public class TabListWidget { listeners.add(listener); } - public void drawForeground(PoseStack poseStack, int x, int y, int mouseX, int mouseY, boolean visible) { + public void drawForeground(GuiGraphics graphics, int x, int y, int mouseX, int mouseY, boolean visible) { this.tabHovering = -1; if (visible) { int j = 0; for (int i = page.get() * tabsPerPage; i < (page.get() * tabsPerPage) + tabsPerPage; ++i) { if (i < tabs.get().size()) { - drawTab(poseStack, tabs.get().get(i), true, x, y, i, j); + drawTab(graphics, tabs.get().get(i), true, x, y, i, j); if (RenderUtils.inBounds(x + getXOffset() + ((IGridTab.TAB_WIDTH + 1) * j), y, IGridTab.TAB_WIDTH, IGridTab.TAB_HEIGHT - (i == selected.get() ? 2 : 7), mouseX, mouseY)) { this.tabHovering = i; @@ -87,11 +86,11 @@ public class TabListWidget { right.active = page.get() < pages.get(); } - public void drawBackground(PoseStack poseStack, int x, int y) { + public void drawBackground(GuiGraphics graphics, int x, int y) { int j = 0; for (int i = page.get() * tabsPerPage; i < (page.get() * tabsPerPage) + tabsPerPage; ++i) { if (i < tabs.get().size()) { - drawTab(poseStack, tabs.get().get(i), false, x, y, i, j++); + drawTab(graphics, tabs.get().get(i), false, x, y, i, j++); } } } @@ -108,7 +107,7 @@ public class TabListWidget { return 0; } - private void drawTab(PoseStack poseStack, IGridTab tab, boolean foregroundLayer, int x, int y, int index, int num) { + private void drawTab(GuiGraphics graphics, IGridTab tab, boolean foregroundLayer, int x, int y, int index, int num) { boolean isSelected = index == selected.get(); if ((foregroundLayer && !isSelected) || (!foregroundLayer && isSelected)) { @@ -118,8 +117,6 @@ public class TabListWidget { int tx = x + getXOffset() + ((IGridTab.TAB_WIDTH + 1) * num); int ty = y; - screen.bindTexture(RS.ID, "icons.png"); - if (!isSelected) { ty += 3; } @@ -142,14 +139,14 @@ public class TabListWidget { uvx = 199; } - screen.blit(poseStack, tx, ty, uvx, uvy, tbw, IGridTab.TAB_HEIGHT); + graphics.blit(BaseScreen.ICONS_TEXTURE, tx, ty, uvx, uvy, tbw, IGridTab.TAB_HEIGHT); - tab.drawIcon(poseStack, otx + 6, ty + 9 - (!isSelected ? 3 : 0), drawers.getItemDrawer(), drawers.getFluidDrawer()); + tab.drawIcon(graphics, otx + 6, ty + 9 - (!isSelected ? 3 : 0), drawers.getItemDrawer(), drawers.getFluidDrawer()); } - public void drawTooltip(PoseStack poseStack, Font fontRenderer, int mouseX, int mouseY) { + public void drawTooltip(GuiGraphics graphics, Font font, int mouseX, int mouseY) { if (tabHovering >= 0 && tabHovering < tabs.get().size()) { - tabs.get().get(tabHovering).drawTooltip(poseStack, mouseX, mouseY, screen); + tabs.get().get(tabHovering).drawTooltip(font, graphics, mouseX, mouseY); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java index a6cf3880c..90b542268 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java @@ -1,12 +1,12 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.storage.AccessType; -import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; +import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.util.AccessTypeUtils; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class AccessTypeSideButton extends SideButton { @@ -19,12 +19,12 @@ public class AccessTypeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, 16 * parameter.getValue().getId(), 240, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, 16 * parameter.getValue().getId(), 240, 16, 16); } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.access_type") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.access_type." + parameter.getValue().getId()); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java index 61d1b4404..ff979ab62 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java @@ -1,11 +1,11 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.container.ConstructorContainerMenu; -import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; +import com.refinedmods.refinedstorage.container.ConstructorContainerMenu; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class ConstructorDropSideButton extends SideButton { @@ -14,12 +14,12 @@ public class ConstructorDropSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, 64 + (Boolean.TRUE.equals(ConstructorBlockEntity.DROP.getValue()) ? 16 : 0), 16, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, 64 + (Boolean.TRUE.equals(ConstructorBlockEntity.DROP.getValue()) ? 16 : 0), 16, 16, 16); } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.constructor.drop") + "\n" + ChatFormatting.GRAY + I18n.get(Boolean.TRUE.equals(ConstructorBlockEntity.DROP.getValue()) ? "gui.yes" : "gui.no"); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java index f245ae6a8..597d2f370 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java @@ -1,11 +1,11 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.container.CrafterContainerMenu; -import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.CrafterBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; +import com.refinedmods.refinedstorage.container.CrafterContainerMenu; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class CrafterModeSideButton extends SideButton { @@ -14,13 +14,13 @@ public class CrafterModeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.crafter_mode") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.crafter_mode." + CrafterBlockEntity.MODE.getValue()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, CrafterBlockEntity.MODE.getValue() * 16, 0, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, CrafterBlockEntity.MODE.getValue() * 16, 0, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index a0b4cf0ee..913cabefa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class DestructorPickupSideButton extends SideButton { @@ -14,12 +15,12 @@ public class DestructorPickupSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, 64 + (Boolean.TRUE.equals(DestructorBlockEntity.PICKUP.getValue()) ? 0 : 16), 0, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, 64 + (Boolean.TRUE.equals(DestructorBlockEntity.PICKUP.getValue()) ? 0 : 16), 0, 16, 16); } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.destructor.pickup") + "\n" + ChatFormatting.GRAY + I18n.get(Boolean.TRUE.equals(DestructorBlockEntity.PICKUP.getValue()) ? "gui.yes" : "gui.no"); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java index 43597e8da..b78a5d206 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java @@ -1,12 +1,12 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.apiimpl.network.node.DetectorNetworkNode; -import com.refinedmods.refinedstorage.container.DetectorContainerMenu; -import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; +import com.refinedmods.refinedstorage.container.DetectorContainerMenu; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class DetectorModeSideButton extends SideButton { @@ -15,13 +15,13 @@ public class DetectorModeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.detector.mode") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.detector.mode." + DetectorBlockEntity.MODE.getValue()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, DetectorBlockEntity.MODE.getValue() * 16, 176, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, DetectorBlockEntity.MODE.getValue() * 16, 176, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java index eb021c34b..07519be41 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class ExactModeSideButton extends SideButton { @@ -20,7 +21,7 @@ public class ExactModeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { String tooltip = I18n.get("sidebutton.refinedstorage.exact_mode") + "\n" + ChatFormatting.GRAY; if ((parameter.getValue() & MASK) == MASK) { @@ -33,11 +34,11 @@ public class ExactModeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { int ty = 16 * 12; int tx = (parameter.getValue() & MASK) == MASK ? 0 : 16; - screen.blit(poseStack, x, y, tx, ty, 16, 16); + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, tx, ty, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java index 52e811392..89e388789 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java @@ -1,9 +1,11 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; +import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.FilterScreen; import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class FilterTypeSideButton extends SideButton { @@ -16,13 +18,13 @@ public class FilterTypeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.type") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.type." + filterScreen.getType()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - filterScreen.blit(poseStack, x, y, 16 * filterScreen.getType(), 128, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, 16 * filterScreen.getType(), 128, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java index 9588837b0..d0d056804 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java @@ -1,9 +1,9 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import java.util.function.Consumer; @@ -20,12 +20,12 @@ public class GridSizeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.grid.size") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.size." + this.sizeSupplier.get()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { int size = this.sizeSupplier.get(); int tx = 0; @@ -40,7 +40,7 @@ public class GridSizeSideButton extends SideButton { tx = 32; } - screen.blit(poseStack, x, y, 64 + tx, 64, 16, 16); + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, 64 + tx, 64, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java index 5b1df2ec4..1068b9a88 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java @@ -1,10 +1,10 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class GridSortingDirectionSideButton extends SideButton { @@ -17,13 +17,13 @@ public class GridSortingDirectionSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.grid.sorting.direction") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.sorting.direction." + grid.getSortingDirection()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, grid.getSortingDirection() * 16, 16, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, grid.getSortingDirection() * 16, 16, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java index 2d29895c3..0c2753a1a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java @@ -1,12 +1,12 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.integration.inventorytweaks.InventoryTweaksIntegration; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class GridSortingTypeSideButton extends SideButton { @@ -19,16 +19,16 @@ public class GridSortingTypeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.grid.sorting.type") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.sorting.type." + grid.getSortingType()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { if (grid.getSortingType() == IGrid.SORTING_TYPE_LAST_MODIFIED) { - screen.blit(poseStack, x, y, 48, 48, 16, 16); + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, 48, 48, 16, 16); } else { - screen.blit(poseStack, x, y, grid.getSortingType() * 16, 32, 16, 16); + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, grid.getSortingType() * 16, 32, 16, 16); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java index 792fea9a6..d8b59a003 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java @@ -1,10 +1,10 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class GridViewTypeSideButton extends SideButton { @@ -17,13 +17,13 @@ public class GridViewTypeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.grid.view_type") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.view_type." + grid.getViewType()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, (grid.getViewType() - (grid.getViewType() >= 3 ? 3 : 0)) * 16, 112, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, (grid.getViewType() - (grid.getViewType() >= 3 ? 3 : 0)) * 16, 112, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java index 3c7910d0b..b4cd9a1db 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java @@ -1,12 +1,12 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; -import com.refinedmods.refinedstorage.container.DiskManipulatorContainerMenu; -import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainerMenu; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class IoModeSideButton extends SideButton { @@ -15,13 +15,13 @@ public class IoModeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.iomode") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.iomode." + (DiskManipulatorBlockEntity.IO_MODE.getValue() == DiskManipulatorNetworkNode.IO_MODE_INSERT ? "insert" : "extract")); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, DiskManipulatorBlockEntity.IO_MODE.getValue() == DiskManipulatorNetworkNode.IO_MODE_EXTRACT ? 0 : 16, 160, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, DiskManipulatorBlockEntity.IO_MODE.getValue() == DiskManipulatorNetworkNode.IO_MODE_EXTRACT ? 0 : 16, 160, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java index d0e54a8e1..b42361fb9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java @@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class RedstoneModeSideButton extends SideButton { @@ -17,13 +18,13 @@ public class RedstoneModeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.redstone_mode") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.redstone_mode." + parameter.getValue()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, parameter.getValue() * 16, 0, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, parameter.getValue() * 16, 0, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java index e9006f386..cb95b93c2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java @@ -1,10 +1,10 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.integration.jei.JeiIntegration; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import java.util.Arrays; @@ -30,15 +30,15 @@ public abstract class SearchBoxModeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.grid.search_box_mode") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.search_box_mode." + getSearchBoxMode()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { int mode = getSearchBoxMode(); - screen.blit(poseStack, x, y, IGrid.isSearchBoxModeWithAutoselection(mode) ? 16 : 0, 96, 16, 16); + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, IGrid.isSearchBoxModeWithAutoselection(mode) ? 16 : 0, 96, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java index 2941b2254..f93a0dc82 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java @@ -1,10 +1,9 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; import org.lwjgl.opengl.GL11; @@ -19,45 +18,39 @@ public abstract class SideButton extends Button { protected final BaseScreen screen; protected SideButton(BaseScreen screen) { - super(-1, -1, WIDTH, HEIGHT, Component.empty(), NO_ACTION); - + super(Button.builder(Component.empty(), NO_ACTION).pos(-1, -1).size(WIDTH, HEIGHT)); this.screen = screen; } - public void renderTooltip(PoseStack poseStack, int mouseX, int mouseY) { + public void renderTooltip(GuiGraphics graphics, int mouseX, int mouseY) { boolean isFocused = isFocused(); if (isHovered || isFocused) { - int x = isHovered ? mouseX : (this.x - screen.getGuiLeft()) + width; - int y = isHovered ? mouseY : (this.y - screen.getGuiTop()) + (height / 2); - screen.renderTooltip(poseStack, x, y, getTooltip()); + int x = isHovered ? mouseX : (this.getX() - screen.getGuiLeft()) + width; + int y = isHovered ? mouseY : (this.getY() - screen.getGuiTop()) + (height / 2); + screen.renderTooltip(graphics, x, y, getSideButtonTooltip()); } } @Override - public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - isHovered = RenderUtils.inBounds(x, y, width, height, mouseX, mouseY); + isHovered = RenderUtils.inBounds(getX(), getY(), width, height, mouseX, mouseY); - screen.bindTexture(RS.ID, "icons.png"); - screen.blit(poseStack, x, y, 238, isHovered ? 35 : 16, WIDTH, HEIGHT); + graphics.blit(BaseScreen.ICONS_TEXTURE, getX(), getY(), 238, isHovered ? 35 : 16, WIDTH, HEIGHT); - renderButtonIcon(poseStack, x + 1, y + 1); + renderButtonIcon(graphics, getX() + 1, getY() + 1); if (isHoveredOrFocused()) { RenderSystem.enableBlend(); RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 0.5f); - screen.blit(poseStack, x, y, 238, 54, WIDTH, HEIGHT); + graphics.blit(BaseScreen.ICONS_TEXTURE, getX(), getY(), 238, 54, WIDTH, HEIGHT); RenderSystem.disableBlend(); } } - public int getHeight() { - return height; - } + protected abstract void renderButtonIcon(GuiGraphics graphics, int x, int y); - protected abstract void renderButtonIcon(PoseStack poseStack, int x, int y); - - protected abstract String getTooltip(); + protected abstract String getSideButtonTooltip(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java index 0b0acf8db..84fa48d00 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java @@ -1,11 +1,11 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.config.IType; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class TypeSideButton extends SideButton { @@ -18,13 +18,13 @@ public class TypeSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.type") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.type." + type.getValue()); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, 16 * type.getValue(), 128, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, 16 * type.getValue(), 128, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java index f0671c504..9b45bab8f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; public class WhitelistBlacklistSideButton extends SideButton { @@ -18,13 +19,13 @@ public class WhitelistBlacklistSideButton extends SideButton { } @Override - protected String getTooltip() { + protected String getSideButtonTooltip() { return I18n.get("sidebutton.refinedstorage.mode") + "\n" + ChatFormatting.GRAY + I18n.get("sidebutton.refinedstorage.mode." + (parameter.getValue() == IWhitelistBlacklist.WHITELIST ? "whitelist" : "blacklist")); } @Override - protected void renderButtonIcon(PoseStack poseStack, int x, int y) { - screen.blit(poseStack, x, y, parameter.getValue() == IWhitelistBlacklist.WHITELIST ? 0 : 16, 64, 16, 16); + protected void renderButtonIcon(GuiGraphics graphics, int x, int y) { + graphics.blit(BaseScreen.ICONS_TEXTURE, x, y, parameter.getValue() == IWhitelistBlacklist.WHITELIST ? 0 : 16, 64, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java index a171719f9..469ff3f26 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java @@ -30,14 +30,12 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.event.ModelEvent; import net.minecraftforge.client.event.RegisterColorHandlersEvent; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; -import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AddReloadListenerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -56,21 +54,6 @@ public final class ClientSetup { private static final BakedModelOverrideRegistry BAKED_MODEL_OVERRIDE_REGISTRY = new BakedModelOverrideRegistry(); - private static ResourceLocation[] getMultipleColoredModels(DyeColor color, String... paths) { - return Arrays.stream(paths).map(path -> getColoredModel(color, path)).toArray(ResourceLocation[]::new); - } - - private static ResourceLocation getColoredModel(DyeColor color, String path) { - return new ResourceLocation(RS.ID, path + color); - } - - private static void forEachColorApply(String name, BiConsumer consumer) { - for (DyeColor color : DyeColor.values()) { - String prefix = color == ColorMap.DEFAULT_COLOR ? "" : color + "_"; - consumer.accept(new ResourceLocation(RS.ID, prefix + name), color); - } - } - private ClientSetup() { } @@ -159,6 +142,8 @@ public final class ClientSetup { }); } + // TODO: Emissivity is broken :( + // TODO: we have probably too much emissivity (when disconnected) private static void registerBakedModelOverrides() { @@ -207,7 +192,7 @@ public final class ClientSetup { } @SubscribeEvent - public static void onModelBake(ModelEvent.BakingCompleted e) { + public static void onModelBake(ModelEvent.ModifyBakingResult e) { for (ResourceLocation id : e.getModels().keySet()) { BakedModelOverrideRegistry.BakedModelOverrideFactory factory = BAKED_MODEL_OVERRIDE_REGISTRY.get(new ResourceLocation(id.getNamespace(), id.getPath())); @@ -217,13 +202,6 @@ public final class ClientSetup { } } - @SubscribeEvent - public static void onTextureStitch(TextureStitchEvent.Pre event) { - if (event.getAtlas().location().equals(InventoryMenu.BLOCK_ATLAS)) { - event.addSprite(new ResourceLocation(RS.ID, "block/cable_part_border")); - } - } - @SubscribeEvent public static void onRegisterModelGeometry(final ModelEvent.RegisterGeometryLoaders e) { e.register("disk_drive", new DiskDriveGeometryLoader()); diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java index be6f6c77d..7a1ace209 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java @@ -1,6 +1,8 @@ package com.refinedmods.refinedstorage.setup; import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSCreativeModeTabItems; +import com.refinedmods.refinedstorage.RSLootFunctions; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; @@ -30,16 +32,24 @@ import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.ItemExtern import com.refinedmods.refinedstorage.block.BlockListener; import com.refinedmods.refinedstorage.integration.craftingtweaks.CraftingTweaksIntegration; import com.refinedmods.refinedstorage.integration.inventorysorter.InventorySorterIntegration; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.registries.RegisterEvent; public final class CommonSetup { private CommonSetup() { } + @SubscribeEvent + public static void onRegister(final RegisterEvent e) { + e.register(Registries.LOOT_FUNCTION_TYPE, helper -> RSLootFunctions.register()); + e.register(Registries.CREATIVE_MODE_TAB, RSCreativeModeTabItems::register); + } + @SubscribeEvent public static void onCommonSetup(FMLCommonSetupEvent e) { RS.NETWORK_HANDLER.register(); diff --git a/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java index b65269757..39ca2df9a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java @@ -1,15 +1,13 @@ package com.refinedmods.refinedstorage.util; import net.minecraft.network.chat.Component; - import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.Material; public final class BlockUtils { - public static final BlockBehaviour.Properties DEFAULT_ROCK_PROPERTIES = BlockBehaviour.Properties.of(Material.STONE).strength(0.5F, 6.0F).sound(SoundType.STONE); - public static final BlockBehaviour.Properties DEFAULT_GLASS_PROPERTIES = BlockBehaviour.Properties.of(Material.GLASS).sound(SoundType.GLASS).strength(0.35F); + public static final BlockBehaviour.Properties DEFAULT_ROCK_PROPERTIES = BlockBehaviour.Properties.of().strength(0.5F, 6.0F).sound(SoundType.STONE); + public static final BlockBehaviour.Properties DEFAULT_GLASS_PROPERTIES = BlockBehaviour.Properties.of().sound(SoundType.GLASS).strength(0.35F); private BlockUtils() { } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java index 693e0c0a6..aff9ec919 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java @@ -102,7 +102,7 @@ public class ColorMap { block.getId().getPath(), () -> new ColoredBlockItem( block.get(), - new Item.Properties().tab(RS.CREATIVE_MODE_TAB), + new Item.Properties(), color, BlockUtils.getBlockTranslation(translationBlock.get()) ) diff --git a/src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java index f6ee3adb3..f797a55d4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java @@ -16,7 +16,6 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.common.ForgeMod; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; @@ -85,7 +84,7 @@ public final class LevelUtils { } public static HitResult rayTracePlayer(Level level, Player player) { - double reachDistance = player.getAttribute(ForgeMod.REACH_DISTANCE.get()).getValue(); + double reachDistance = player.getBlockReach(); Vec3 base = player.getEyePosition(1.0F); Vec3 look = player.getLookAngle(); diff --git a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java index bf51eab41..ba8710915 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java @@ -1,8 +1,6 @@ package com.refinedmods.refinedstorage.util; import com.google.common.collect.ImmutableMap; -import com.mojang.math.Quaternion; -import com.mojang.math.Vector3f; import com.refinedmods.refinedstorage.api.util.IComparer; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.render.Styles; @@ -16,12 +14,15 @@ import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.client.model.data.ModelData; import net.minecraftforge.fluids.FluidStack; +import org.joml.Quaternionf; +import org.joml.Vector3f; import java.util.HashSet; import java.util.List; @@ -31,17 +32,26 @@ public final class RenderUtils { private RenderUtils() { } - public static Quaternion getQuaternion(Direction direction) { + private static Vector3f getRotationVector(Direction direction) { return switch (direction) { - case NORTH -> new Quaternion(0, 0, 0, true); - case EAST -> new Quaternion(0, -90, 0, true); - case SOUTH -> new Quaternion(0, 180, 0, true); - case WEST -> new Quaternion(0, 90, 0, true); - case UP -> new Quaternion(90, 0, 180, true); - case DOWN -> new Quaternion(-90, 0, 0, true); + case NORTH -> new Vector3f(0, 0, 0); + case EAST -> new Vector3f(0, -90, 0); + case SOUTH -> new Vector3f(0, 180, 0); + case WEST -> new Vector3f(0, 90, 0); + case UP -> new Vector3f(90, 0, 180); + case DOWN -> new Vector3f(-90, 0, 0); }; } + public static Quaternionf getQuaternion(Direction direction) { + Vector3f vec = getRotationVector(direction); + return new Quaternionf().rotateXYZ( + vec.x() * Mth.DEG_TO_RAD, + vec.y() * Mth.DEG_TO_RAD, + vec.z() * Mth.DEG_TO_RAD + ); + } + public static String shorten(String text, int length) { if (text.length() > length) { text = text.substring(0, length) + "..."; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index d9782d6b9..58e70eb8c 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[43,)" +loaderVersion = "[47,)" issueTrackerURL = "https://github.com/refinedmods/refinedstorage" license="MIT" [[mods]] diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json index 9ca7611e3..6c626cf51 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json @@ -154,7 +154,10 @@ 16.0, 16.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_all_cutout.json b/src/main/resources/assets/refinedstorage/models/block/cube_all_cutout.json index 0c42ce3a5..2e05c5d6a 100644 --- a/src/main/resources/assets/refinedstorage/models/block/cube_all_cutout.json +++ b/src/main/resources/assets/refinedstorage/models/block/cube_all_cutout.json @@ -55,32 +55,50 @@ "up": { "texture": "#cutout", "cullface": "up", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "texture": "#cutout", "cullface": "down", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "north": { "texture": "#cutout", "cullface": "north", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "texture": "#cutout", "cullface": "south", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "texture": "#cutout", "cullface": "west", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "east": { "texture": "#cutout", "cullface": "east", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_cutout.json b/src/main/resources/assets/refinedstorage/models/block/cube_cutout.json index da4a541e8..b9de77b3c 100644 --- a/src/main/resources/assets/refinedstorage/models/block/cube_cutout.json +++ b/src/main/resources/assets/refinedstorage/models/block/cube_cutout.json @@ -55,32 +55,50 @@ "up": { "texture": "#cutout_up", "cullface": "up", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "texture": "#cutout_down", "cullface": "down", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "north": { "texture": "#cutout_north", "cullface": "north", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "texture": "#cutout_south", "cullface": "south", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "texture": "#cutout_west", "cullface": "west", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "east": { "texture": "#cutout_east", "cullface": "east", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout.json b/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout.json index baba2d3bc..b9c40af2b 100644 --- a/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout.json +++ b/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout.json @@ -55,7 +55,10 @@ "north": { "texture": "#cutout", "cullface": "north", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/detector.json b/src/main/resources/assets/refinedstorage/models/block/detector.json index ba814166b..b5eab43f1 100755 --- a/src/main/resources/assets/refinedstorage/models/block/detector.json +++ b/src/main/resources/assets/refinedstorage/models/block/detector.json @@ -91,7 +91,10 @@ 12 ], "texture": "#torch", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "uv": [ @@ -101,7 +104,10 @@ 12 ], "texture": "#torch", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } }, @@ -127,7 +133,10 @@ 12 ], "texture": "#torch", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "uv": [ @@ -137,7 +146,10 @@ 12 ], "texture": "#torch", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } }, diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/disk.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk.json index d59d59e5a..a01e5be3a 100644 --- a/src/main/resources/assets/refinedstorage/models/block/disks/disk.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk.json @@ -94,7 +94,10 @@ 3.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "east": { "texture": "#led", @@ -104,7 +107,10 @@ 3.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "texture": "#led", @@ -114,7 +120,10 @@ 3.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "texture": "#led", @@ -124,7 +133,10 @@ 3.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "up": { "texture": "#led", @@ -134,7 +146,10 @@ 3.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "texture": "#led", @@ -144,7 +159,10 @@ 3.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json index 1e7b31f9a..9b103873a 100644 --- a/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json @@ -95,7 +95,10 @@ 2.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "east": { "texture": "#led", @@ -105,7 +108,10 @@ 2.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "texture": "#led", @@ -115,7 +121,10 @@ 2.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "texture": "#led", @@ -125,7 +134,10 @@ 2.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "up": { "texture": "#led", @@ -135,7 +147,10 @@ 2.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "texture": "#led", @@ -145,7 +160,10 @@ 2.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json index cbd9bc7ed..2ca29c683 100644 --- a/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json @@ -95,7 +95,10 @@ 1.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "east": { "texture": "#led", @@ -105,7 +108,10 @@ 1.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "texture": "#led", @@ -115,7 +121,10 @@ 1.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "texture": "#led", @@ -125,7 +134,10 @@ 1.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "up": { "texture": "#led", @@ -135,7 +147,10 @@ 1.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "texture": "#led", @@ -145,7 +160,10 @@ 1.0, 1.0 ], - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json index 87a3d1127..f76039867 100644 --- a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json @@ -98,7 +98,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "uv": [ @@ -108,7 +111,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "north": { "uv": [ @@ -118,7 +124,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "uv": [ @@ -128,7 +137,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "up": { "uv": [ @@ -138,7 +150,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "uv": [ @@ -148,7 +163,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json index c2282cd7f..61e5715aa 100644 --- a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json @@ -98,7 +98,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "uv": [ @@ -108,7 +111,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "north": { "uv": [ @@ -118,7 +124,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "uv": [ @@ -128,7 +137,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "up": { "uv": [ @@ -138,7 +150,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "uv": [ @@ -148,7 +163,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json index dd1d213e9..a78f671df 100644 --- a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json @@ -98,7 +98,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "west": { "uv": [ @@ -108,7 +111,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "north": { "uv": [ @@ -118,7 +124,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "uv": [ @@ -128,7 +137,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "up": { "uv": [ @@ -138,7 +150,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "down": { "uv": [ @@ -148,7 +163,10 @@ 1 ], "texture": "#led", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json index 69b66c25c..42faebcd0 100644 --- a/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json +++ b/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json @@ -127,7 +127,10 @@ 15 ], "texture": "#cutout", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "up": { "uv": [ @@ -137,7 +140,10 @@ 8 ], "texture": "#cutout", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } }, @@ -162,7 +168,10 @@ 16 ], "texture": "#cutout", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "east": { "uv": [ @@ -172,7 +181,10 @@ 16 ], "texture": "#cutout", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } }, @@ -197,7 +209,10 @@ 16 ], "texture": "#cutout", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } }, "south": { "uv": [ @@ -207,7 +222,10 @@ 16 ], "texture": "#cutout", - "emissivity": 15 + "forge_data": { + "block_light": 15, + "sky_light": 15 + } } } } diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 63c2ceca3..ebb77d3ad 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { - "description": "Refined Storage resources", - "pack_format": 9, - "forge:resource_pack_format": 9, - "forge:data_pack_format": 10 + "description": { + "text": "Refined Storage resources" + }, + "pack_format": 15 } }